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

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 89 insertions, 6 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/Manifest b/dev-java/jarjar/Manifest
index 85e2605558a4..332f9945f412 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -4,13 +4,19 @@ Hash: SHA256
 AUX 0.9-bootclasspath.patch 630 SHA256 9c52c664c2537fa2e251b55e24a8b043db3543faedfc83ac330237ae3934cf11 SHA512 07225e41b1497c369fcd924ea6ff612388c020f89181e583bd5dc55d5219fe81a196c76df3bf5b8bdf882bf3a25b5b874110d231c5a3e5d387bdff16b2d0cc27 WHIRLPOOL 955b87e6b93e0c80c90a96b08b83abd55cfdc4c0a771eca600ffbf78fb66ec1379a42d917ae7afde037f5cbda245146a6ee08d39fcbb49e5fbf329f9ede04764
 AUX 0.9-system-jars.patch 790 SHA256 9e1f66b2da6c774b643e45c487815288daafa8d55ab674d5c45727609ba3fc5e SHA512 6dfcd74af809b85e11a4f9c0cf5aea176ef1dff86705346e26a0f4be6f2b9f45dba82d304d83dd5be6e8def37947217bcebe408fd7627f9a1511a3d6d721d992 WHIRLPOOL 4b640b5adf367c2b3f87f16c719324c4c21ec721edceb6afd73074ab9505953a5e0fa2d0131beee00bc5a52cd0ec62741a5f84ce27e689386e11af03e716434e
 DIST jarjar-src-0.9.zip 188269 SHA256 da90f1cb07dbd07b8141a4541acc701a0d33abb2808fe2410dd6782c98cb9b2a SHA512 ddfdad65785c9ecd98021cd1eb6226bce182e77421be2608a9e1776164e0e84ec957a453cb54e19fc0cc9cd2fcacb3867f399e1b40bd9696607885f00ab3c917 WHIRLPOOL 1e526ffc0dd4bf3e20e4751d171598028e78c6087bb6a02f070771a855495cbc8b54669c6802a2acb6115204e45e6cf7df1183bc259d978d67f71949c2d96c59
+DIST jarjar-src-1.4.zip 339014 SHA256 54368bb0ec484429243dc5620ce49d428f007c7eb8f3400367cdb2142dcc11ed SHA512 62af4f07c3fe2b887da959b8251a94fbd1c142e56b3332ad81865eef9ba32ded47883fc37d943c0081a4496ab71ef044022d13f21ccdb8db690638c26fc52c31 WHIRLPOOL c5fb411211f303976d3c10c6d3063b50defb7c5e8368d9f4f5faeef17eced530e59fa7d67153d04a9be98f60a28f276800f9e672a044415d69a2e4905222e03f
 EBUILD jarjar-0.9.ebuild 1653 SHA256 62cb6a85d834d17655bb2c564bb0b75857699e58df31efcf79250f12ee28ed7a SHA512 8ab6d046ac3ae00a5b54ffd9afc624bfe6cd48097a2702f8fc82eb00529b89f1def09d98521d659a201a31241d9ea61ab578dacda17b82852e7839429f5c9ef3 WHIRLPOOL 60ff468a049bdf9f80735271c2b68883710e6f05e929fa104c37348cb9aaf60dfe3c6123c884eeb19c929d1a0fee247c08b5723eb6e030edff9c228705cf2d12
-MISC ChangeLog 5031 SHA256 a06bdb343ddb8ddf61729aac7d72b3edb2192d0f7fa2af95ba5aac0427f825a9 SHA512 17c740790451f0aae9c223ae8cacff2b6535e04c92fb1565cb97f0ca2781c3ee94ddeacd75ec424c76c70b73062b5a9996071484110448c4fa4fb98c4e88bc8f WHIRLPOOL 581ccce1c783c6fcbf513b9f0dcae94c6555891cb1ec37168ab416ed4cb59c5e6fde82234a6e4f56731b78a4c714ac6f53119f50ea4d190862a8321051246759
+EBUILD jarjar-1.4.ebuild 1737 SHA256 4d2af8d1eb08c78cf27d77027bd59929c520fb74ceb389efe76c1f9a1fef54e5 SHA512 46b1e668e4d085ac7dc42ee53bf1c5a7881b0829113ac7746cd9f38a4cb186ab6a9f08c5f3ee1016f5a9c715f2aac4da23f6013a4232e2122991ea46378cab42 WHIRLPOOL f83f59b402dfa0cb0e0fbfab638d47082d21eaad237300cae19cd54f1e0371e3828b7b8ea8c07db47e3bbcd3d88b25c8f979b97521a7222fdd698103823e3d7c
+MISC ChangeLog 5207 SHA256 cb90819d322430b23b72792498af95cedf865ece02ae38c58660dcc00548b4c0 SHA512 6326481e49724dbe6fa1e6cb96d8f881e5b364ca0153f7e769de9f29d35ef9195fc334e4ad7df0e76431732bff9b3f9a8f81c9f27de7c4f4815a59b3f227fec6 WHIRLPOOL 15a5fdc25ab3142c516b3b4b53aba379bcf715e6f24f2880a16c276a4c84fb621604c2abd03de52f53899c6418d9007e40d1efd6cccc9566516ae8fb709e3adf
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0xcACgkQcaHudmEf86rO2wCgh+KljB8Yzw0+GGJ3AIf3juGT
-iq4An2+Hk3BKBAvhQJfkqipZmqv01pKA
-=Na30
+iQEcBAEBCAAGBQJVPur+AAoJEJGRpfGTSRu4PHEIAMAYvsR9gMzZ6UZlC5gxTJOn
+8VZ0e091vcmQMB6PKCh5a4NZMmNYVXSIA7lZIpoLPiZe1tFw9eNf1zlHDjH0bbMd
+2LyCbBbWGJuARcEoMtctnKUh0KICYucBEDd0og6nbV/0PxlXwIM6cCXYfiaw8dBo
+dDO1nHh+v7wDkKDEst+ov8J6qEi3fuRRCD0h+pkg6kDArOSIWJ7V8LSxz65O8Zdq
+ouu6nM7gMLZMvlmAHhDiUse6aiy6bkSZP39B0lnIFZSwenW7wTebcVMy7Wt6txLn
+Jo+FK6Tuk1TlQG8DWGc2CE13v3o3l2NTWJAPFgyFBTQbfwAv+xm1noFYbYj0EYk=
+=Hns1
 -----END PGP SIGNATURE-----
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/*
+}