Sanitize dependencies

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

3 files changed, 23 insertions, 24 deletions

diff --git a/media-fonts/acroread-asianfonts/ChangeLog b/media-fonts/acroread-asianfonts/ChangeLog
index feff56ff8c2c..2f6b5d40a36f 100644
--- a/media-fonts/acroread-asianfonts/ChangeLog
+++ b/media-fonts/acroread-asianfonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/acroread-asianfonts
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.28 2012/01/30 23:59:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.29 2012/01/31 22:51:52 dilfridge Exp $
+
+  31 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  acroread-asianfonts-9.1.ebuild:
+  Sanitize dependencies
 
   31 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   acroread-asianfonts-9.1.ebuild:
diff --git a/media-fonts/acroread-asianfonts/Manifest b/media-fonts/acroread-asianfonts/Manifest
index 146509dc7275..1928dcf68817 100644
--- a/media-fonts/acroread-asianfonts/Manifest
+++ b/media-fonts/acroread-asianfonts/Manifest
@@ -6,23 +6,23 @@ DIST FontPack910_cht_i486-linux.tar.bz2 11534169 RMD160 978aeb4a98d45deb5063d4e1
 DIST FontPack910_jpn_i486-linux.tar.bz2 11006398 RMD160 947c00b5ed391914a14e2de9d42d0054cca3846d SHA1 0b82a27a5e0703652225a79ffd457d64a1fc11ed SHA256 712b77a5d3b36d8235e61a9efe4bd51275f65e090da658393ff78f8c4d30fb0a
 DIST FontPack910_kor_i486-linux.tar.bz2 8571757 RMD160 b33291986a78be84b53a1ef4feb33a412fa13162 SHA1 6a0ac9feedb22618bfc5784caeda197fd03aafd5 SHA256 74394114bebfdbf134a74147d68ed9a46af8f08858dd00d50002cf24a9a39077
 DIST FontPack910_xtd_i486-linux.tar.bz2 5906030 RMD160 f63255e0512d7a56374d06febe2482e38feed86c SHA1 fd62e425f01a558b4e00d0fcfc22257d62040ff4 SHA256 2180ef033d2d7ae3c758d2bb989c692ce73fb408668a3feeeeed6d05cd363f28
-EBUILD acroread-asianfonts-9.1.ebuild 3302 RMD160 eb1e148116660b55dcb55e6657aa8aee21c0ebf5 SHA1 d6d56dc69a15b857dec3de613a32b59f56407e35 SHA256 8470f9d36e5f8aa56d82a980d984c0a5dee9770c8446fc02d0b7f773a1c1a7f4
-MISC ChangeLog 4489 RMD160 e86e52188599b05d6482bdf173b243f219fa5a6c SHA1 b05d8626ee2ddafd152bca94926cc026144d3dae SHA256 8a00d0c7b85f94d13031392810a049d029c9de6abba0973a3d32f4518dae8228
+EBUILD acroread-asianfonts-9.1.ebuild 3069 RMD160 fadb3e7df9e06834d773debeda00371aea22d812 SHA1 97b75e4cad80c1fa5f6c48b1eebc89498836c2da SHA256 4b5fc82aa1b2834f8611e6d35161ef7713d871654f2abeba77a9e6d644c92bf9
+MISC ChangeLog 4605 RMD160 5fa65cd261b89653023752bc9d5580446a8a4bc9 SHA1 037c3b1984a1391b953fd8ceb73f93f86529836d SHA256 88fe644d28a1be6d0f00d321e459f7d3449e2376d99f2ddbd88fe06ab7eb6fb2
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPJy9BAAoJENwGBM22xffeQz0P/Rt5KOKDFWOR9AfRhdOVDQwG
-Hpb12gikMy9U4bWpQ1mwCwRcSVfuY+N3Hvtvy2v2OKc4LSPw0ilfcsb3KCHbSU3R
-hrU365kGrd2UNYHIBCWD/iaU3lYhmm+PFjY2fWeokPY8nbw0KyYa6hW5ljK+Q/uK
-uWsLa7EwIkNIHFcKLl+uUdGejKF61+BuZWx6EOsyDNMQ+HwdsLKq3uZrPXhpfewA
-qu3kZ2B5EatqHw7tauNFnsXtsKQ6312zKld71wfAglysTZ5b5CG+p9WNfHam33a6
-n7y3kf1X9qiwuszibbJYdiM3xTfDvHiPkhbavYlyCIUIKUN43u//8Y7yf5HxEjMd
-Ntmc074L3bd6YttAyqBsG4/Pmz4rAN5hSOP9L0oY3Hmocl8dVbV84JuJvIRh+1td
-K88kJgVSGC87xU4luWDJ9RsxJMxrBcjI8OFaZCgPg3Lis4m676K7ophv1yjZ6Coq
-wSkd6sPwfDlNksY4O9dFWcIv3JJ0VDMKMQVOCzGoTis3UXZLMA1Gnb5G5V7+Arxi
-UV0PMMtbup4B50ui2IJ9k9oFHNrQmcYba+0jRu8N8Lo9eYQNJGyKppE8mj5l4EJ4
-kGC/pXMGuW2U/MN0wcfAbM+X7anKUWq61tJyJxRxtDFPeXTJoDPL8iN8DJ7od0kB
-zJE6lHXA9+4MpCHfN/v/
-=s37o
+iQIcBAEBCgAGBQJPKHDWAAoJENwGBM22xffe700P/ic4MX4GZjESfnndjhutplrg
+SfLsRt5qpbs+t+jJNZ47NfboaZ+g6CjKK1ASjMOTQIGQ1S6PSudiYOpMfh81JvPA
+cGtTgCwDPPRbjpN6wxMKdN553o5jeXeTq/jnZ1VmPKt3GrWvRKD1fVQLxODmi1LQ
+efs6g07osUUWfd/mpI/Sheu/o9UHPfyHbhO3zLXA2etLFvrwmtrCjDyR6fg6v+KR
+bKpnD/oM3QJktt0upYY0w0KrizOldb5i3mkEQzIDnr1WXbez7v0FJktDPmf7p7sa
+XEeVUHUrqmYq50aOtazVfIIcN38bsDqwirjKjJxP+RJu/zs9zk5Gi1d6z29fSgp0
+mkqUtwk16k5X/lbDTcGbbvRnIFUrlFEV7m7L+0GJ1U4t2XyfUZP3jejDQR0JNfUk
+Sz9TK5oyj5fKEXml9elYh4Kv9RLkpffFMw2ouw5//FRfLWsLpagCR9pIy7FlAg3n
+ydrLm9Dun15A+IVs+UXmJUKTJ1kkywQw5pFKWND8VWfHp0Fxb8bWgqRK+joNXmra
++OyETi7E5eTcpdKdeBGxplVM/lI98+EQ42yu3cGiM5/5p29kpImJaoctVP5Kfvok
+WAORCCEaNkoh69bSHxK2US/VaZBm+xQKw62looYpz3U5OY4ajcsI2Btl+cDlNq0V
+woevrgbDYGeK0kNb3Q9K
+=Lfda
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
index 946973781bf1..bfd2ad429450 100644
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.5 2012/01/30 23:59:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.6 2012/01/31 22:51:52 dilfridge Exp $
 
 EAPI=4
 inherit confutils
@@ -24,16 +24,11 @@ IUSE="minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW"
 RESTRICT="strip mirror"
 
 DEPEND=""
-RDEPEND="linguas_ja? ( >=app-text/acroread-9.1[-linguas_ja(-)] )"
-#	linguas_ko? ( >=app-text/acroread-9.1[-linguas_ko(-)] )
-#	linguas_zh_CN? ( >=app-text/acroread-9.1[-linguas_zh_CN(-)] )
-#	linguas_zh_TW? ( >=app-text/acroread-9.1[-linguas_zh_TW(-)] )
+RDEPEND="!<app-text/acroread-9.4.0"
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	confutils_require_any !minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
-}
+REQUIRED_USE="|| ( !minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )"
 
 src_install() {
 	local INSTALLDIR="/opt"