Using pam.eclass, closes bug #93205

(Portage version: 2.0.51.22-r1)

4 files changed, 166 insertions, 1 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 254e276d54aa..34c166c9ffba 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2005/05/24 14:10:06 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.82 2005/05/24 14:42:07 rizzo Exp $
+
+*xscreensaver-4.20-r1 (24 May 2005)
+
+  24 May 2005; Don Seiler <rizzo@gentoo.org> +xscreensaver-4.20-r1.ebuild:
+  Using pam.eclass, closes bug #93205.  Thanks flameeyes for the cleanup.
 
   24 May 2005; Don Seiler <rizzo@gentoo.org> xscreensaver-4.20.ebuild:
   Stable on x86
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 77b38c63498b..8b118a65e276 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -4,6 +4,7 @@ MD5 f934f262880ab5604c675d1b031dd437 xscreensaver-4.14-r2.ebuild 4661
 MD5 0e62ff1b856345ffcc2de00ca43af8eb xscreensaver-4.15.ebuild 4507
 MD5 c5e8426900683256df19b91f5d23a6a6 xscreensaver-4.16.ebuild 4641
 MD5 e07fc1296f2a6a821b464c022a66cee7 xscreensaver-4.20.ebuild 4838
+MD5 1ba097d3e85290d19b4edcf5dddeacca xscreensaver-4.20-r1.ebuild 4459
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
@@ -14,4 +15,5 @@ MD5 0722c17c948e57fa839a1c5acbdc5f22 files/digest-xscreensaver-4.16 70
 MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
 MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
+MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20-r1 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1
new file mode 100644
index 000000000000..0004b9ec3c5e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1
@@ -0,0 +1 @@
+MD5 7df61d5d8e3190711988534f7ca84eda xscreensaver-4.20.tar.gz 4437919
diff --git a/x11-misc/xscreensaver/xscreensaver-4.20-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-4.20-r1.ebuild
new file mode 100644
index 000000000000..3911c178d2af
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.20-r1.ebuild
@@ -0,0 +1,157 @@
+# 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.20-r1.ebuild,v 1.1 2005/05/24 14:42:07 rizzo Exp $
+
+inherit eutils flag-o-matic pam
+
+IUSE="pam kerberos krb4 gtk gnome opengl jpeg xinerama offensive motif"
+
+DESCRIPTION="a modular screensaver for X11"
+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
+		gnome? ( >=gnome-extra/yelp-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 )"
+
+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 '  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 '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
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
+	epatch ${FILESDIR}/${PN}-4.20-norpm.patch
+	# set default fortune to /usr/bin/fortune even if one can't be found
+	epatch ${FILESDIR}/${PN}-4.14-fortune.patch
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	myconf="--with-fortune=/usr/bin/fortune"
+
+	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 kerberos && use krb4 \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	econf \
+		--enable-hackdir=/usr/lib/xscreensaver \
+		--x-libraries=/usr/X11R6/lib \
+		--x-includes=/usr/X11R6/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
+
+	emake || die
+}
+
+src_install() {
+	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
+
+	make install_prefix="${D}" install || die
+
+	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/control-center/screensavers /usr/lib/xscreensaver/config
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
+
+	if use gnome ; then
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
+
+	pamd_mimic_system xscreensaver auth
+}