x86 stable. other archs, please read bug #100298 before marking stable

(Portage version: 2.0.51.22-r2)

5 files changed, 7 insertions, 190 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7bab99bfe059..a38b3d184b24 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.94 2005/07/03 00:16:50 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.95 2005/07/25 22:19:20 smithj Exp $
+
+  25 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  -xscreensaver-4.20-r1.ebuild, xscreensaver-4.22-r2.ebuild:
+  x86 stable. other archs, please read bug #100298 before marking stable
 
   02 Jul 2005; Jonathan Smith <smithj@gentoo.org> -xscreensaver-4.21.ebuild,
   -xscreensaver-4.22.ebuild, -xscreensaver-4.22-r1.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4f2af74226aa..e69de29bb2d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,29 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d4d67c63edc11cff3dc90a71183554d2 ChangeLog 16618
-MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
-MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20-r1 70
-MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
-MD5 8bd9730fb1f84b69efac29fab28d0db2 files/xscreensaver-4.14-analogtv_tmp.patch 419
-MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
-MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
-MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
-MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
-MD5 a719b7c6d25874293342a3f22d69d8e4 files/xscreensaver-4.21-norpm.patch 1290
-MD5 d51a7f89b409fa5d58c228856b927993 files/xscreensaver-4.21-settings.patch 1162
-MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
-MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
-MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 74a739bbc8ba68bd81eb94896163d632 xscreensaver-4.20-r1.ebuild 4470
-MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
-MD5 7afe354fd3b984447cb3c38eb301fdfd xscreensaver-4.22-r2.ebuild 5479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0CTRI1lqEGTUzyQRAm+QAJ99/GviO6vfwaJS1dsi9ON6OdHBdgCfVY05
-l6DfycR8zp5iOf9hjYoRSUQ=
-=Tbs0
------END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1
deleted file mode 100644
index 0004b9ec3c5e..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20-r1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 40e778917487..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.20-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.3 2005/07/09 19:25:42 swegener Exp $
-
-inherit eutils flag-o-matic pam
-
-IUSE="gnome gtk jpeg kde kerberos krb4 motif nls offensive opengl pam 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="~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
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
index 92c1f1016db1..73c955de90ab 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2005/07/08 11:46:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild,v 1.5 2005/07/25 22:19:20 smithj Exp $
 
 inherit eutils flag-o-matic pam
 
@@ -11,7 +11,7 @@ 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"
+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