Build against slot 3 of commons-httpclient and delete bundled jars in src_unpack.

(Portage version: 2.1.3_rc8)

4 files changed, 76 insertions, 5 deletions

diff --git a/dev-java/jakarta-slide-webdavclient/ChangeLog b/dev-java/jakarta-slide-webdavclient/ChangeLog
index 1ac1dacad908..9e2205580e5c 100644
--- a/dev-java/jakarta-slide-webdavclient/ChangeLog
+++ b/dev-java/jakarta-slide-webdavclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jakarta-slide-webdavclient
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/ChangeLog,v 1.4 2007/07/22 10:04:58 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/ChangeLog,v 1.5 2007/07/22 10:08:40 betelgeuse Exp $
+
+*jakarta-slide-webdavclient-2.1-r2 (22 Jul 2007)
+
+  22 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jakarta-slide-webdavclient-2.1-r1.ebuild,
+  +jakarta-slide-webdavclient-2.1-r2.ebuild:
+  Build against slot 3 of commons-httpclient and delete bundled jars in
+  src_unpack.
 
   22 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jakarta-slide-webdavclient-2.1.ebuild:
diff --git a/dev-java/jakarta-slide-webdavclient/files/digest-jakarta-slide-webdavclient-2.1-r2 b/dev-java/jakarta-slide-webdavclient/files/digest-jakarta-slide-webdavclient-2.1-r2
new file mode 100644
index 000000000000..cb31a683f0eb
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/files/digest-jakarta-slide-webdavclient-2.1-r2
@@ -0,0 +1,3 @@
+MD5 d8719759a8a8033e2c8ed62d50572d80 jakarta-slide-webdavclient-src-2.1.tar.gz 2123807
+RMD160 722abd2860b3814b8878403a1ec41cfcb9c9e0ba jakarta-slide-webdavclient-src-2.1.tar.gz 2123807
+SHA256 ab21b3c25534259993ae4e671bde0ffc8bd6bedae6ee888876cbab98f5e1d4a8 jakarta-slide-webdavclient-src-2.1.tar.gz 2123807
diff --git a/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild
index 2d8928e5c43c..1341f05abdea 100644
--- a/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild
+++ b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild,v 1.2 2007/07/11 19:58:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r1.ebuild,v 1.3 2007/07/22 10:08:40 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -16,7 +16,7 @@ IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4
 	dev-java/antlr
-	=dev-java/commons-httpclient-2.0*
+	=dev-java/commons-httpclient-3*
 	dev-java/commons-logging
 	dev-java/commons-transaction
 	~dev-java/jdom-1.0
@@ -33,9 +33,10 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
-	cd ${S}/lib
+	cd "${S}/lib"
+	rm -v *.jar || die
 	java-pkg_jar-from antlr
-	java-pkg_jar-from commons-httpclient
+	java-pkg_jar-from commons-httpclient-3
 	java-pkg_jar-from commons-logging
 	java-pkg_jar-from commons-transaction
 	java-pkg_jar-from jdom-1.0
diff --git a/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r2.ebuild b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r2.ebuild
new file mode 100644
index 000000000000..e33b4cee6622
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r2.ebuild,v 1.1 2007/07/22 10:08:40 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="! Slide is a content repository which can serve as a basis for a content management system / framework and other purposes"
+HOMEPAGE="http://jakarta.apache.org/slide/index.html"
+SRC_URI="http://archive.apache.org/dist/jakarta/slide/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/antlr
+	=dev-java/commons-httpclient-3*
+	dev-java/commons-logging
+	dev-java/commons-transaction
+	~dev-java/jdom-1.0
+	dev-java/xml-im-exporter"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	java-pkg_jar-from antlr
+	java-pkg_jar-from commons-httpclient-3
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-transaction
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from xml-im-exporter
+}
+
+EANT_BUILD_TARGET="dist-clientlib"
+EANT_DOC_TARGET="javadoc-clientlib"
+
+src_install() {
+	java-pkg_newjar dist/lib/${P/client/lib}.jar ${PN/client/lib}.jar
+
+	dodoc README
+	use doc && java-pkg_dojavadoc build/doc/clientjavadoc/
+	use source && java-pkg_dosrc \
+		clientlib/src/java/* \
+		ant/src/java/* \
+		commandline/src/java/* \
+		connector/src/java/*
+}