Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java-experimental:master commit in: dev-java/jarjar/, dev-java/jarjar/files/
Date: Wed, 30 Sep 2015 19:49:47
Message-Id: 1443642494.9fe52500702f7f971d3aea65f804c77ce4cdbec4.monsieurp@gentoo
1 commit: 9fe52500702f7f971d3aea65f804c77ce4cdbec4
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 19:48:14 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 19:48:14 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/java-experimental.git/commit/?id=9fe52500
7
8 dev-java/jarjar: Moved to the main tree a while ago. Removing it.
9
10 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
11
12 dev-java/jarjar/ChangeLog | 17 --------
13 dev-java/jarjar/Manifest | 6 ---
14 dev-java/jarjar/files/0.9-bootclasspath.patch | 11 -----
15 dev-java/jarjar/files/1.0-ant-1.8-compat.patch | 11 -----
16 dev-java/jarjar/jarjar-1.0.ebuild | 58 --------------------------
17 dev-java/jarjar/metadata.xml | 8 ----
18 6 files changed, 111 deletions(-)
19
20 diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
21 deleted file mode 100644
22 index 6780073..0000000
23 --- a/dev-java/jarjar/ChangeLog
24 +++ /dev/null
25 @@ -1,17 +0,0 @@
26 -# ChangeLog for dev-java/jarjar
27 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: $
29 -
30 - 28 Feb 2010; Vlastimil Babka <caster@g.o> Manifest:
31 - Fix building with ant 1.8, bug #263636.
32 -
33 - 06 Oct 2009; Vlastimil Babka <caster@g.o> jarjar-1.0.ebuild:
34 - Use build.xml patch, as property did not affect src_test.
35 -
36 - 06 Oct 2009; Vlastimil Babka <caster@g.o> jarjar-1.0.ebuild:
37 - Fix building with ecj, bug #191378.
38 -
39 - 05 Apr 2009; Ralph Sennhauser <gentoo.sera@×××××××.ch> +jarjar-1.0.ebuild:
40 - Adding jarjar version bump.
41 - There are no changes in the source from 1.0rc8 to 1.0.
42 - Use slot depend on maven-plugin-api:2.1.
43
44 diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
45 deleted file mode 100644
46 index 31da4ea..0000000
47 --- a/dev-java/jarjar/Manifest
48 +++ /dev/null
49 @@ -1,6 +0,0 @@
50 -AUX 0.9-bootclasspath.patch 630 RMD160 3561143fbb565c585dd4cd094587aaff63982421 SHA1 17c21ec26e318ae4455b225ff0537f943b8c6cf8 SHA256 9c52c664c2537fa2e251b55e24a8b043db3543faedfc83ac330237ae3934cf11
51 -AUX 1.0-ant-1.8-compat.patch 547 RMD160 b6263cc01f2700a7eb263b64aaeedba0ed8af53c SHA1 888d7f085189b4fddec5d04f59f2101f23aab9ec SHA256 c4fbdb30484895475ce5042485b34f537916f90a88c4b901977e606d3a460692
52 -DIST jarjar-src-1.0rc8.zip 136130 RMD160 76f3231a72a495dd18273bb60489f5c6f7b2a641 SHA1 74b2d7a6801eddc0d1dcc5ad8d02271e58c6d490 SHA256 350b721052ffda3069551e11490be5e65ca93a27b6d0642ca5d153f9d073389a
53 -EBUILD jarjar-1.0.ebuild 1426 RMD160 d726f573ee25c9534995f0444d6ca7e3ee68fe73 SHA1 97a3ae9b2149c76ee28ff02e2e71df4b7a9b8d1c SHA256 707ee026f8f3cc4ff2f6d5e638c2bd6ba1eea7959a827c15420a810a1c0e05c7
54 -MISC ChangeLog 667 RMD160 26ddb8cc86e52ac4026812330d9a250180b4943b SHA1 e9bf9690fb56f9935ead9f401e554e5470121820 SHA256 166d3e1c53ef2f72879b7fe0586f3eb1b46f66048eb527a5bff687aedb352c31
55 -MISC metadata.xml 253 RMD160 f6b5812e7739d0096873a62f629fb2e5a94111df SHA1 bdc6116eeb3464e67cc30e5518b00e6aa91d509c SHA256 f862757912f75eca6cf073057b03c0dad2af839f6d40c6e57fc6898a54a81099
56
57 diff --git a/dev-java/jarjar/files/0.9-bootclasspath.patch b/dev-java/jarjar/files/0.9-bootclasspath.patch
58 deleted file mode 100644
59 index 6a46d1a..0000000
60 --- a/dev-java/jarjar/files/0.9-bootclasspath.patch
61 +++ /dev/null
62 @@ -1,11 +0,0 @@
63 ---- build.xml 2008-09-13 13:55:40.000000000 +0200
64 -+++ build.xml 2009-10-06 20:51:53.000000000 +0200
65 -@@ -48,7 +48,7 @@
66 - </copy>
67 - <javac srcdir="src/@{module}" destdir="build/@{module}"
68 - source="${compile.source}"
69 -- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
70 -+ target="${compile.target}" extdirs="${compile.extdirs}"
71 - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
72 - <classpath refid="@{refid}"/>
73 - <compilerarg value="-Xlint"/>
74
75 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
76 deleted file mode 100644
77 index 80bd89e..0000000
78 --- a/dev-java/jarjar/files/1.0-ant-1.8-compat.patch
79 +++ /dev/null
80 @@ -1,11 +0,0 @@
81 ---- src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java.orig 2010-02-28 01:42:53.000000000 +0100
82 -+++ src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java 2010-02-28 01:43:05.000000000 +0100
83 -@@ -84,7 +84,7 @@
84 - String dir = file.substring(0, slash);
85 - if (dirs.add(dir)) {
86 - addParentDirs(dir, zOut);
87 -- super.zipDir(null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER);
88 -+ super.zipDir((File)null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER);
89 - }
90 - }
91 - }
92
93 diff --git a/dev-java/jarjar/jarjar-1.0.ebuild b/dev-java/jarjar/jarjar-1.0.ebuild
94 deleted file mode 100644
95 index cd70168..0000000
96 --- a/dev-java/jarjar/jarjar-1.0.ebuild
97 +++ /dev/null
98 @@ -1,58 +0,0 @@
99 -# Copyright 1999-2009 Gentoo Foundation
100 -# Distributed under the terms of the GNU General Public License v2
101 -# $Header: $
102 -
103 -EAPI="2"
104 -JAVA_PKG_IUSE="doc source test"
105 -
106 -inherit java-pkg-2 java-ant-2
107 -
108 -DESCRIPTION="Tool for repackaging third-party jars."
109 -HOMEPAGE="http://code.google.com/p/jarjar/"
110 -# 1.0 has no source tarball, but there are no changes from 1.0rc8 to 1.0 anyway
111 -SRC_URI="http://${PN}.googlecode.com/files/${PN}-src-${PV}rc8.zip"
112 -
113 -LICENSE="Apache-2.0"
114 -SLOT="1"
115 -KEYWORDS="~amd64"
116 -IUSE=""
117 -
118 -COMMON_DEP="dev-java/ant-core:0"
119 -RDEPEND=">=virtual/jre-1.5
120 - ${COMMON_DEP}"
121 -DEPEND=">=virtual/jdk-1.5
122 - app-arch/unzip:0
123 - dev-java/asm:3
124 - dev-java/maven-plugin-api:2.1
125 - test? (
126 - dev-java/junit:0
127 - dev-java/ant-junit:0
128 - )
129 - ${COMMON_DEP}"
130 -
131 -S="${WORKDIR}/${P}rc8"
132 -
133 -java_prepare() {
134 - # bug #191378
135 - epatch "${FILESDIR}/0.9-bootclasspath.patch"
136 - # bug #305929
137 - epatch "${FILESDIR}/1.0-ant-1.8-compat.patch"
138 -
139 - cd lib/ && rm * || die
140 - java-pkg_jar-from ant-core
141 - java-pkg_jar-from --build-only asm-3 asm.jar asm-3.1.jar
142 - java-pkg_jar-from --build-only asm-3 asm-commons.jar asm-commons-3.1.jar
143 - java-pkg_jar-from --build-only maven-plugin-api-2.1
144 - use test && java-pkg_jar-from --build-only junit
145 -}
146 -
147 -src_test() {
148 - ANT_TASKS="ant-junit" eant test
149 -}
150 -
151 -src_install() {
152 - java-pkg_newjar "dist/${PN}-snapshot.jar" "${PN}.jar"
153 - java-pkg_register-ant-task
154 - use doc && java-pkg_dojavadoc dist/javadoc
155 - use source && java-pkg_dosrc src/main/com
156 -}
157
158 diff --git a/dev-java/jarjar/metadata.xml b/dev-java/jarjar/metadata.xml
159 deleted file mode 100644
160 index 7286f93..0000000
161 --- a/dev-java/jarjar/metadata.xml
162 +++ /dev/null
163 @@ -1,8 +0,0 @@
164 -<?xml version="1.0" encoding="UTF-8"?>
165 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
166 -<pkgmetadata>
167 - <herd>java</herd>
168 - <longdescription lang="en">
169 - Tool for repackaging third-party jars.
170 - </longdescription>
171 -</pkgmetadata>