Fixed webcollage to work - see bug #120999.

(Portage version: 2.1_pre4-r1)

9 files changed, 66 insertions, 221 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 22973429c922..d657dfd1f9f3 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.128 2006/02/07 09:21:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.129 2006/02/07 12:17:34 nelchael Exp $
+
+*xscreensaver-4.23-r1 (07 Feb 2006)
+
+  07 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-4.23-words.patch, -xscreensaver-4.20.ebuild,
+  xscreensaver-4.22-r4.ebuild, -xscreensaver-4.23.ebuild,
+  +xscreensaver-4.23-r1.ebuild:
+  Fixed webcollage to work - see bug #120999.
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> xscreensaver-4.23.ebuild:
   Mark 4.23 stable on alpha
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 0e43e33a2ce6..17745f0265d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 37ec64caf486f0dabf725df5616cdf16 ChangeLog 21444
 RMD160 8ffda6964ac1f3df901042b0cb004f610cde3c80 ChangeLog 21444
 SHA256 a7194a2314e7138553676ae2be1b7087797e2d1b312a0cd6cda394927b6dafa4 ChangeLog 21444
@@ -16,6 +13,9 @@ SHA256 b6bef3cbc05ebbeedf4b2fdf7fd81440b6ed400aed2705da47504564403451fc files/di
 MD5 4e81a52673c939318a008be6a0835435 files/digest-xscreensaver-4.23 70
 RMD160 9b9733f92db626a987ab7064dba7edd63bf43626 files/digest-xscreensaver-4.23 70
 SHA256 1f2f36bf2ff557143d7382b81a83aa9274fd7a8f670dbc2e00f81ff4f9da6aab files/digest-xscreensaver-4.23 70
+MD5 2dec78c3103e6a62dbcace7dc2d16bf1 files/digest-xscreensaver-4.23-r1 256
+RMD160 b205bfc06fbb52feebef73a04f8771a1d37e9f58 files/digest-xscreensaver-4.23-r1 256
+SHA256 23a3e679d7a3b3ba20e1f2d3ccd27b6a0a6930b1df53fe3b70ffc01e5cd7a1e9 files/digest-xscreensaver-4.23-r1 256
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
 RMD160 6d51280f7ad5626c93f43ce2ee2d80b691971990 files/pam.d/xscreensaver 79
 SHA256 53f0ebf0d9c8442c2f513a9a2b8faab71992df4b3475fd1a592f43a0a7dff0c3 files/pam.d/xscreensaver 79
@@ -49,6 +49,9 @@ SHA256 bae37d855e92d48a69e472e450a7aae479e821c45ec05bc91a01a9efe3ef59e4 files/xs
 MD5 e24f49eb6b4473a5fd9f0869065cfe85 files/xscreensaver-4.23-nsfw.patch 6634
 RMD160 2ae760d79f6cbb8c885afca945a7d2c2eff17d3c files/xscreensaver-4.23-nsfw.patch 6634
 SHA256 73b01bd257d459399a94f4b31d8fdef281d217452c56dffef95aa5c9d75bce1c files/xscreensaver-4.23-nsfw.patch 6634
+MD5 5fbeadbcc85608ca9993c2f7d51292cf files/xscreensaver-4.23-words.patch 530
+RMD160 6931bf3662838f04aa707a70702717bd91954067 files/xscreensaver-4.23-words.patch 530
+SHA256 bb7adab082f070c1db62cd40db7d563b48bd75e60f29bf628f6650023fdc37eb files/xscreensaver-4.23-words.patch 530
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 RMD160 304dd508a11972ac06ea157effa7bf11fe9f5154 files/xscreensaver-blank-screen.patch 487
 SHA256 166ba0d6283e262886230439dc69dc5e746fec0c779727a6e2aec4b40d6f7de8 files/xscreensaver-blank-screen.patch 487
@@ -61,13 +64,9 @@ SHA256 24d974644f8009ec797babc3f51499a96bd019404561a496998ffc7241300213 xscreens
 MD5 eca40273355199f6c11a72010194217e xscreensaver-4.22-r4.ebuild 5657
 RMD160 d801b04463312f2507679951e1bcb50dcc081842 xscreensaver-4.22-r4.ebuild 5657
 SHA256 6222a0962d238d8f7ad69b20ea47c5b28b30e7f4bf99b9c0922abc2b463ae2f4 xscreensaver-4.22-r4.ebuild 5657
+MD5 c5b9a7c1f3ca0d464f3f56b3c064e050 xscreensaver-4.23-r1.ebuild 5466
+RMD160 1a52ef3ca9b2c0dbefd27bec1373229bd1e29aa3 xscreensaver-4.23-r1.ebuild 5466
+SHA256 6d6a46b6c1c8cbc6320b7c30a268763995f15a6b9904d04af470abc564faf3e5 xscreensaver-4.23-r1.ebuild 5466
 MD5 de9bd6d55be7e7e7f4602f4f9cbbe92d xscreensaver-4.23.ebuild 5855
 RMD160 02667f71e39d1b889b47bf9bfe9d57bee59e4769 xscreensaver-4.23.ebuild 5855
 SHA256 d88f64b7cec1985daff58a0ac7069c0f857bb15bee604f4bb8c82d6bc3e83237 xscreensaver-4.23.ebuild 5855
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6GapJrHF4yAQTrARAlJYAKCfsj2QHR9BZ8BHSlWtjS/q9gzIGwCfXvKK
-2g5OqcSNIQ0ifB8nrdaOPr8=
-=kqGb
------END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.20
deleted file mode 100644
index 0004b9ec3c5e..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7df61d5d8e3190711988534f7ca84eda xscreensaver-4.20.tar.gz 4437919
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23
deleted file mode 100644
index 701eee036446..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1
new file mode 100644
index 000000000000..53fe2665124c
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.23-r1
@@ -0,0 +1,3 @@
+MD5 27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz 4939070
+RMD160 b18c2e45fca132e017bd24e6e8fca91154fa03db xscreensaver-4.23.tar.gz 4939070
+SHA256 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7 xscreensaver-4.23.tar.gz 4939070
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch
new file mode 100644
index 000000000000..bb8512449831
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-words.patch
@@ -0,0 +1,13 @@
+diff -Nru xscreensaver-4.23.vanilla/hacks/webcollage xscreensaver-4.23/hacks/webcollage
+--- xscreensaver-4.23.vanilla/hacks/webcollage	2006-02-07 12:52:14.000000000 +0100
++++ xscreensaver-4.23/hacks/webcollage	2006-02-07 12:53:44.000000000 +0100
+@@ -837,7 +837,8 @@
+ 
+ 
+ sub pick_dictionary() {
+-  my @dicts = ("/usr/dict/words",
++  my @dicts = ("/usr/share/dict/cracklib-small",
++               "/usr/dict/words",
+                "/usr/share/dict/words",
+                "/usr/share/lib/dict/words");
+   foreach my $f (@dicts) {
diff --git a/x11-misc/xscreensaver/xscreensaver-4.20.ebuild b/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
deleted file mode 100644
index ed917af821c8..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
+++ /dev/null
@@ -1,176 +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.ebuild,v 1.16 2005/07/09 19:25:42 swegener Exp $
-
-inherit eutils flag-o-matic
-
-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? ( 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
-	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 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"
-
-
-	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
-
-	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
-
-	if use pam ; then
-		insinto /etc/pam.d
-		doins ${FILESDIR}/pam.d/xscreensaver
-	fi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
index 5496d89ee666..bba7e001f5dd 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.13 2005/11/19 11:33:46 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.14 2006/02/07 12:17:34 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails
 
@@ -24,7 +24,11 @@ SLOT="0"
 # (4.22-r3) is going to force gtk support and disable motif support. Hopefully
 # the users won't complain too much...
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libXxf86misc
+		x11-apps/xwininfo
+		xinerama? ( x11-libs/libXinerama ) )
+	virtual/x11 )
 	media-libs/netpbm
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/libxml2-2.5
@@ -39,8 +43,14 @@ RDEPEND="virtual/x11
 	!arm? ( new-login? ( gnome-base/gdm ) )"
 
 DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/scrnsaverproto
+		x11-proto/recordproto
+		x11-proto/xf86miscproto
+		xinerama? ( x11-proto/xineramaproto ) )
+	virtual/x11 )
 	sys-devel/bc
-	dev-lang/perl
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
diff --git a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild b/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild
index 3ad2bf0ed2e3..4f2b55f73ed7 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23.ebuild,v 1.13 2006/02/07 09:21:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23-r1.ebuild,v 1.1 2006/02/07 12:17:34 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -14,21 +14,11 @@ 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...
-
-# smithj says (2005-07-26):
-# MOTIF WAS REMOVED FOR A REASON! The motif version has not been maintained for
-# some time, and has problems both at build-time and run-time. This ebuild
-# (4.22-r3) is going to force gtk support and disable motif support. Hopefully
-# the users won't complain too much...
-
-RDEPEND="|| ( ( x11-libs/libXxf86misc
-			xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
+RDEPEND="|| ( (
+		x11-libs/libXxf86misc
+		x11-apps/xwininfo
+		xinerama? ( x11-libs/libXinerama ) )
+	virtual/x11 )
 	media-libs/netpbm
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/libxml2-2.5
@@ -44,16 +34,13 @@ RDEPEND="|| ( ( x11-libs/libXxf86misc
 
 DEPEND="${RDEPEND}
 	|| ( ( x11-proto/xf86vidmodeproto
-			x11-proto/xextproto
-			x11-proto/scrnsaverproto
-			x11-proto/recordproto
-			x11-proto/xf86miscproto
-			xinerama? ( x11-proto/xineramaproto )
-		)
-		virtual/x11
-	)
+		x11-proto/xextproto
+		x11-proto/scrnsaverproto
+		x11-proto/recordproto
+		x11-proto/xf86miscproto
+		xinerama? ( x11-proto/xineramaproto ) )
+	virtual/x11 )
 	sys-devel/bc
-	dev-lang/perl
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
@@ -86,7 +73,7 @@ src_unpack() {
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
 	# use gnome-terminal in tests rather than gnome-open (bug #94708)
 	# and bug 118028:
-	epatch "${FILESDIR}/${PN}-4.23-norpm.patch"
+	epatch "${FILESDIR}/${P}-norpm.patch"
 
 	# tweaks the default configuration (driver/XScreenSaver.ad.in)
 	epatch ${FILESDIR}/${PN}-4.22-settings.patch
@@ -95,10 +82,13 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-blank-screen.patch
 
 	# disable not-safe-for-work xscreensavers
-	use offensive || epatch ${FILESDIR}/${PN}-4.23-nsfw.patch
+	use offensive || epatch ${FILESDIR}/${P}-nsfw.patch
+
+	# If offensive is set patch webcollage to work:
+	use offensive && epatch ${FILESDIR}/${P}-words.patch
 
 	# Fix for modular X:
-	epatch "${FILESDIR}/${PN}-4.23-app-defaults.patch"
+	epatch "${FILESDIR}/${P}-app-defaults.patch"
 	eautoreconf
 
 	# change old head/tail to POSIX ones