Version bump. Drop ia64 ppc ppc64 x86-fbsd KEYWORDS. Fix bug 263636.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

2 files changed, 79 insertions, 2 deletions

diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
index 0ec9fee32945..f9505b9a1cd4 100644
--- a/dev-java/jarjar/ChangeLog
+++ b/dev-java/jarjar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jarjar
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.35 2014/08/10 20:16:22 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.36 2015/04/28 02:05:46 monsieurp Exp $
+
+*jarjar-1.4 (28 Apr 2015)
+
+  28 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +jarjar-1.4.ebuild:
+  Version bump. Drop ia64 ppc ppc64 x86-fbsd KEYWORDS. Fix bug 263636.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> jarjar-0.9.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
new file mode 100644
index 000000000000..8d6f8eb62b74
--- /dev/null
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-1.4.ebuild,v 1.1 2015/04/28 02:05:46 monsieurp Exp $
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool for repackaging third-party jars"
+#SRC_URI="mirror://sourceforge/jarjar/${PN}-src-${PV}.zip"
+SRC_URI="http://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
+HOMEPAGE="http://jarjar.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/asm:4
+	=dev-java/gnu-regexp-1*
+	>=dev-java/ant-core-1.7.0
+	dev-java/java-getopt"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/ant-junit )
+	app-arch/unzip
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}" || die
+	rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from asm-4
+	java-pkg_jar-from gnu-regexp-1
+	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from java-getopt-1
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/0.9-system-jars.patch"
+
+	# bug #191378
+	epatch "${FILESDIR}/0.9-bootclasspath.patch"
+}
+
+ANT_TASKS="none"
+EANT_BUILD_TARGET="jar-nojarjar"
+
+# FIXME: tests fail to pass.
+#src_test() {
+#	# regenerates this
+#	cp -i dist/${P}.jar "${T}" || die
+#	cd lib || die
+#	java-pkg_jar-from junit
+#	cd ..
+#	ANT_TASKS="ant-junit" eant test
+#	cp "${T}/${P}.jar" dist || die
+#}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	java-pkg_register-ant-task
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/main/*
+}