workaround for bug 399061

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

6 files changed, 32 insertions, 14 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/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"