Build the jar with and without namespace (the first is required for java-xmlbuilder)

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

2 files changed, 30 insertions, 3 deletions

diff --git a/dev-java/base64/ChangeLog b/dev-java/base64/ChangeLog
index f0c4ab3faf05..c63c3de389b1 100644
--- a/dev-java/base64/ChangeLog
+++ b/dev-java/base64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/base64
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/ChangeLog,v 1.1 2013/10/14 17:06:44 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/ChangeLog,v 1.2 2013/10/14 17:35:55 ercpe Exp $
+
+  14 Oct 2013; Johann Schmitz <ercpe@gentoo.org> base64-2.3.7.ebuild:
+  Build the jar with and without namespace (the first is required for java-
+  xmlbuilder)
 
 *base64-2.3.7 (14 Oct 2013)
 
diff --git a/dev-java/base64/base64-2.3.7.ebuild b/dev-java/base64/base64-2.3.7.ebuild
index 2a40176bdbe7..baf520ed6436 100644
--- a/dev-java/base64/base64-2.3.7.ebuild
+++ b/dev-java/base64/base64-2.3.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/base64-2.3.7.ebuild,v 1.1 2013/10/14 17:06:44 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/base64/base64-2.3.7.ebuild,v 1.2 2013/10/14 17:35:55 ercpe Exp $
 
 EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-pkg-simple versionator
+inherit java-pkg-2 versionator
 
 MY_PV=$(get_version_component_range 1-2)
 
@@ -24,3 +24,26 @@ RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 
 S="${WORKDIR}/${PN^}-v${PV}"
+JAVA_SRC_DIR="${S}"
+
+src_prepare() {
+	rm -r "${S}"/api || die
+	mkdir -p "${S}/net/iharder" || die
+	cp "${S}"/*.java "${S}/net/iharder" || die
+	sed -i '1i package net.iharder;' "${S}"/net/iharder/*.java || die
+}
+
+src_compile() {
+	local build_dir="${S}/build"
+	mkdir ${build_dir} || die
+	ejavac -nowarn -d ${build_dir} $(find -name "*.java")
+	javadoc -d api -quiet *.java || die "javadoc failed"
+}
+
+src_install() {
+	jar cf "${PN}.jar" -C "${S}/build" . || die "jar failed"
+	java-pkg_dojar "${PN}.jar"
+
+	use doc && java-pkg_dohtml -r api/
+	use source && java-pkg_dosrc *.java
+}