Cleaned up the ebuild and fixed javadoc installation.

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/jakarta-regexp/ChangeLog b/dev-java/jakarta-regexp/ChangeLog
index 928866b74fbf5691c764ceaa292110a31aaba4d8..1642179c2b9656271f692d9336bb9d790d723634 100644 (file)
--- a/dev-java/jakarta-regexp/ChangeLog
+++ b/dev-java/jakarta-regexp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jakarta-regexp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.14 2006/10/05 17:20:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.15 2006/12/03 18:06:21 betelgeuse Exp $
+
+*jakarta-regexp-1.3-r4 (03 Dec 2006)
+
+  03 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  jakarta-regexp-1.3-r3.ebuild, +jakarta-regexp-1.3-r4.ebuild:
+  Cleaned up the ebuild and fixed javadoc installation.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   jakarta-regexp-1.3-r2.ebuild, jakarta-regexp-1.3-r3.ebuild,

diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest
index 0e4dae080dfa6dbea27192a29fa0b96fa18bb262..26298a8b4f6196fc4e90493f24f3d509d5bbd7c9 100644 (file)
--- a/dev-java/jakarta-regexp/Manifest
+++ b/dev-java/jakarta-regexp/Manifest
@@ -7,18 +7,22 @@ EBUILD jakarta-regexp-1.3-r2.ebuild 1090 RMD160 9a2d31c1d1220cb365425fb68dd2b9a7
 MD5 35626a65c99de9b1078baf522f9eb0bc jakarta-regexp-1.3-r2.ebuild 1090
 RMD160 9a2d31c1d1220cb365425fb68dd2b9a7b6de5376 jakarta-regexp-1.3-r2.ebuild 1090
 SHA256 9934c36cc4de75433fe5738900ac7e6c3e7b9da35c03d7f83debd07c0a841946 jakarta-regexp-1.3-r2.ebuild 1090
-EBUILD jakarta-regexp-1.3-r3.ebuild 1031 RMD160 6f77bc90b208e4110ed9a710bc32ff676bb1ec2a SHA1 a2ed72fa7e60463fe1b685f0583b521c3481731d SHA256 e4d2587e12a1a4fe5ed82006565e55e2f901d3112fbb7a428aef093dc49dd596
-MD5 0e5cbc5814343823058e8fea2f4e6e04 jakarta-regexp-1.3-r3.ebuild 1031
-RMD160 6f77bc90b208e4110ed9a710bc32ff676bb1ec2a jakarta-regexp-1.3-r3.ebuild 1031
-SHA256 e4d2587e12a1a4fe5ed82006565e55e2f901d3112fbb7a428aef093dc49dd596 jakarta-regexp-1.3-r3.ebuild 1031
+EBUILD jakarta-regexp-1.3-r3.ebuild 1027 RMD160 e084a154c1692006c6b6deb9bfd89b5aef8d05c1 SHA1 0e4123ab857ba1a1556516477b0378b754e77639 SHA256 0d788f31100cabe7deb58771721ac993a2a2de69f86312aaf1c4f1c1e2a12733
+MD5 c894c7a42ff8897c910b293a7e8cfbfe jakarta-regexp-1.3-r3.ebuild 1027
+RMD160 e084a154c1692006c6b6deb9bfd89b5aef8d05c1 jakarta-regexp-1.3-r3.ebuild 1027
+SHA256 0d788f31100cabe7deb58771721ac993a2a2de69f86312aaf1c4f1c1e2a12733 jakarta-regexp-1.3-r3.ebuild 1027
+EBUILD jakarta-regexp-1.3-r4.ebuild 1027 RMD160 adc8bee2316c3f42d778c9da8061f2b5e40b646d SHA1 7ba3260309607420c9bc5006edc02b5eadb30417 SHA256 e2891efa71478778bfb0f3fa05b9966a85c88a547465f2f661f654b39e44a0a6
+MD5 39e79fed833c9956a921a913184b437d jakarta-regexp-1.3-r4.ebuild 1027
+RMD160 adc8bee2316c3f42d778c9da8061f2b5e40b646d jakarta-regexp-1.3-r4.ebuild 1027
+SHA256 e2891efa71478778bfb0f3fa05b9966a85c88a547465f2f661f654b39e44a0a6 jakarta-regexp-1.3-r4.ebuild 1027
 EBUILD jakarta-regexp-1.4.ebuild 958 RMD160 0bcfec917ff87642780cd584b8799d4f6e85f540 SHA1 cefe46429b751cdb44cd3cbe0a2fa1c9f3a62033 SHA256 9d389717aefb79da40ddbf15b0bb89eeb1b41fe7eda4ea37817d09cda33ccbc0
 MD5 8140e4f74fe4d1b278b77cf2be547905 jakarta-regexp-1.4.ebuild 958
 RMD160 0bcfec917ff87642780cd584b8799d4f6e85f540 jakarta-regexp-1.4.ebuild 958
 SHA256 9d389717aefb79da40ddbf15b0bb89eeb1b41fe7eda4ea37817d09cda33ccbc0 jakarta-regexp-1.4.ebuild 958
-MISC ChangeLog 1950 RMD160 e54eb6a651ea3c7434ae626bb7fccfe817c1f18e SHA1 30af9e1db2cbd005ebe18b4d241b6626ed50745c SHA256 56dc73b9ba8af5a8e238796539e6baa78a5170ed085a1534bf30212431d2db84
-MD5 e49a396d94051829b2fa9a67e64bb863 ChangeLog 1950
-RMD160 e54eb6a651ea3c7434ae626bb7fccfe817c1f18e ChangeLog 1950
-SHA256 56dc73b9ba8af5a8e238796539e6baa78a5170ed085a1534bf30212431d2db84 ChangeLog 1950
+MISC ChangeLog 2163 RMD160 82510efd21ae092dde96ef3d6a027586cca6b77d SHA1 59701eb3018ce1b1d755b041f9c26e54f9e69e7c SHA256 6451944be7e968e883a3b58c661a2a2126e754de30cfb91e8bf58b4a2f2686fb
+MD5 88e05437850b82d0ac64e002fca74391 ChangeLog 2163
+RMD160 82510efd21ae092dde96ef3d6a027586cca6b77d ChangeLog 2163
+SHA256 6451944be7e968e883a3b58c661a2a2126e754de30cfb91e8bf58b4a2f2686fb ChangeLog 2163
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,13 +33,16 @@ SHA256 9bd7142434d09a319f1e0047988651a49fb0c475324ff4753ec617392990b855 files/di
 MD5 042922cbbb28e4f433270f857a264fc4 files/digest-jakarta-regexp-1.3-r3 256
 RMD160 3287279b642f693ca5aa1529e2254932c9d90887 files/digest-jakarta-regexp-1.3-r3 256
 SHA256 9bd7142434d09a319f1e0047988651a49fb0c475324ff4753ec617392990b855 files/digest-jakarta-regexp-1.3-r3 256
+MD5 042922cbbb28e4f433270f857a264fc4 files/digest-jakarta-regexp-1.3-r4 256
+RMD160 3287279b642f693ca5aa1529e2254932c9d90887 files/digest-jakarta-regexp-1.3-r4 256
+SHA256 9bd7142434d09a319f1e0047988651a49fb0c475324ff4753ec617392990b855 files/digest-jakarta-regexp-1.3-r4 256
 MD5 0e153b844d1fd9d50cf08ccd3ae6d416 files/digest-jakarta-regexp-1.4 256
 RMD160 6dd8bebd17de5eeed9e19c2b7630a44c0787b76a files/digest-jakarta-regexp-1.4 256
 SHA256 63cc96776151328bd639af5af406274a6ac1ad75bdbc3844a74453e38fbaeb2a files/digest-jakarta-regexp-1.4 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJT7UKRy60XGEcJIRAmrkAJwKZ+ZFbgjYQczOJYXv0Gk3rO2iAACbB6kg
-a2ZTt/DCvVMpwa+PR+SrwD8=
-=9VB/
+iD8DBQFFcxIjcxLzpIGCsLQRAjWqAJ9/oLB8vL1KkLyIgPbUlZ1UbV1IngCfTyar
+awhnlbGMSiAx3Itro82ld54=
+=xFlD
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r4 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r4
new file mode 100644 (file)
index 0000000..7d8e27c
--- /dev/null
+++ b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r4
@@ -0,0 +1,3 @@
+MD5 4322f82bea908ca4a7db270f7fa4850d jakarta-regexp-1.3.tar.gz 127069
+RMD160 1327fe8d1534849c2150dbb0a3bbd9b6455d0165 jakarta-regexp-1.3.tar.gz 127069
+SHA256 4cff646b26b258897bf0bafe64dfb6d1422611ecbfaf4787a78f2e042be1366e jakarta-regexp-1.3.tar.gz 127069

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
index 749c946e8970cea9cec032acfaab9269f2942bb1..97bfe234e9b0286096294a7378a28ddf43607b10 100644 (file)
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild,v 1.5 2006/10/05 17:20:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild,v 1.6 2006/12/03 18:06:21 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,15 +25,19 @@ src_unpack() {
 }
 
 src_compile() {
-       local antflags="jar"
-       use doc && antflags="${antflags} javadocs"
-       eant ${antflags} || die "compile problem"
+       eant $(use_doc javadocs) jar
 }
 
 src_install() {
-       cd ${S}/build
+       cd "${S}/build"
        java-pkg_newjar ${P}.jar ${PN}.jar
+       cd "${S}"
+
+       if use doc; then
+               java-pkg_dojavadoc docs/api
+               java-pkg_dohtml docs/*.html
+               dodoc docs/*.txt
+       fi
 
-       use doc && java-pkg_dohtml -r docs/api/*
        use source && java-pkg_dosrc ${S}/src/java/*
 }

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
new file mode 100644 (file)
index 0000000..fa2ad7a
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r4.ebuild,v 1.1 2006/12/03 18:06:21 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+SLOT="1.3"
+IUSE="doc source"
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+DEPEND=">=virtual/jdk-1.4
+       dev-java/ant-core
+       source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       rm *.jar
+       mkdir lib
+       sed -i 's:./jakarta-site2::' build.xml || die "sed failed"
+}
+
+src_compile() {
+       eant $(use_doc javadocs) jar
+}
+
+src_install() {
+       cd "${S}/build"
+       java-pkg_newjar ${P}.jar ${PN}.jar
+       cd "${S}"
+
+       if use doc; then
+               java-pkg_dojavadoc docs/api
+               java-pkg_dohtml docs/*.html
+               dodoc docs/*.txt
+       fi
+
+       use source && java-pkg_dosrc ${S}/src/java/*
+}