From 12cfb0cd818b9dc2dfc7ba0c433ddae1a04bf890 Mon Sep 17 00:00:00 2001
From: Micha Glave <gentoo@migmedia.de>
Date: Tue, 10 May 2011 12:28:34 +0200
Subject: [PATCH] jarjar bumped to 1.1

---
 dev-java/jarjar/Manifest          |  4 +--
 dev-java/jarjar/jarjar-1.0.ebuild | 58 -------------------------------
 dev-java/jarjar/jarjar-1.1.ebuild | 30 ++++++++++++++++
 3 files changed, 32 insertions(+), 60 deletions(-)
 delete mode 100644 dev-java/jarjar/jarjar-1.0.ebuild
 create mode 100644 dev-java/jarjar/jarjar-1.1.ebuild

diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index 0a6f4ad..1797a13 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,2 +1,2 @@
-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
+DIST jarjar-1.1.jar 113329 RMD160 0ff57ce5d32ef3b34d9ba3f5d076b1b868a4ebad SHA1 88085e95e0c9cf49e29116bd467a5dccd07d40a0 SHA256 4838f4f29a027522363cef1bcda1b48808880b0de4953fab6db4121ee27b649b
+EBUILD jarjar-1.1.ebuild 630 RMD160 390dd0c22aa4cab143f2e5561ba7be593a84ea34 SHA1 dda57746ddfd02b22477533663f9e84ead3dcba4 SHA256 86e24f0dfbb96a8215893b2edc1a88180f0753a76fbcda1d9fd61563ab7ef627
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/jarjar-1.1.ebuild b/dev-java/jarjar/jarjar-1.1.ebuild
new file mode 100644
index 0000000..655aca0
--- /dev/null
+++ b/dev-java/jarjar/jarjar-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool for repackaging third-party jars."
+HOMEPAGE="http://code.google.com/p/jarjar/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.jar"
+
+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
+	${COMMON_DEP}"
+
+src_unpack() {
+	einfo "Nothing to unpack"
+}
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${P}.jar" "${PN}.jar"
+	java-pkg_register-ant-task
+}