commit: 9fe52500702f7f971d3aea65f804c77ce4cdbec4 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Wed Sep 30 19:48:14 2015 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Sep 30 19:48:14 2015 +0000 URL: https://gitweb.gentoo.org/proj/java-experimental.git/commit/?id=9fe52500
dev-java/jarjar: Moved to the main tree a while ago. Removing it. Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> dev-java/jarjar/ChangeLog | 17 -------- dev-java/jarjar/Manifest | 6 --- dev-java/jarjar/files/0.9-bootclasspath.patch | 11 ----- dev-java/jarjar/files/1.0-ant-1.8-compat.patch | 11 ----- dev-java/jarjar/jarjar-1.0.ebuild | 58 -------------------------- dev-java/jarjar/metadata.xml | 8 ---- 6 files changed, 111 deletions(-) diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog deleted file mode 100644 index 6780073..0000000 --- a/dev-java/jarjar/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for dev-java/jarjar -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 28 Feb 2010; Vlastimil Babka <cas...@gentoo.org> Manifest: - Fix building with ant 1.8, bug #263636. - - 06 Oct 2009; Vlastimil Babka <cas...@gentoo.org> jarjar-1.0.ebuild: - Use build.xml patch, as property did not affect src_test. - - 06 Oct 2009; Vlastimil Babka <cas...@gentoo.org> jarjar-1.0.ebuild: - Fix building with ecj, bug #191378. - - 05 Apr 2009; Ralph Sennhauser <gentoo.s...@bluewin.ch> +jarjar-1.0.ebuild: - Adding jarjar version bump. - There are no changes in the source from 1.0rc8 to 1.0. - Use slot depend on maven-plugin-api:2.1. diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest deleted file mode 100644 index 31da4ea..0000000 --- a/dev-java/jarjar/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 0.9-bootclasspath.patch 630 RMD160 3561143fbb565c585dd4cd094587aaff63982421 SHA1 17c21ec26e318ae4455b225ff0537f943b8c6cf8 SHA256 9c52c664c2537fa2e251b55e24a8b043db3543faedfc83ac330237ae3934cf11 -AUX 1.0-ant-1.8-compat.patch 547 RMD160 b6263cc01f2700a7eb263b64aaeedba0ed8af53c SHA1 888d7f085189b4fddec5d04f59f2101f23aab9ec SHA256 c4fbdb30484895475ce5042485b34f537916f90a88c4b901977e606d3a460692 -DIST jarjar-src-1.0rc8.zip 136130 RMD160 76f3231a72a495dd18273bb60489f5c6f7b2a641 SHA1 74b2d7a6801eddc0d1dcc5ad8d02271e58c6d490 SHA256 350b721052ffda3069551e11490be5e65ca93a27b6d0642ca5d153f9d073389a -EBUILD jarjar-1.0.ebuild 1426 RMD160 d726f573ee25c9534995f0444d6ca7e3ee68fe73 SHA1 97a3ae9b2149c76ee28ff02e2e71df4b7a9b8d1c SHA256 707ee026f8f3cc4ff2f6d5e638c2bd6ba1eea7959a827c15420a810a1c0e05c7 -MISC ChangeLog 667 RMD160 26ddb8cc86e52ac4026812330d9a250180b4943b SHA1 e9bf9690fb56f9935ead9f401e554e5470121820 SHA256 166d3e1c53ef2f72879b7fe0586f3eb1b46f66048eb527a5bff687aedb352c31 -MISC metadata.xml 253 RMD160 f6b5812e7739d0096873a62f629fb2e5a94111df SHA1 bdc6116eeb3464e67cc30e5518b00e6aa91d509c SHA256 f862757912f75eca6cf073057b03c0dad2af839f6d40c6e57fc6898a54a81099 diff --git a/dev-java/jarjar/files/0.9-bootclasspath.patch b/dev-java/jarjar/files/0.9-bootclasspath.patch deleted file mode 100644 index 6a46d1a..0000000 --- a/dev-java/jarjar/files/0.9-bootclasspath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml 2008-09-13 13:55:40.000000000 +0200 -+++ build.xml 2009-10-06 20:51:53.000000000 +0200 -@@ -48,7 +48,7 @@ - </copy> - <javac srcdir="src/@{module}" destdir="build/@{module}" - source="${compile.source}" -- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" -+ target="${compile.target}" extdirs="${compile.extdirs}" - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> - <classpath refid="@{refid}"/> - <compilerarg value="-Xlint"/> diff --git a/dev-java/jarjar/files/1.0-ant-1.8-compat.patch b/dev-java/jarjar/files/1.0-ant-1.8-compat.patch deleted file mode 100644 index 80bd89e..0000000 --- a/dev-java/jarjar/files/1.0-ant-1.8-compat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java.orig 2010-02-28 01:42:53.000000000 +0100 -+++ src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java 2010-02-28 01:43:05.000000000 +0100 -@@ -84,7 +84,7 @@ - String dir = file.substring(0, slash); - if (dirs.add(dir)) { - addParentDirs(dir, zOut); -- super.zipDir(null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); -+ super.zipDir((File)null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); - } - } - } diff --git a/dev-java/jarjar/jarjar-1.0.ebuild b/dev-java/jarjar/jarjar-1.0.ebuild deleted file mode 100644 index cd70168..0000000 --- a/dev-java/jarjar/jarjar-1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Tool for repackaging third-party jars." -HOMEPAGE="http://code.google.com/p/jarjar/" -# 1.0 has no source tarball, but there are no changes from 1.0rc8 to 1.0 anyway -SRC_URI="http://${PN}.googlecode.com/files/${PN}-src-${PV}rc8.zip" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEP="dev-java/ant-core:0" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip:0 - dev-java/asm:3 - dev-java/maven-plugin-api:2.1 - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - ) - ${COMMON_DEP}" - -S="${WORKDIR}/${P}rc8" - -java_prepare() { - # bug #191378 - epatch "${FILESDIR}/0.9-bootclasspath.patch" - # bug #305929 - epatch "${FILESDIR}/1.0-ant-1.8-compat.patch" - - cd lib/ && rm * || die - java-pkg_jar-from ant-core - java-pkg_jar-from --build-only asm-3 asm.jar asm-3.1.jar - java-pkg_jar-from --build-only asm-3 asm-commons.jar asm-commons-3.1.jar - java-pkg_jar-from --build-only maven-plugin-api-2.1 - use test && java-pkg_jar-from --build-only junit -} - -src_test() { - ANT_TASKS="ant-junit" eant test -} - -src_install() { - java-pkg_newjar "dist/${PN}-snapshot.jar" "${PN}.jar" - java-pkg_register-ant-task - use doc && java-pkg_dojavadoc dist/javadoc - use source && java-pkg_dosrc src/main/com -} diff --git a/dev-java/jarjar/metadata.xml b/dev-java/jarjar/metadata.xml deleted file mode 100644 index 7286f93..0000000 --- a/dev-java/jarjar/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>java</herd> - <longdescription lang="en"> - Tool for repackaging third-party jars. - </longdescription> -</pkgmetadata>