workaround for bug 399061

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

7 files changed, 38 insertions, 40 deletions

diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog
index e87dd7e97d62..6f6d092acfe6 100644
--- a/sci-geosciences/josm/ChangeLog
+++ b/sci-geosciences/josm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/josm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.44 2012/09/19 10:20:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.45 2012/11/16 20:12:26 ago Exp $
+
+  16 Nov 2012; Agostino Sarubbo <ago@gentoo.org> josm-4203.ebuild,
+  josm-4550.ebuild, josm-5315.ebuild, josm-5356.ebuild, josm-5485.ebuild:
+  workaround for bug 399061
 
 *josm-5485 (19 Sep 2012)
 
@@ -223,4 +227,3 @@
 
   06 Sep 2007; Hanno Boeck <hanno@gentoo.org> +files/josm, +josm-1.5.ebuild:
   Initial commit of the Java OpenStreetMap Editor.
-
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index b07fdcbe1231..70f0365be293 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,33 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST josm-4203.tar.xz 6243924 SHA256 966917ebefd15f035c6972d026301c9ea4eeabfc62821b877a4d665cbb4fe13f
 DIST josm-4550.tar.xz 14950388 SHA256 605aaaa2ca903a70a0abf1068fce8d0a349d8ea18d47c31bab1b2f5a3c5c9e60 SHA512 48a068648c2fccc4e1ec41b295f90dfeda62514dc2f7c3e63794de3bc7ba7b85b67e1be1df9deb67bde5207896e99aead30740c768866273ae03e4b0b0921d83 WHIRLPOOL d230dd2de3fb2daf9d8a74ed56f346590688c3bcd7d6f2c1e4cd988fdd9552c1caf7d49e3bfffbd4ef9fae995da873f559dbed568524db9f98be7cbbf1ce67e1
 DIST josm-5315.tar.xz 14243816 SHA256 94772dc907b8847b647da87e7db3fc0d116d338edb69f1abcb8e33a56aad41f0 SHA512 a0496a5946cb6a0d718ebea060b9049e354f54a0daef44f199b3c9ef916383d86d173212d5929b35060972f0a0d13cab41843aaed4c486d1285e153ec599bfad WHIRLPOOL b73d1f7b78c62e16d56c42b9797f3ecffcaeb1262cb76a460cba71576573baa7fac6ed9a37e1a3b5cdeaa9997f747067039df204f9151a141872a3c3bdcc4f61
 DIST josm-5356.tar.xz 14233552 SHA256 2bd6bdcaf2a98512e70cbd4d7263395160d608c6a06668d685d85efbbd6daf19 SHA512 6b3dc77cfdad552cedb763085b8de6c1e9c96efd545639c0048cb54272a5cb6074f9446e202e15476dfd1519f08044b3f6f7dab3d3da65aa3ea2da3f47358f8b WHIRLPOOL 1b5bbd4127f38c5a878396fc014b049aee94d47e0e70a4ec689a5f17b712dd5fc235024bcf7252e26a75d32361a2e432f56a0b0c0642066f3749bf7c6f8f9f7c
 DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175a017d1db542038e4b393dd SHA512 43a43240593e624cf5cd754df051ed631043179309f9ab2acf31b426c96647ca1feb6e2abae21b15a00da67b5705e7462a5ce7616ce5d4ca05499f530fc7ade3 WHIRLPOOL f56585859a44c879731f85f85ff76da941b72a77d99bf827c1fb2256709a4eca864f3ab2b97629980b178f23fb1abca947355419a0982ef1869a0570247e1eb2
-EBUILD josm-4203.ebuild 1599 SHA256 af0ade62e78aaf0981f31b4d85a51c850d2615fbd45de096687726c23d7e2a6b SHA512 447f7c6efde37d2e1baa1b9c807c5f09bfcefffd57461662818cf6c634e2932f8a81a3723cdddfed1776228d96443db8a5b1db3c859e957634d86f860c18be99 WHIRLPOOL b56e1fdaf8d05c83872da8a9fdf45f401c1a77bf9c99cf22fc1fc35cfb43613e1ac8476ea7fa7adc8999b8dd99122d13b80244df308d5716b7f4a812fe61178c
-EBUILD josm-4550.ebuild 1627 SHA256 f15afe516eda25d4c881c3cb9c5e08336ec982c443d6ddaa9aea8ac786d6365d SHA512 dc291fcba2bf2b54578bb01a2d7bed0e5bfddde289e775b037ef8421ae7332eca3ec4728ab07b18b1ba078f32fe0f767018d0fb588ce10d8f8d8d8dbe4af65cb WHIRLPOOL 6af6a9ba54c69cd3623b74290d416609e9bbb36a6a9641266a37ae4d96bfef0a68415e021b8b96ba12e8cf7e435511888844b2c09cad015d0302363ccb349bb4
-EBUILD josm-5315.ebuild 1627 SHA256 a4ea292a723cb97dbea296a43511a9f5f4c95bdb9dfef52ceb13f12a2f2f3b02 SHA512 7f867faba2885067f72d32215b9101b348fd10d9b78682b4a51c26b810b6babdd61b05e0b82d949aef91e6bafeb9e6e7831130da42300aa2d64ac55b7c792fbc WHIRLPOOL f7c493ec0e3bf0beff3093f3a470318d32fc0d27eb53e822198b2ac02b8a66c40b82173a1b83138358baedc43c90e8a2bd474247e7a879a5806e25b0360969e3
-EBUILD josm-5356.ebuild 1627 SHA256 2024106b4560e393cb6fe89d329ebf6066c853f90a28be7c1b725603c607649c SHA512 400e2fbb6f8d7705768cd9d225155dcac6bcbbd946bbe5f39514a7a59717aab4e0c2121237a4fdfde21850cd3e4df93d56c3641dd439e21ac4bcbbe029d18596 WHIRLPOOL d5bd8db69299f1b090b6048b2adf540b3ce8128b3a8e0c8b1b8f35fc5339ad1f855332ef9e9453eba03391cbfe0b05fc2c36e4c543c03a56f08008b9cbd2e2e4
-EBUILD josm-5485.ebuild 1661 SHA256 925490989cb9e674be048ab3efff7279e9c72c1d47a06629b07d268071a1aa18 SHA512 a662baad94e022f7aaac3979bd95da76e0a60c07fc80db69666ecb35e2eef52b7efb6e835409e9dcbc6fa1a011db0d1e38397e5d6c3937fd40296e75b958df5c WHIRLPOOL 8f9d08d3e5163294ad51d2ab8e4d4090d7ac2c2007394e32c81480604fd284394161e7b6035011a46132203681e0f87ad6771744c532f95195bf00211f700239
+EBUILD josm-4203.ebuild 1671 SHA256 c5efc28f4ba94109377e6e07c4bbd895b9f1bda4aabff356259196c065eb08b1 SHA512 cc9ad62777570d0c25873fdc12160a960ee8e7cebc620e16661103bbffc67c74df50340190d4d2f5394f7cc3fc1191198dfec43842dfbb14ee9637296f8d490a WHIRLPOOL 5d322a9c308aaeecaa609771c8e807b7c27572531a7e256b31dda90d434e1f3b0ecc0233382d2def174dd8d08c6976779f5b3be06f8bffa1537951e8fd0876b1
+EBUILD josm-4550.ebuild 1703 SHA256 4d3b6e743cc7c101c4c57bb9814cc3ef1cbe53c9480165f8c967023031e81a94 SHA512 68e3c11de53e31dfdf341ec6bbd0dc95646dbf2f3f2a5f914acee1f5b88728cd33c4340f7a14fe2d5df719e2dbc70246acfc30bb0ab3b2b303b41f85360004a1 WHIRLPOOL 825edd7286c087da3590572904c693e0767d42bee457cb9e8a59f1c62920649e0c3d74f8d5ff43b7b3af39d1dd40a56d5342b73894fc4d98e5dadc594a30b2d6
+EBUILD josm-5315.ebuild 1703 SHA256 7c391f963244abf15c66015321443e9659bf804ef67f22877a07ba5a63ce4860 SHA512 9c943ff976814f31dca30919efd9646244d32c37fb837bb43abb37c93058015f3322aecbc27422ab5fa6fa1f55758d1380fe19f9b3d18e35ced116d44c05eea6 WHIRLPOOL 42c8d988616da1029efd54909ddea623a250d55b0ed0aa34e7a91e207567bb11d252179b76e2d70fad76e58697ed38ffcf7f33c8229076b643cc953822e6c763
+EBUILD josm-5356.ebuild 1703 SHA256 f6e1cb25c4498d161b6133177ef2236a0bd72e2c52ef21968f690f626b78d066 SHA512 74e6eb2a1215e7d7128701baf35294dc736fd86b9cc09441f234157c074d0f5b13bdeff571d899b1ab9349ff5860fdaea36ec31a86ef29f26591e8c55b75572f WHIRLPOOL 729cac0c3c39638ac3ddf5fc3e8defa0de0f552bd1e4c3136dd3783c6a601aee2392aca0fa25fbe969ae3aac8a483c54797102670a4c9b538b9f1030b84128b9
+EBUILD josm-5485.ebuild 1737 SHA256 da37915de524b2c875e2fcb156c77ffa61642d6dd8baab526a209fc681e64766 SHA512 41138d851948be72450050ea464ae78563e84ef64f6c660701df131b0768b034b92dd95fc8515abdea42a6d85c476195f1fa781c8fead7b39e0c316190849f9a WHIRLPOOL 228a8b100a69cf37d13d88ce32d1f1dd72260d1b0330fe45aae2753a40ec4bb7de4405fa093c74f214c3edb29f33fdc5d9a3e655b2d807eb7838f4a7d2b05ba8
 EBUILD josm-9999.ebuild 1599 SHA256 c50f6c5efee1bd05cc914496e2a830805ab24f6a2947002a76921144351d93d8 SHA512 9fc9f508a7f07efec0b81488f56955621e9b88e2adbd215de8c608436ca42b930d0fed73098e64766f030c681a2303b5d976c30c2513586c1ac882c665f21eba WHIRLPOOL e79792a632f5eb637b36cc341c251942ebd8331ffb8455b061073fbb705ebb28a5a6f1d290a594bc1ca1fd4b90b6b5d62380ae6f0d55ceb57036756b55da9c9c
-MISC ChangeLog 5858 SHA256 93b6694bbc8aceabfc20adba0640c96c5ea264d01a0bd9c21c53943ad71274a8 SHA512 dd66754b5732c61b1eca7243b9657313ae228bc0976bc8488da92f322071859c9618250031c7171cab85c5d7aa80a2842b345c3f2fc03c55e888a48f061a4f45 WHIRLPOOL b4fc81c7294c483aee3a88f38b15800ec336bc5e099529a54e907d8aa2907289bbaade42409fd90dce7e3516d9bcdb61e897d0d953620897152c12fd88c5557c
+MISC ChangeLog 6025 SHA256 8f36e2a06548165b6bd28fca68e9c3ce9ce4acba6c7f1a49d2253e617dc98257 SHA512 28736f3f76abd893b2550e0444af6fddbe89dfdb9d703b6de90e207b35e87c5de58545438cafa9c84adc4e2856ae5b0d712583273598d37adb675a583ca0b9fc WHIRLPOOL 2935e1c76a4ef8a3501b55ef1136d3e5522c193dded6bd394d981c1adf429934425643342cefa736ea072ba26bd0a14a368cab5feb87dd59c6298232682b7136
 MISC metadata.xml 237 SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 SHA512 191be9fad0be4a967ecd9cfd2e0014aa60b3fa84f332973e42058ebb8051dd0a6b497df7b9fa055836a0786b5e88a18a0505e7dc69b385e0fb0b2c8e34679639 WHIRLPOOL 0d8b2ffeb2ea3c9e22059f9e9c5ba0c40d774df9df0cd2cc54d0d47758c4b275133d3571508008de5bfc1557de585bd9bed127692f3f056b61b1edecf6c8d0c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQWZyRAAoJEKWIAHK7tR5CnegP/1w/iuVLyB6vUGy6itkeV2gW
-whD4jhp/TLRluQrN//ZuPCZ3S/KA6xAJmK+rcdGBiyLKajClORhAvmELLhtriQ0S
-FDzIoinkBwry9rd+XL9om3bUbd30Tu8Po2mOAG//yGZe4E+8tnBbqvlZQotM+/fV
-YBeaZ8nu8YkSv9KY4whJnLzZ4sJdu/i4pxEWRXRQwgXobghI/waPMrK9Y1tVEyHc
-3x4TfLZ9ShaJdCZ/B8fn15gkwgN0uKuzzBUUMZECNmb/fKri0FrGfl4OtQgNE1MP
-8fHcBE0dexum/MC5v9keqhtTiuDJxNGYh0zSwUQj1I2b2g6qeUCzGaatWghMghGs
-HIC2af8avjZrE3uqESFV9QWwxSLS1fQZYsAX78xkJyRoXKUxHEwelYmOu9MQoHuy
-fj+lFD4LnotB5Lx4HzEYL1Y9Q2US4I5zhpsG0sJH2GBZG64lv0Rwaz4dR+JEMFEE
-nWCZ9AFV1VtLchsZX5PAmvaCVXU/aPdqCWxyqXUc46yMJFd94rnAOx55jX85QIoZ
-pnXe7bR3qrbOh+8Vw1d+JMwWdrlEsvHnxvoa6IwtNp9dslvoiDEebItBev3xXLzH
-RBKYgtwNPKSbhwMKcqAlCJE960X4NLmamOX9eJbPNQVO4DKzJecmi/gd6juKiaHe
-SrJnCwEH+V/2ivz9OsZ+
-=VHhh
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/josm/josm-4203.ebuild b/sci-geosciences/josm/josm-4203.ebuild
index 6f9e4f727795..f13951a4e387 100644
--- a/sci-geosciences/josm/josm-4203.ebuild
+++ b/sci-geosciences/josm/josm-4203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4203.ebuild,v 1.1 2011/07/31 14:10:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4203.ebuild,v 1.2 2012/11/16 20:12:26 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,10 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/sci-geosciences/josm/josm-4550.ebuild b/sci-geosciences/josm/josm-4550.ebuild
index d0daca91f763..e439c41bac0d 100644
--- a/sci-geosciences/josm/josm-4550.ebuild
+++ b/sci-geosciences/josm/josm-4550.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4550.ebuild,v 1.1 2011/11/24 18:55:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4550.ebuild,v 1.2 2012/11/16 20:12:26 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,10 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/sci-geosciences/josm/josm-5315.ebuild b/sci-geosciences/josm/josm-5315.ebuild
index 795d9536d272..a95f1f1f4f15 100644
--- a/sci-geosciences/josm/josm-5315.ebuild
+++ b/sci-geosciences/josm/josm-5315.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/sci-geosciences/josm/josm-5315.ebuild,v 1.1 2012/07/19 11:14:52 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-5315.ebuild,v 1.2 2012/11/16 20:12:26 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,10 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/sci-geosciences/josm/josm-5356.ebuild b/sci-geosciences/josm/josm-5356.ebuild
index 595b60f4173d..cb974730f9f9 100644
--- a/sci-geosciences/josm/josm-5356.ebuild
+++ b/sci-geosciences/josm/josm-5356.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/sci-geosciences/josm/josm-5356.ebuild,v 1.1 2012/07/27 22:28:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-5356.ebuild,v 1.2 2012/11/16 20:12:26 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,10 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
index 0753bd40211c..eb5d15f855d4 100644
--- a/sci-geosciences/josm/josm-5485.ebuild
+++ b/sci-geosciences/josm/josm-5485.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/sci-geosciences/josm/josm-5485.ebuild,v 1.1 2012/09/19 10:20:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-5485.ebuild,v 1.2 2012/11/16 20:12:26 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,10 @@ HOMEPAGE="http://josm.openstreetmap.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.6
 	>=dev-vcs/subversion-1.7"