Fix bug #143287.

Package-Manager: portage-2.1.1

3 files changed, 25 insertions, 21 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 69fbca7445af..8ea713f58c83 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.49 2006/09/03 10:54:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.50 2006/09/11 12:18:27 nelchael Exp $
+
+  11 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  rss-glx-0.8.1-r3.ebuild:
+  Fix bug #143287.
 
 *rss-glx-0.8.1-r3 (03 Sep 2006)
 
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index a22814d90017..244a5747c40e 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -43,14 +43,14 @@ EBUILD rss-glx-0.8.1-r1.ebuild 4803 RMD160 eddd5600137493770b57abeafb4de79fd1c81
 MD5 507e74e3dbee52e7cae50cd22916d1ed rss-glx-0.8.1-r1.ebuild 4803
 RMD160 eddd5600137493770b57abeafb4de79fd1c81b70 rss-glx-0.8.1-r1.ebuild 4803
 SHA256 d690ac9bf6431dc50742ee207a1b054965090faf0f96dbd6eda7d5b89590a4a4 rss-glx-0.8.1-r1.ebuild 4803
-EBUILD rss-glx-0.8.1-r3.ebuild 4868 RMD160 ca3c3828bce8f1e11b7a027ae81961c4ebfcf133 SHA1 8aaa3cb322e765e250cf7d0c40eaebfe5b5f6556 SHA256 9f46371458ce1ce1ffa8eaec2afe51909ef4c0e6a56331c76d7ae198b26133c3
-MD5 ddd329bce35b7d6482b08186d5a3f4e0 rss-glx-0.8.1-r3.ebuild 4868
-RMD160 ca3c3828bce8f1e11b7a027ae81961c4ebfcf133 rss-glx-0.8.1-r3.ebuild 4868
-SHA256 9f46371458ce1ce1ffa8eaec2afe51909ef4c0e6a56331c76d7ae198b26133c3 rss-glx-0.8.1-r3.ebuild 4868
-MISC ChangeLog 8696 RMD160 c39243518093c423be24d803c5149a30eba37521 SHA1 ea29dca0decbd4cdfbf675de3309a92b7c137585 SHA256 96392dafa0a113a2ba077a37af50d64ae0e7724011e33db6d6134d710fd26eae
-MD5 9d929968c747058af2dde32c169d8c65 ChangeLog 8696
-RMD160 c39243518093c423be24d803c5149a30eba37521 ChangeLog 8696
-SHA256 96392dafa0a113a2ba077a37af50d64ae0e7724011e33db6d6134d710fd26eae ChangeLog 8696
+EBUILD rss-glx-0.8.1-r3.ebuild 4825 RMD160 cfa456498e81dba12d337369c91b19c99c785c1c SHA1 4fb667365d09cb14f1583824495570723d69fd77 SHA256 649b38d1f69c3d3678164b682d44a423ef5fa48d0a696a45b9eabb71419fd823
+MD5 b99c8485069657523cd4a70c6e8dac54 rss-glx-0.8.1-r3.ebuild 4825
+RMD160 cfa456498e81dba12d337369c91b19c99c785c1c rss-glx-0.8.1-r3.ebuild 4825
+SHA256 649b38d1f69c3d3678164b682d44a423ef5fa48d0a696a45b9eabb71419fd823 rss-glx-0.8.1-r3.ebuild 4825
+MISC ChangeLog 8796 RMD160 1424399171bcb1aedfd48e6a52e4367ee759245a SHA1 f99d46f4b7652e0389b508a4264e755dffe817df SHA256 5d92a448e5dd16070fb578bbcf4daeeefef69f02554da2e633c237d5c6e7d97d
+MD5 a8f929ff31296e39d65647b38f8e86f7 ChangeLog 8796
+RMD160 1424399171bcb1aedfd48e6a52e4367ee759245a ChangeLog 8796
+SHA256 5d92a448e5dd16070fb578bbcf4daeeefef69f02554da2e633c237d5c6e7d97d ChangeLog 8796
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -70,7 +70,7 @@ SHA256 3d56eed54693ebc7185f7780b5c40e5e05f0907f287f4c6f97e258a2fce4f456 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+rRwgo/w9rxVVVERAtamAJ0S0JPYZJdlVH4hQ98wzthPrQjSsgCeMY44
-IVmbEXwhXqr8Qs4jBC4sBAA=
-=HrfI
+iD8DBQFFBVQdgo/w9rxVVVERArJ5AJ0QyL/kSliWH5cr4J14pjbb4eOingCgvXhj
+zFcIOWvtwAqmQHkF6riVHWw=
+=nWbd
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r3.ebuild
index 6b048cea9e56..428749c3299b 100644
--- a/x11-misc/rss-glx/rss-glx-0.8.1-r3.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.1-r3.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/rss-glx/rss-glx-0.8.1-r3.ebuild,v 1.1 2006/09/03 10:54:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.1-r3.ebuild,v 1.2 2006/09/11 12:18:27 nelchael Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,14 +27,14 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use kde && use xscreensaver ; then
-		if ! built_with_use kde-base/kdeartwork-kscreensaver xscreensaver && \
-		   ! built_with_use kde-base/kdeartwork xscreensaver ; then
-			eerror "rss-glx wont work nicely with kde unless you emerge"
-			eerror "kde-base/kdeartwork or kde-base/kdeartwork-kscreensaver"
-			eerror "with USE=xscreensaver."
-			eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212"
-			die "Please re-emerge your KDE with USE=xscreensaver"
-		fi
+		for pkg in kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ; do
+			if has_version ${pkg} && ! built_with_use ${pkg} xscreensaver ; then
+				eerror "rss-glx wont work nicely with kde unless you"
+				eerror "emerge ${pkg} with USE=xscreensaver."
+				eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212"
+				die "Please re-emerge ${pkg} with USE=xscreensaver"
+			fi
+		done
 	fi
 }