stable bump

9 files changed, 14 insertions, 490 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 25a0db003b0c..63695a6f2dfd 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.37 2003/11/08 16:57:15 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.38 2003/11/20 14:18:58 liquidx Exp $
+
+  20 Nov 2003; Alastair Tse <liquidx@gentoo.org> xscreensaver-4.11.ebuild,
+  xscreensaver-4.12.ebuild, xscreensaver-4.13.ebuild,
+  xscreensaver-4.14.ebuild:
+  cleanup and stable bump
 
   08 Nov 2003; Todd Sunderlin <todd@gentoo.org> xscreensaver-4.10.ebuild:
   added sparc keyword
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index dfeb2f4e8f47..bb3ac8c5fd22 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,18 +1,12 @@
-MD5 870c740dd586a00514aed87fbf26b08f ChangeLog 8036
+MD5 f8c6be40c033b638baad6e97d466986c ChangeLog 8224
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
-MD5 e2fd6f44fe924c4fb9819db58799053a xscreensaver-4.05-r3.ebuild 2467
-MD5 c546176fd7009b5fe9ec32556bc3295a xscreensaver-4.10.ebuild 4485
-MD5 7e0255997b79258036fcce1a40778bd8 xscreensaver-4.11.ebuild 4371
-MD5 b07d08d9aacbda59e8fad0f73fa8fcdb xscreensaver-4.12.ebuild 4371
-MD5 bc4123b0f441a9ccfffed8124e8a4b51 xscreensaver-4.13.ebuild 4370
-MD5 6d573c98da64f3618c2050cc88eceac8 xscreensaver-4.14.ebuild 4367
+MD5 3cea46b1218e1b35ca6fbae8371125c3 xscreensaver-4.05-r3.ebuild 2468
+MD5 16d7ca3502b68e149b3b8d48127f6125 xscreensaver-4.10.ebuild 4486
+MD5 125f5333f6f1ce7bebcc59f9c4bf8fc9 xscreensaver-4.14.ebuild 4383
 MD5 ab5c2c76af72bf7bc833b2ad04a4875a files/digest-xscreensaver-4.05-r3 70
 MD5 090965baf6477220cda1f998feae72d6 files/digest-xscreensaver-4.10 70
-MD5 d398756f350133c94bdeaec566be9eb3 files/digest-xscreensaver-4.11 70
-MD5 a64e9e2f2e2a98aaeaffd742156460d0 files/digest-xscreensaver-4.12 70
+MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14 70
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.09-norpm.patch 1266
 MD5 51f90e218232e1e767a3962668c7ec9f files/xscreensaver-4.10-klein.c 10125
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
-MD5 d23b37b811e3ca28cc385977c84c9ce4 files/digest-xscreensaver-4.13 70
-MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.11 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.11
deleted file mode 100644
index 2236e4e7969b..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fda86c57130f03f887725fad33807d63 xscreensaver-4.11.tar.gz 3744413
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.12 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.12
deleted file mode 100644
index dbafa0402cc0..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c82e689c9307d89001ba6485fb6386a xscreensaver-4.12.tar.gz 3794743
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.13 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.13
deleted file mode 100644
index be3f16b3ea06..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48fa73157e58801672f40ead4a673e91 xscreensaver-4.13.tar.gz 3902864
diff --git a/x11-misc/xscreensaver/xscreensaver-4.11.ebuild b/x11-misc/xscreensaver/xscreensaver-4.11.ebuild
deleted file mode 100644
index de8b0882bbd9..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.11.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.11.ebuild,v 1.3 2003/09/05 23:18:18 msterret Exp $
-
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
-
-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="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-
-# NOTE: the motif interface is not supported/developed anymore
-#       by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-#        automatically over gtk1. we need to patch the autoconf stuff
-#        to correctly allow users to choose gtk1/gtk2. right now it
-#        only selects the deps.
-# 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 )
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2
-					>=gnome-base/libglade-1.99
-					>=dev-libs/glib-2 ) )
-	gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-					>=media-libs/gdk-pixbuf-0.18
-					=gnome-base/libglade-0.17* ) )
-	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
-							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif
-		>=media-libs/gdk-pixbuf-0.18 )
-	pam? ( sys-libs/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
-	gtk2? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if [ -n "`use kerberos`" -a -z "`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
-		sleep 2
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="--with-fortune=/usr/bin/fortune"
-
-	use gtk \
-		&& myconf="${myconf} --without-motif --with-gtk --with-xml" \
-		|| myconf="${myconf} --with-motif --without-gtk"
-
-	use xinerama \
-		&& myconf="${myconf} --with-xinerama-ext" \
-		|| myconf="${myconf} --without-xinerama-ext"
-
-	use pam \
-		&& myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	use opengl \
-		&& myconf="${myconf} --with-gl --with-gle" \
-		|| myconf="${myconf} --without-gl --without-gle"
-
-	use jpeg \
-		&& myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --without-jpeg"
-
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
-		if [ -n "`use gnome`" ]; then
-			myconf="${myconf} --with-gnome --with-pixbuf"
-		fi
-	fi
-
-	#export C_INCLUDE_PATH="/usr/include/libxml2/"
-	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 \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die
-
-	# install correctly in gnome2
-	use gnome && ( \
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-	)
-
-	# 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
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
-
-	use pam && ( \
-		insinto /etc/pam.d
-		doins ${FILESDIR}/pam.d/xscreensaver
-	)
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.12.ebuild b/x11-misc/xscreensaver/xscreensaver-4.12.ebuild
deleted file mode 100644
index 82383c58f88a..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.12.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.12.ebuild,v 1.2 2003/09/05 23:18:18 msterret Exp $
-
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
-
-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="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-
-# NOTE: the motif interface is not supported/developed anymore
-#       by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-#        automatically over gtk1. we need to patch the autoconf stuff
-#        to correctly allow users to choose gtk1/gtk2. right now it
-#        only selects the deps.
-# 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 )
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2
-					>=gnome-base/libglade-1.99
-					>=dev-libs/glib-2 ) )
-	gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-					>=media-libs/gdk-pixbuf-0.18
-					=gnome-base/libglade-0.17* ) )
-	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
-							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif
-		>=media-libs/gdk-pixbuf-0.18 )
-	pam? ( sys-libs/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
-	gtk2? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if [ -n "`use kerberos`" -a -z "`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
-		sleep 2
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="--with-fortune=/usr/bin/fortune"
-
-	use gtk \
-		&& myconf="${myconf} --without-motif --with-gtk --with-xml" \
-		|| myconf="${myconf} --with-motif --without-gtk"
-
-	use xinerama \
-		&& myconf="${myconf} --with-xinerama-ext" \
-		|| myconf="${myconf} --without-xinerama-ext"
-
-	use pam \
-		&& myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	use opengl \
-		&& myconf="${myconf} --with-gl --with-gle" \
-		|| myconf="${myconf} --without-gl --without-gle"
-
-	use jpeg \
-		&& myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --without-jpeg"
-
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
-		if [ -n "`use gnome`" ]; then
-			myconf="${myconf} --with-gnome --with-pixbuf"
-		fi
-	fi
-
-	#export C_INCLUDE_PATH="/usr/include/libxml2/"
-	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 \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die
-
-	# install correctly in gnome2
-	use gnome && ( \
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-	)
-
-	# 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
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
-
-	use pam && ( \
-		insinto /etc/pam.d
-		doins ${FILESDIR}/pam.d/xscreensaver
-	)
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.13.ebuild b/x11-misc/xscreensaver/xscreensaver-4.13.ebuild
deleted file mode 100644
index 040ebeff1465..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.13.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.13.ebuild,v 1.1 2003/09/12 08:03:05 seemant Exp $
-
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
-
-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="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-
-# NOTE: the motif interface is not supported/developed anymore
-#       by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-#        automatically over gtk1. we need to patch the autoconf stuff
-#        to correctly allow users to choose gtk1/gtk2. right now it
-#        only selects the deps.
-# 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 )
-	gtk? ( gtk2? ( >=x11-libs/gtk+-2
-					>=gnome-base/libglade-1.99
-					>=dev-libs/glib-2 ) )
-	gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) )
-	gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
-					>=media-libs/gdk-pixbuf-0.18
-					=gnome-base/libglade-0.17* ) )
-	gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
-							>=gnome-base/gnome-libs-1.4 ) ) )
-	!gtk? ( virtual/motif
-		>=media-libs/gdk-pixbuf-0.18 )
-	pam? ( sys-libs/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
-	gtk2? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if [ -n "`use kerberos`" -a -z "`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
-		sleep 2
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	myconf="--with-fortune=/usr/bin/fortune"
-
-	use gtk \
-		&& myconf="${myconf} --without-motif --with-gtk --with-xml" \
-		|| myconf="${myconf} --with-motif --without-gtk"
-
-	use xinerama \
-		&& myconf="${myconf} --with-xinerama-ext" \
-		|| myconf="${myconf} --without-xinerama-ext"
-
-	use pam \
-		&& myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	use opengl \
-		&& myconf="${myconf} --with-gl --with-gle" \
-		|| myconf="${myconf} --without-gl --without-gle"
-
-	use jpeg \
-		&& myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --without-jpeg"
-
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
-		if [ -n "`use gnome`" ]; then
-			myconf="${myconf} --with-gnome --with-pixbuf"
-		fi
-	fi
-
-	#export C_INCLUDE_PATH="/usr/include/libxml2/"
-	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 \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die
-
-	# install correctly in gnome2
-	use gnome && ( \
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-	)
-
-	# 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
-
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
-
-	use pam && ( \
-		insinto /etc/pam.d
-		doins ${FILESDIR}/pam.d/xscreensaver
-	)
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
index f2d34ce46596..1ad6a281a250 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14.ebuild,v 1.1 2003/10/26 23:06:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14.ebuild,v 1.2 2003/11/20 14:18:58 liquidx Exp $
 
 IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama"
 
@@ -9,7 +9,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
 HOMEPAGE="http://www.jwz.org/xscreensaver/"
 
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 SLOT="0"
 
 # NOTE: the motif interface is not supported/developed anymore
@@ -64,9 +64,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/xscreensaver-4.10-norpm.patch
 }
 
 src_compile() {