Add parenthesis on SRC_URI conditionals. Fix bug #133009 thanks to Jakub Moc.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 77 insertions, 38 deletions

diff --git a/app-emulation/emul-linux-x86-qtlibs/Manifest b/app-emulation/emul-linux-x86-qtlibs/Manifest
index 585293328419..d33b0a3accbb 100644
--- a/app-emulation/emul-linux-x86-qtlibs/Manifest
+++ b/app-emulation/emul-linux-x86-qtlibs/Manifest
@@ -1,31 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2126776828187bb3eca63c085055e32 ChangeLog 3135
-RMD160 1c9a00a71af546a9b86b85acfb68d2c72b1e33d6 ChangeLog 3135
-SHA256 fadbb354a0b09f7297df781599147cddcf7a29dc0a878102f683a118c796bdfe ChangeLog 3135
-MD5 d4f5f68c00a37823972c27daa997de6a emul-linux-x86-qtlibs-2.2.ebuild 649
-RMD160 1c6d37ce559ace98982a28f727935e26612a005e emul-linux-x86-qtlibs-2.2.ebuild 649
-SHA256 6b7a207e771dec99aa646cc895ab62e2edde6d7e468ee0aab1d2755da3b10564 emul-linux-x86-qtlibs-2.2.ebuild 649
-MD5 1b9109ccb7c69fa5116b62aa68f410b3 emul-linux-x86-qtlibs-3.4.4.ebuild 847
-RMD160 7c3ab5993d38710c489070f326c4ecdbf78c86f3 emul-linux-x86-qtlibs-3.4.4.ebuild 847
-SHA256 dd8b73e3e7ea83e63b28f49c9a64ff96bf6bbd78f5fbcba049f6693d3bb0511b emul-linux-x86-qtlibs-3.4.4.ebuild 847
+AUX 45emul-linux-x86-qtlibs 121 RMD160 ea50e2ee0c4f22f830af9b110e48d1706d90114d SHA1 aea2157f05dcd38541a07a42fa5c34ec6d7034f3 SHA256 e50dc1bf0cb6f2c45c9a48ade7888790c36d1f6b39e4402b8c9d9a1536360f65 size 121
 MD5 c4e0363d341ecdf9a7297fe7d3654a84 files/45emul-linux-x86-qtlibs 121
 RMD160 ea50e2ee0c4f22f830af9b110e48d1706d90114d files/45emul-linux-x86-qtlibs 121
 SHA256 e50dc1bf0cb6f2c45c9a48ade7888790c36d1f6b39e4402b8c9d9a1536360f65 files/45emul-linux-x86-qtlibs 121
+DIST emul-linux-x86-qtlibs-2.2.tar.bz2 7161611 size 7161611
+DIST emul-linux-x86-qtlibs-extras-3.4.4.tar.bz2 1220350 RMD160 2cd67c380890710af1d73c519071b88b6a57255e SHA256 5f7251066ed911f196566237cef58f57daa168325f275fc31d2a71dbe5b45250 size 1220350
+DIST emul-linux-x86-qtlibs-immqt-3.4.4.tar.bz2 2856088 RMD160 df6af24c090c6989f64d380993d8ef6680b48c14 SHA256 c743e70ecfa66d72eb796f0ed314663587e5c7cf0cf3c7b9f14d0ab79c69bc36 size 2856088
+DIST emul-linux-x86-qtlibs-noime-3.4.4.tar.bz2 2792643 RMD160 db06ed120a8633cd3bf196c5bfea8e0e484aa34a SHA256 acc33a4e8b4cb40d1144680517e7e4814993e6b7d33a90eefded0cfd017b52f9 size 2792643
+EBUILD emul-linux-x86-qtlibs-2.2.ebuild 649 RMD160 1c6d37ce559ace98982a28f727935e26612a005e SHA1 74d3c9d918e6be699a3b5da03b8edf38f5d06cc8 SHA256 6b7a207e771dec99aa646cc895ab62e2edde6d7e468ee0aab1d2755da3b10564 size 649
+MD5 d4f5f68c00a37823972c27daa997de6a emul-linux-x86-qtlibs-2.2.ebuild 649
+RMD160 1c6d37ce559ace98982a28f727935e26612a005e emul-linux-x86-qtlibs-2.2.ebuild 649
+SHA256 6b7a207e771dec99aa646cc895ab62e2edde6d7e468ee0aab1d2755da3b10564 emul-linux-x86-qtlibs-2.2.ebuild 649
+EBUILD emul-linux-x86-qtlibs-3.4.4.ebuild 859 RMD160 cd308b3ef8f7896f22678549c27d655a439d1448 SHA1 e46ef99222df40f0357c478424e00ede3fef1042 SHA256 d788b15ea87af814135143fc4a3a4240833b7b261e5453c568dfbb72f5fb0851 size 859
+MD5 0c77b27409b8bd95b65064f7d21325d0 emul-linux-x86-qtlibs-3.4.4.ebuild 859
+RMD160 cd308b3ef8f7896f22678549c27d655a439d1448 emul-linux-x86-qtlibs-3.4.4.ebuild 859
+SHA256 d788b15ea87af814135143fc4a3a4240833b7b261e5453c568dfbb72f5fb0851 emul-linux-x86-qtlibs-3.4.4.ebuild 859
+MISC ChangeLog 3311 RMD160 deee2dfa951bb4a7a94b22ccd3af368b717077f3 SHA1 1d45e1f50637fd95c55c559c7a3b13c0c40e25b0 SHA256 10d2cdd4b542b067ebfcfd55ec5400db1be6f5e4e3f21f1dae76e8d9be329432 size 3311
+MD5 416dc63b8cc58d1a8be113b3c5e744ad ChangeLog 3311
+RMD160 deee2dfa951bb4a7a94b22ccd3af368b717077f3 ChangeLog 3311
+SHA256 10d2cdd4b542b067ebfcfd55ec5400db1be6f5e4e3f21f1dae76e8d9be329432 ChangeLog 3311
+MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 size 290
+MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
+RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
+SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
 MD5 fe426a9b74364ef95d2f18840429cca9 files/digest-emul-linux-x86-qtlibs-2.2 79
 RMD160 00ad11c92fc8926c0ec5d726bca84f8eaf3c32bd files/digest-emul-linux-x86-qtlibs-2.2 79
 SHA256 59a3371a31ab5ee907a540b1d742733faa6cfbfaf43a781a3a9da619c206de6b files/digest-emul-linux-x86-qtlibs-2.2 79
 MD5 6f6659b9dcfa20257255f19862fc0593 files/digest-emul-linux-x86-qtlibs-3.4.4 924
 RMD160 b83001e192ba71c145e9268d76c2ee59ec9777e1 files/digest-emul-linux-x86-qtlibs-3.4.4 924
 SHA256 209ef686a915ef493fd326e68c9838bc00aae691648dedf035ce089d8157052b files/digest-emul-linux-x86-qtlibs-3.4.4 924
-MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
-RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
-SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEGwpc2G5bA0cA/ScRAht8AKC5CGpF5lrwhT1vthbqIV5/FYMVEwCg0Pyg
-4bK8TVAAuXCj4/iKSLW3JeM=
-=GKfu
+iD8DBQFEYzRyAiZjviIA2XgRArsIAKCvwOqyqsliPVHN3a4bELMgUvjvJgCcDTNS
+JlHS7rpFqsZT55W8v6v+KLc=
+=l4Ql
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index f9c8afeb8448..9cfef6f5611e 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.41 2006/04/16 20:31:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.42 2006/05/11 12:55:06 flameeyes Exp $
+
+  11 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  emul-linux-x86-xlibs-7.0-r1.ebuild:
+  Add parenthesis on SRC_URI conditionals. Fix bug #133009 thanks to Jakub Moc.
 
   16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
   emul-linux-x86-xlibs-7.0-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 96baecfb2d69..cc8e2c6a3244 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,15 +1,37 @@
-MD5 f66ad5d4d5654a51818762ede3043258 ChangeLog 8080
-RMD160 39151735bfb4310fe683f1c623458a43d4f66de7 ChangeLog 8080
-SHA256 e1fd26a7727a47e519bc6eb9b83448ec079a4bbe3b8dcb5ea1f148388bbb715d ChangeLog 8080
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST emul-linux-x86-xlibs-2.2.2.tar.bz2 4735717 RMD160 c6b67da6ed6042c34c67703bac2d3088da11dd55 SHA256 477327f1d13aebba57a06406e3fc08b7f1d44d49d6e28b9316de3c933ff15c4d size 4735717
+DIST emul-linux-x86-xlibs-7.0-r1.tar.bz2 3232719 RMD160 ba99f0ba6e1e24dac60d6f4c12bdd7b4a33fefc5 SHA256 667ed56f6cd492ac7bc2252e846c5afc78ffa4cc9a573b437bba9a6d36519fb7 size 3232719
+DIST emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164 RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d size 3743164
+DIST emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803 RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f size 2242803
+DIST emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975 RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe size 749975
+DIST emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284 RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 size 716284
+DIST emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433 RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 size 740433
+DIST emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198 RMD160 c980124403a183435ef7328c36decb857d4e344c SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 size 727198
+DIST emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194 RMD160 6d70e3d16c903a8383a1168687363d7626318c8a SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 size 741194
+DIST emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399 RMD160 8460f56d6829d41c042c040bab830084dd1b9958 SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 size 699399
+DIST emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605 RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 size 755605
+EBUILD emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163 RMD160 3758a6e4064d2c46ae37d7857032a7de8368a551 SHA1 e99447a123b042784a9f9468d8d9a18fc5ecc699 SHA256 8b814d2e2bf2c15c10ddd140658c0b26a399835f6e9b7bc787cf531e6e8a7321 size 1163
 MD5 3c85f072d44dae5de7f17247818ed613 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
 RMD160 3758a6e4064d2c46ae37d7857032a7de8368a551 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
 SHA256 8b814d2e2bf2c15c10ddd140658c0b26a399835f6e9b7bc787cf531e6e8a7321 emul-linux-x86-xlibs-2.2.2-r1.ebuild 1163
+EBUILD emul-linux-x86-xlibs-2.2.2.ebuild 1152 RMD160 6537c30b16dc35f463382a491b0744e47321eddc SHA1 24c368c111d7c4a6edbcc9f4b6633cc5ee253274 SHA256 2355673f0f94183ba8452cdcbaa824549783fb6b4c94ccae9f42444a1d836a27 size 1152
 MD5 954df312f95e787f49dc34965fc4f07a emul-linux-x86-xlibs-2.2.2.ebuild 1152
 RMD160 6537c30b16dc35f463382a491b0744e47321eddc emul-linux-x86-xlibs-2.2.2.ebuild 1152
 SHA256 2355673f0f94183ba8452cdcbaa824549783fb6b4c94ccae9f42444a1d836a27 emul-linux-x86-xlibs-2.2.2.ebuild 1152
-MD5 a7870b516827142e122806ebfb4031e9 emul-linux-x86-xlibs-7.0-r1.ebuild 2303
-RMD160 023809f025b6e7a32d5d57a352a0959657f132ab emul-linux-x86-xlibs-7.0-r1.ebuild 2303
-SHA256 192d233f8e289b090d54a4c182e1443be79fd60f24cec1c84bdc3bd306cbda7d emul-linux-x86-xlibs-7.0-r1.ebuild 2303
+EBUILD emul-linux-x86-xlibs-7.0-r1.ebuild 2347 RMD160 ce03ef996aadc4db24e25d4a6f0bfced3b7253e1 SHA1 0bb547b5eea018e988f1c4c0c79eb0807c02c2a3 SHA256 74c0835ffeb7109d7cb59346b9dddce57413300f7263b2f37f875826952c2481 size 2347
+MD5 c90cdf4a8f63e85695cc102f6d75996e emul-linux-x86-xlibs-7.0-r1.ebuild 2347
+RMD160 ce03ef996aadc4db24e25d4a6f0bfced3b7253e1 emul-linux-x86-xlibs-7.0-r1.ebuild 2347
+SHA256 74c0835ffeb7109d7cb59346b9dddce57413300f7263b2f37f875826952c2481 emul-linux-x86-xlibs-7.0-r1.ebuild 2347
+MISC ChangeLog 8252 RMD160 dab2d6f695aaaeee076bf14ac0f9dcbf20a1bedd SHA1 04ead8cbabed26640d48e3aab447c365b37a62c8 SHA256 73b58e5eaa3b245472e9361071d3ccc775f93dde0c13fe4793f63b9d88111f90 size 8252
+MD5 a5ed56b57b60ff227aaeebcd68171a5a ChangeLog 8252
+RMD160 dab2d6f695aaaeee076bf14ac0f9dcbf20a1bedd ChangeLog 8252
+SHA256 73b58e5eaa3b245472e9361071d3ccc775f93dde0c13fe4793f63b9d88111f90 ChangeLog 8252
+MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 size 290
+MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
+RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
+SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
 MD5 db234ca6317b37de497f2d1433116e6c files/digest-emul-linux-x86-xlibs-2.2.2 286
 RMD160 45c0a9982e1d94b4a07b1e66193705e118d8fb41 files/digest-emul-linux-x86-xlibs-2.2.2 286
 SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/digest-emul-linux-x86-xlibs-2.2.2 286
@@ -19,6 +41,10 @@ SHA256 b9fb15ae79bdd68fd6f24d9eb3134946b3185ea4ea22d2a9849ab718c31b90ea files/di
 MD5 c69bfd4759007b5560b12a657f74de8d files/digest-emul-linux-x86-xlibs-7.0-r1 3043
 RMD160 3d8081133de976ff8b16c0539e2de8e22a5141de files/digest-emul-linux-x86-xlibs-7.0-r1 3043
 SHA256 6bf5a68a866a5153d9522936dae810b7c97375071c2e5d0a5ea480588fb87d63 files/digest-emul-linux-x86-xlibs-7.0-r1 3043
-MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
-RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
-SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEYzQwAiZjviIA2XgRAo1hAJ4vobcedyWlD8yvs/ZVlussoBzKcACgrUrc
+Sc15jEmhOW0sonQgHUEgd+c=
+=RpYo
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild
index 991ef21cdd8a..cee623598fa5 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild,v 1.3 2006/04/16 20:31:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r1.ebuild,v 1.4 2006/05/11 12:55:06 flameeyes Exp $
 
 inherit multilib
 
 DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PVR}.tar.bz2
-		video_cards_i810? mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2
-		video_cards_mach64? mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2
-		video_cards_mga? mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2
-		video_cards_r128? mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2
-		video_cards_radeon? mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2
-		video_cards_s3virge? mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2
-		video_cards_savage? mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2
-		video_cards_sis? mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2
-		video_cards_tdfx? mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2
-		video_cards_trident? mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2
-		video_cards_via? mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2"
+		video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
+		video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+		video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
+		video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+		video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+		video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
+		video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
+		video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
+		video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
+		video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
+		video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
 
 
 LICENSE="GPL-2"