Migrate to EAPI 2 and fix javadoc installation. Fixes bug #260211.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo-r1 i686

3 files changed, 71 insertions, 3 deletions

diff --git a/dev-java/jakarta-slide-webdavclient/ChangeLog b/dev-java/jakarta-slide-webdavclient/ChangeLog
index f2fc89b21bbc..ea830db53108 100644
--- a/dev-java/jakarta-slide-webdavclient/ChangeLog
+++ b/dev-java/jakarta-slide-webdavclient/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2007/11/01 00:37:39 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-slide-webdavclient/ChangeLog,v 1.8 2009/02/25 14:13:47 betelgeuse Exp $
+
+*jakarta-slide-webdavclient-2.1-r3 (25 Feb 2009)
+
+  25 Feb 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +jakarta-slide-webdavclient-2.1-r3.ebuild:
+  Migrate to EAPI 2 and fix javadoc installation. Fixes bug #260211.
 
   01 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jakarta-slide-webdavclient-2.1-r1.ebuild:
diff --git a/dev-java/jakarta-slide-webdavclient/Manifest b/dev-java/jakarta-slide-webdavclient/Manifest
index 2a4ca8f42257..54b0af8bb522 100644
--- a/dev-java/jakarta-slide-webdavclient/Manifest
+++ b/dev-java/jakarta-slide-webdavclient/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jakarta-slide-webdavclient-2.1-gentoo.patch 3717 RMD160 fc9d5296e129c3a4e33efa4b9866477824e7d349 SHA1 4f00996372dbed27ce35325cb02b000f7894bdcb SHA256 128d568b55376a0979e497595c32f8396604ae3cbc02c79aa1edadcb57087992
 DIST jakarta-slide-webdavclient-src-2.1.tar.gz 2123807 RMD160 722abd2860b3814b8878403a1ec41cfcb9c9e0ba SHA1 082a48d505a8612663619c0163a53b5b29cd06f0 SHA256 ab21b3c25534259993ae4e671bde0ffc8bd6bedae6ee888876cbab98f5e1d4a8
 EBUILD jakarta-slide-webdavclient-2.1-r2.ebuild 1491 RMD160 075076b8aa1ab39e2048b55b0679fef055212243 SHA1 50a12faa59e9d4674ab75f63380c18c7e0304cdf SHA256 6782f9ba968aa97708a3bf7924f1bab1ec0536dab681d975a3a534503d0ecb3e
-MISC ChangeLog 1576 RMD160 b377a5b34695e0acf8bcac70bab30b1f431e5f8f SHA1 72743681972209e964403695cc5dbe993197f914 SHA256 75537cc7f6798250da2b73370fb322409c37576a91675e7dcd04ba38a3b5b27c
+EBUILD jakarta-slide-webdavclient-2.1-r3.ebuild 1337 RMD160 3afb0be920c07cc0b645314ec6edce682754caa3 SHA1 0161d756c1a9469d85a8a765d409a2bbdcb1f736 SHA256 2a88e36e0bbe75216a1ff7de5677b240716d33c2eeed176d614c495b1c281306
+MISC ChangeLog 1794 RMD160 f146505e772f8b97d364c93f55c445cf0fb75536 SHA1 c8b9d1900652c9e4169acfe7b363c84dc3f8fd21 SHA256 7535f5a8335610fa7e95c55a7e9f1b03321b28d8e9514df0fb2b68a1c57445ee
 MISC metadata.xml 322 RMD160 03f00125b2ec7a18c6b8cef1229974c7237beb0c SHA1 f5a4250634e78ed5a91b4e4dd6bf133a1c8cc5bd SHA256 1fb3d217786e3789e2fb2e7c838fbcaa427c10fe4b14f74a052d153b83074c5e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmlUjgACgkQcxLzpIGCsLThhwCcC0YTzCC1vOGKnQZUsPu5v4Ib
+GJEAn3p+XCo9io8K5aCEvzn33cOnT8pB
+=LxZp
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild
new file mode 100644
index 000000000000..8fa7465a872f
--- /dev/null
+++ b/dev-java/jakarta-slide-webdavclient/jakarta-slide-webdavclient-2.1-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 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-r3.ebuild,v 1.1 2009/02/25 14:13:47 betelgeuse Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="A content repository"
+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=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0
+	dev-java/xml-im-exporter:0"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	rm -v lib/*.jar || die
+	java-pkg-2_src_prepare
+}
+
+EANT_GENTOO_CLASSPATH="jdom-1.0,commons-httpclient-3,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 || die
+	use doc && java-pkg_dojavadoc build/clientlib/doc/clientjavadoc
+	use source && java-pkg_dosrc \
+		clientlib/src/java/* \
+		ant/src/java/* \
+		commandline/src/java/* \
+		connector/src/java/*
+}