* [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/
@ 2015-08-16 0:45 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2015-08-16 0:45 UTC (permalink / raw
To: gentoo-commits
commit: 94a35a3564e3ce5a2385d4b10c836afaa9038d7e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 01:44:50 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 01:45:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a35a35
dev-java/jarjar: Stable for all.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jarjar/jarjar-1.4.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 859e8e7..a5b9979 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -5,15 +5,14 @@ EAPI=5
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
+inherit 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"
+KEYWORDS="amd64 x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/
@ 2015-11-10 15:53 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2015-11-10 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 35a7f0f8ecba0da94c88d3e21792bf10dfb21f2e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 15:40:02 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 15:50:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a7f0f8
dev-java/jarjar: Keyword for arm.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jarjar/jarjar-1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index 427aa66..d193ad2 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
HOMEPAGE="http://jarjar.sourceforge.net"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="amd64 x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
CDEPEND="
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/
@ 2015-11-10 15:53 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2015-11-10 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 98e40eb024455888029f28413038206403007298
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 15:49:35 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 15:50:31 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e40eb0
dev-java/jarjar: Housekeeping wrt EAPI 5 compliance.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jarjar/jarjar-1.4.ebuild | 62 +++++++++++++++++----------------------
1 file changed, 27 insertions(+), 35 deletions(-)
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index d193ad2..81386bc 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -14,56 +14,48 @@ LICENSE="GPL-2"
SLOT="1"
KEYWORDS="amd64 ~arm x86 ppc ppc64 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
+RESTRICT="test"
CDEPEND="
dev-java/asm:4
dev-java/gnu-regexp:1
dev-java/java-getopt:1
dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-RESTRICT='test'
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-# 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
-#}
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ app-arch/unzip"
-src_unpack() {
- unpack ${A}
-
- cd "${S}" || die
- rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jar-nojarjar"
+EANT_GENTOO_CLASSPATH="
+ asm-4
+ gnu-regexp-1
+ java-getopt-1
+ ant-core
+"
- cd "${S}/lib" || die
- rm -v *.jar || die
+ANT_TASKS="none"
- 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
-}
+PATCHES=(
+ "${FILESDIR}/0.9-system-jars.patch"
+ "${FILESDIR}/0.9-bootclasspath.patch"
+)
-src_prepare() {
- epatch "${FILESDIR}/0.9-system-jars.patch"
+JAVA_RM_FILES=(
+ src/main/com/tonicsystems/jarjar/JarJarMojo.java
+)
- # bug #191378
- epatch "${FILESDIR}/0.9-bootclasspath.patch"
+java_prepare() {
+ java-pkg_clean
+ epatch "${PATCHES[@]}"
}
-ANT_TASKS="none"
-EANT_BUILD_TARGET="jar-nojarjar"
-
src_install() {
java-pkg_newjar dist/${P}.jar ${PN}.jar
java-pkg_register-ant-task
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/
@ 2015-11-10 15:53 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2015-11-10 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 91d9243798c5705479447a31c6ff82dcb3576c6c
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 15:50:11 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 15:50:35 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d92437
dev-java/jarjar: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jarjar/Manifest | 1 -
dev-java/jarjar/jarjar-0.9.ebuild | 64 ---------------------------------------
2 files changed, 65 deletions(-)
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index cfb68dc..073cb8a 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,2 +1 @@
-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
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
deleted file mode 100644
index 99deccf..0000000
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-HOMEPAGE="http://jarjar.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-COMMON_DEP="
- =dev-java/asm-2.0*
- =dev-java/gnu-regexp-1*
- >=dev-java/ant-core-1.7.0
- dev-java/java-getopt"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )
- app-arch/unzip
- ${COMMON_DEP}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- rm -v src/main/com/tonicsystems/jarjar/JarJarMojo.java || die
- rm -vr src/main/gnu || die
-
- epatch "${FILESDIR}/0.9-system-jars.patch"
- # bug #191378
- epatch "${FILESDIR}/0.9-bootclasspath.patch"
-
- cd "${S}/lib"
- rm -v *.jar || die
- java-pkg_jar-from asm-2
- java-pkg_jar-from gnu-regexp-1
- java-pkg_jar-from ant-core ant.jar
- java-pkg_jar-from java-getopt-1
-}
-
-ANT_TASKS="none"
-EANT_BUILD_TARGET="jar-nojarjar"
-
-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/*
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/
@ 2017-07-13 18:32 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-07-13 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 38d4b51cdf58933cff4fbc2eb9864f6b066c0f0e
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 18:29:47 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 18:32:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d4b51c
dev-java/jarjar: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/jarjar/jarjar-1.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jarjar/jarjar-1.4.ebuild b/dev-java/jarjar/jarjar-1.4.ebuild
index e0a86576e94..9108139df10 100644
--- a/dev-java/jarjar/jarjar-1.4.ebuild
+++ b/dev-java/jarjar/jarjar-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://jarjar.googlecode.com/files/${PN}-src-${PV}.zip"
HOMEPAGE="http://jarjar.sourceforge.net"
LICENSE="GPL-2"
SLOT="1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE=""
RESTRICT="test"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-13 18:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-10 15:53 [gentoo-commits] repo/gentoo:master commit in: dev-java/jarjar/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-07-13 18:32 Alexis Ballier
2015-11-10 15:53 Patrice Clement
2015-11-10 15:53 Patrice Clement
2015-08-16 0:45 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox