Clean up RDEPEND a bit

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 14 insertions, 10 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 78d435bf22ca..9605f36e169a 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.20 2010/04/30 12:29:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.21 2010/05/03 13:06:09 lack Exp $
+
+  03 May 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-10.0.45.2.ebuild,
+  adobe-flash-10.0.45.2-r1.ebuild:
+  Clean up RDEPEND a bit
 
   30 Apr 2010; Jim Ramsay <lack@gentoo.org> adobe-flash-9.0.262.0.ebuild,
   adobe-flash-10.0.45.2.ebuild, adobe-flash-10.0.45.2-r1.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 8e06afa790a6..6225e86416a7 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -4,8 +4,8 @@ DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e0
 DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8
 DIST install_flash_player_9.tar.gz 3056624 RMD160 691de4c0b2b5ea3d6f7e3e07246dc7cee80ca902 SHA1 fd6da8b2afbcaf3213c772e7afc664030a50a683 SHA256 d934e3fdd49db84c346a0d501d6519e4cafe77bdb596f5af1e92e7e3eb93dab2
 DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6
-EBUILD adobe-flash-10.0.45.2-r1.ebuild 5491 RMD160 6034d78cb9ebbd326d9421966f47f06eff617c9e SHA1 c5327c052b445239659190fef36a39e0826d46c8 SHA256 b1882bd9a79e5098b1ec8e94646b3a619138258dc1bedb1ccb81cd1d5a760e70
-EBUILD adobe-flash-10.0.45.2.ebuild 6104 RMD160 9735966ebb4a678d95eea2f5eb76f79a744d4937 SHA1 7452b4c12ff89b7f5dc1f1ce2088eb11fa5f105a SHA256 4b9c0b02f15e73611bd92be79b1862bf9e0000b4abcd683a9c9f5cfcfc26ab77
+EBUILD adobe-flash-10.0.45.2-r1.ebuild 5491 RMD160 fc81bbb79bf5e7f5e17d57c113013244460d9382 SHA1 7da4d9e3854e9baf15bd51e9a6767a4e29ae63b9 SHA256 95e883113af7647da068c6dbaa958c05a096d86b7e93098b430cb912386954ed
+EBUILD adobe-flash-10.0.45.2.ebuild 6104 RMD160 9e153a28ffcb97961db410afaec54c3cc438baef SHA1 894e97181becebc7eaa45db79a9d3428c55ceae4 SHA256 1a663f195f4ba2f0c32c58ed87dc13e401adcadbbe24f3b1742908049d734e7a
 EBUILD adobe-flash-9.0.262.0.ebuild 1626 RMD160 48ba674008e5478041c1dadfab46819eb0935416 SHA1 d41ad80b47f8a580e5b441a6f1ff0855b54d778a SHA256 8a9653b06ac03adbda4783a581ecae9a4613ad4f6fb344ab45f81047396cb4f7
-MISC ChangeLog 20641 RMD160 d807ffe86da2090c0a93098e44aaff28bc1678a6 SHA1 51d782044e404e2c56bbb313ce30b2c080ec34f8 SHA256 237f5dc564c39812ebda42c36a706c5ed6d03891429c389b381717ea89cdb2ed
+MISC ChangeLog 20776 RMD160 f68ef35fc25eadf3cf731bacd869646bf04a6858 SHA1 8c86edc508f6e94015dc17cfb8a4d11c204f2049 SHA256 3f04e2edcb7e7a187766c906b12dd8ae82c54653a040f5b99c7214d357004c8e
 MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild
index 3433f6d00cfa..fbbbce09f546 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild,v 1.2 2010/04/30 12:29:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild,v 1.3 2010/05/03 13:06:09 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -31,8 +31,7 @@ NATIVE_DEPS="x11-libs/gtk+:2
 	media-libs/fontconfig
 	dev-libs/nss
 	net-misc/curl
-	>=sys-libs/glibc-2.4
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+	>=sys-libs/glibc-2.4"
 
 EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220
 	app-emulation/emul-linux-x86-gtklibs
@@ -47,6 +46,7 @@ RDEPEND="x86? ( $NATIVE_DEPS )
 		)
 		!multilib? ( $NATIVE_DEPS )
 	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
 	!www-plugins/libflashsupport"
 
 # Ignore QA warnings in these binary closed-source libraries, since we can't fix
diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild
index c04058ac2402..d4f341e3d1b6 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild,v 1.4 2010/04/30 12:29:05 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild,v 1.5 2010/05/03 13:06:09 lack Exp $
 
 EAPI=1
 inherit nsplugins rpm multilib toolchain-funcs
@@ -31,8 +31,7 @@ NATIVE_DEPS="x11-libs/gtk+:2
 	media-libs/fontconfig
 	dev-libs/nss
 	net-misc/curl
-	>=sys-libs/glibc-2.4
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )"
+	>=sys-libs/glibc-2.4"
 
 EMUL_DEPS="app-emulation/emul-linux-x86-baselibs
 	app-emulation/emul-linux-x86-gtklibs
@@ -47,6 +46,7 @@ RDEPEND="x86? ( $NATIVE_DEPS )
 		)
 		!multilib? ( $NATIVE_DEPS )
 	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
 	!www-plugins/libflashsupport"
 
 # Our new flash-libcompat suffers from the same EXESTACK problem as libcrypto