#97253: removed gnome USE flag and added new-login USE

Package-Manager: portage-2.0.51.22-r1

4 files changed, 198 insertions, 5 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 21c91243399c..e0de6164a7a4 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.90 2005/06/24 23:09:16 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.91 2005/06/30 16:53:52 smithj Exp $
+
+*xscreensaver-4.22-r2 (30 Jun 2005)
+
+  30 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +xscreensaver-4.22-r2.ebuild:
+  #97253: removed gnome USE flag and added new-login USE
 
 *xscreensaver-4.22-r1 (24 Jun 2005)
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index dd2b58c312b4..e849b90da2f5 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -6,8 +6,9 @@ MD5 f9e4d478fa668b28e05c77b33ff4d3ad xscreensaver-4.21.ebuild 4637
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 c0f94e55889ac9d62ea23e5690bd49db xscreensaver-4.22.ebuild 4873
 MD5 9b75f02ad6d2e359cab3b1d17412dacd xscreensaver-4.20-r1.ebuild 4462
-MD5 add68301ee71dd284217a91da74db6a8 ChangeLog 16066
+MD5 ae4900711d1fc53c1c57bfd38380c1e3 ChangeLog 16243
 MD5 b43816a7c59e94a72b5f682c1dd192b6 xscreensaver-4.22-r1.ebuild 4924
+MD5 3bc1b9477a5eaa04ed0d1a02b75c4cca xscreensaver-4.22-r2.ebuild 5625
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20-r1 70
 MD5 c4ec3ad074fd83aff37b4b4ddc9b7f61 files/digest-xscreensaver-4.21 70
@@ -23,11 +24,12 @@ MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 159
 MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
 MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r1 70
+MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCvJLgl5AvwDPiUowRApsDAKDLyIUJhIP3BKiZDoX3eDknV1o7OwCePgr9
-wKrI9Uvn7k5UDx88s8l5HNg=
-=ALsr
+iD8DBQFCxCPcl5AvwDPiUowRArgcAKDGZzKxqnsQ8bDan3nDP9VTEeZtVACgxl1W
+VoaiVXDSjASHZG5rXZ4uEF0=
+=feoT
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2
new file mode 100644
index 000000000000..6f0f6e359c66
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2
@@ -0,0 +1 @@
+MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
new file mode 100644
index 000000000000..49d01f2a979f
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild,v 1.1 2005/06/30 16:53:52 smithj Exp $
+
+inherit eutils flag-o-matic pam
+
+IUSE="gtk jpeg kerberos krb4 motif new-login nls offensive opengl pam xinerama"
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+
+# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
+#       really matter if it isn't there. Maybe we should have a 'games'
+#       USE flag
+
+RDEPEND="virtual/x11
+	media-libs/netpbm
+	>=sys-libs/zlib-1.1.4
+	gtk? (
+		>=dev-libs/libxml2-2.5
+		>=x11-libs/gtk+-2
+		>=gnome-base/libglade-1.99
+		>=dev-libs/glib-2
+	)
+	motif? ( x11-libs/openmotif )
+	pam? ( virtual/pam )
+	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+	          >=media-libs/gle-3.0.1 )
+	!arm? ( new-login? ( gnome-base/gdm ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bc
+	dev-lang/perl
+	gtk? ( dev-util/pkgconfig )
+	nls? ( sys-devel/gettext )"
+
+# simple workaround for the flurry screensaver
+filter-flags -mabi=altivec
+filter-flags -maltivec
+append-flags -U__VEC__
+
+pkg_setup() {
+	if ! use gtk ; then
+		if use motif ; then
+			ewarn "From the configure script:"
+			ewarn
+			ewarn "  Though the Motif front-end to xscreensaver is still"
+			ewarn "  maintained, it is no longer being updated with new"
+			ewarn "  features: all new development on the xscreensaver-demo"
+			ewarn "  program is happening in the GTK version, and not in the"
+			ewarn "  Motif version."
+			ewarn
+			ewarn "It is recommended that you use the \"gtk\" USE flag."
+		else
+			ewarn "You have enabled neither gtk nor motif USE flags.  xscreensaver-demo"
+			ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
+			ewarn "version is no longer being maintained), so xscreensaver-demo will not"
+			ewarn "be built.  This is most likely NOT what you want."
+		fi
+		ewarn
+		epause
+	fi
+	if use kerberos && ! use krb4 ; then
+		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
+		ewarn "disabled unless kerberos 4 support has been compiled with your"
+		ewarn "kerberos libraries. To do that, you should abort now and do:"
+		ewarn
+		ewarn " USE=\"krb4\" emerge mit-krb5"
+		ewarn
+		epause
+	fi
+	if [ use arm ] && [ use new-login ]; then
+		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
+		ewarn "available for the amd platform. please disable this use flag"
+		die "new-login USE is not supported on arm"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+	# use gnome-terminal in tests rather than gnome-open (bug #94708)
+	epatch ${FILESDIR}/${PN}-4.22-configure.patch
+	# tweaks the default configuration (driver/XScreenSaver.ad.in)
+	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+	# fixes wrong argument for inter-aggregate screensaver
+	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	if use gtk ; then
+		myconf="${myconf} --without-motif --with-gtk --with-xml"
+	elif use motif; then
+		myconf="${myconf} --with-motif --without-gtk --without-pixbuf"
+	else
+		myconf="${myconf} --without-motif --without-gtk --without-pixbuf"
+	fi
+
+	use new-login \
+		&& myconf="${myconf} --with-login-manager" \
+		|| myconf="${myconf} --without-login-manager"
+
+	use kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	econf \
+		--with-hackdir=/usr/lib/misc/xscreensaver \
+		--with-configdir=/usr/share/xscreensaver/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-mit-ext \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) $(use_with opengl gle) \
+		$(use_with jpeg) \
+		$(use_enable nls) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	make install_prefix="${D}" install || die "make install failed"
+
+	dodoc README
+
+	# install correctly in gnome2
+	if use gnome ; then
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+	fi
+
+	# install symlink to satisfy kde
+	use kde && dosym /usr/share/xscreensaver/config /usr/$(get_libdir)/xscreensaver/config
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
+
+	if use gnome ; then
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+}
+
+pkg_postinst() {
+	einfo "the gnome USE flag has been dropped"
+	einfo ""
+	if ! use new-login; then
+		einfo "You have chosen to not use the new-login USE flag."
+		einfo "This is a new USE flag which enables individuals to"
+		einfo "create new logins when the screensaver is active,"
+		einfo "allowing others to use their account, even though the"
+		einfo "screen is locked to another account. If you want this"
+		einfo "feature, please recompile with USE=\"new-login\"."
+	fi
+}