Fixed compilation with java USE flag being enabled

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

7 files changed, 31 insertions, 8 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index ecac0d393fda..6c41e329b8b1 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.348 2014/05/20 08:53:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.349 2014/05/20 13:19:07 polynomial-c Exp $
+
+  20 May 2014; Lars Wendler <polynomial-c@gentoo.org> db-5.3.21.ebuild,
+  db-5.3.28.ebuild, db-5.3.28-r1.ebuild, db-5.3.28-r2.ebuild,
+  db-6.0.20-r1.ebuild, db-6.0.30.ebuild:
+  Fixed compilation with java USE flag being enabled.
 
 *db-6.0.30 (20 May 2014)
 
diff --git a/sys-libs/db/db-5.3.21.ebuild b/sys-libs/db/db-5.3.21.ebuild
index 89181379ed0a..3479705e28fd 100644
--- a/sys-libs/db/db-5.3.21.ebuild
+++ b/sys-libs/db/db-5.3.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.21.ebuild,v 1.4 2014/01/18 04:14:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.21.ebuild,v 1.5 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=2
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -53,6 +53,9 @@ src_prepare() {
 	# upstreamed:5.2.36
 	#epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
diff --git a/sys-libs/db/db-5.3.28-r1.ebuild b/sys-libs/db/db-5.3.28-r1.ebuild
index 9de82b312849..b52ff04ee6ab 100644
--- a/sys-libs/db/db-5.3.28-r1.ebuild
+++ b/sys-libs/db/db-5.3.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r1.ebuild,v 1.1 2014/04/03 08:47:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r1.ebuild,v 1.2 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=5
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -48,6 +48,9 @@ src_prepare() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
diff --git a/sys-libs/db/db-5.3.28-r2.ebuild b/sys-libs/db/db-5.3.28-r2.ebuild
index b295c8fee961..823188ccf921 100644
--- a/sys-libs/db/db-5.3.28-r2.ebuild
+++ b/sys-libs/db/db-5.3.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild,v 1.1 2014/05/15 18:36:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28-r2.ebuild,v 1.2 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=5
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal
@@ -52,6 +52,9 @@ src_prepare() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
diff --git a/sys-libs/db/db-5.3.28.ebuild b/sys-libs/db/db-5.3.28.ebuild
index 6736f4e282f3..1f8ee8d574b8 100644
--- a/sys-libs/db/db-5.3.28.ebuild
+++ b/sys-libs/db/db-5.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28.ebuild,v 1.2 2014/01/18 04:14:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.3.28.ebuild,v 1.3 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=4
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -50,6 +50,9 @@ src_prepare() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
diff --git a/sys-libs/db/db-6.0.20-r1.ebuild b/sys-libs/db/db-6.0.20-r1.ebuild
index 8167d76cd5f1..230c743f8b8e 100644
--- a/sys-libs/db/db-6.0.20-r1.ebuild
+++ b/sys-libs/db/db-6.0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.20-r1.ebuild,v 1.3 2014/01/18 04:14:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.20-r1.ebuild,v 1.4 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=4
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib
@@ -50,6 +50,9 @@ src_prepare() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
diff --git a/sys-libs/db/db-6.0.30.ebuild b/sys-libs/db/db-6.0.30.ebuild
index be80d793e052..458777385374 100644
--- a/sys-libs/db/db-6.0.30.ebuild
+++ b/sys-libs/db/db-6.0.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30.ebuild,v 1.1 2014/05/20 08:53:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.0.30.ebuild,v 1.2 2014/05/20 13:19:07 polynomial-c Exp $
 
 EAPI=4
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator
@@ -54,6 +54,9 @@ src_prepare() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 
+	# bug #510506
+	epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
+
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
 	epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
@@ -158,7 +161,7 @@ multilib_src_configure() {
 		$(use_enable cxx) \
 		$(use_enable cxx stl) \
 		$(multilib_native_use_enable java) \
-		${myconf[@]} \
+		"${myconf[@]}" \
 		$(use_enable test)
 }