From: Petteri Räty Date: Sun, 3 Dec 2006 18:18:25 +0000 (+0000) Subject: Cleaned up the ebuild and fixed javadoc installation. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f01eb36b07dde418332b8c523e5a9d8e26c51880;p=gentoo.git 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 1642179c2b96..1aa007b46a31 100644 --- 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.15 2006/12/03 18:06:21 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.16 2006/12/03 18:18:25 betelgeuse Exp $ + +*jakarta-regexp-1.4-r1 (03 Dec 2006) + + 03 Dec 2006; Petteri Räty + jakarta-regexp-1.4.ebuild, +jakarta-regexp-1.4-r1.ebuild: + Cleaned up the ebuild and fixed javadoc installation. *jakarta-regexp-1.3-r4 (03 Dec 2006) diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest index 26298a8b4f61..077ba896f542 100644 --- a/dev-java/jakarta-regexp/Manifest +++ b/dev-java/jakarta-regexp/Manifest @@ -15,14 +15,18 @@ EBUILD jakarta-regexp-1.3-r4.ebuild 1027 RMD160 adc8bee2316c3f42d778c9da8061f2b5 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 2163 RMD160 82510efd21ae092dde96ef3d6a027586cca6b77d SHA1 59701eb3018ce1b1d755b041f9c26e54f9e69e7c SHA256 6451944be7e968e883a3b58c661a2a2126e754de30cfb91e8bf58b4a2f2686fb -MD5 88e05437850b82d0ac64e002fca74391 ChangeLog 2163 -RMD160 82510efd21ae092dde96ef3d6a027586cca6b77d ChangeLog 2163 -SHA256 6451944be7e968e883a3b58c661a2a2126e754de30cfb91e8bf58b4a2f2686fb ChangeLog 2163 +EBUILD jakarta-regexp-1.4-r1.ebuild 957 RMD160 50f351e634c1bf81883d74f9660995b3f0818578 SHA1 62b78d317574158c8ac79f43510f48d7058d8173 SHA256 44d371041eb73ebb95c1fd23eefd5679d0bfe26f1809ce6e545c4365f32fd8ee +MD5 c908bb911f477512f94ab7805198a194 jakarta-regexp-1.4-r1.ebuild 957 +RMD160 50f351e634c1bf81883d74f9660995b3f0818578 jakarta-regexp-1.4-r1.ebuild 957 +SHA256 44d371041eb73ebb95c1fd23eefd5679d0bfe26f1809ce6e545c4365f32fd8ee jakarta-regexp-1.4-r1.ebuild 957 +EBUILD jakarta-regexp-1.4.ebuild 954 RMD160 ade4338536d4ae700f420a2125ce32550d338caf SHA1 1cfb6e2a194e95df61a85fdf57fdc93384d9ebaf SHA256 ff5229f1529bf57cdedf8230600e4fbd773580469f5331b94317d31dcb1347ef +MD5 023a8e30a7c40368b2a95c8d54b5090b jakarta-regexp-1.4.ebuild 954 +RMD160 ade4338536d4ae700f420a2125ce32550d338caf jakarta-regexp-1.4.ebuild 954 +SHA256 ff5229f1529bf57cdedf8230600e4fbd773580469f5331b94317d31dcb1347ef jakarta-regexp-1.4.ebuild 954 +MISC ChangeLog 2371 RMD160 56071358284386def7361c92e009518a0fe17a87 SHA1 0f7e1dc277a7e15901d58a81e46558ba77331afd SHA256 8cf96249cabbeb948e3b57e063cd06a9b8a6c87da76376d777c5d1300f679fa4 +MD5 e7aaa59f17bb093b832004dfe5daa4be ChangeLog 2371 +RMD160 56071358284386def7361c92e009518a0fe17a87 ChangeLog 2371 +SHA256 8cf96249cabbeb948e3b57e063cd06a9b8a6c87da76376d777c5d1300f679fa4 ChangeLog 2371 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -39,10 +43,13 @@ SHA256 9bd7142434d09a319f1e0047988651a49fb0c475324ff4753ec617392990b855 files/di 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 +MD5 0e153b844d1fd9d50cf08ccd3ae6d416 files/digest-jakarta-regexp-1.4-r1 256 +RMD160 6dd8bebd17de5eeed9e19c2b7630a44c0787b76a files/digest-jakarta-regexp-1.4-r1 256 +SHA256 63cc96776151328bd639af5af406274a6ac1ad75bdbc3844a74453e38fbaeb2a files/digest-jakarta-regexp-1.4-r1 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFcxIjcxLzpIGCsLQRAjWqAJ9/oLB8vL1KkLyIgPbUlZ1UbV1IngCfTyar -awhnlbGMSiAx3Itro82ld54= -=xFlD +iD8DBQFFcxUqcxLzpIGCsLQRAo6rAJ9oWZDF4oNtJlYIf2RZ6UKW0ZcpkACeNTwY +u1QXcIdvHz7+hPga78GlQNI= +=YYfn -----END PGP SIGNATURE----- diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1 new file mode 100644 index 000000000000..ef47cc8a752b --- /dev/null +++ b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.4-r1 @@ -0,0 +1,3 @@ +MD5 d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz 137768 +RMD160 720c3443963b141d76333d9f7aab70624f903ee3 jakarta-regexp-1.4.tar.gz 137768 +SHA256 c4e34004123f4f72f5cac293795f3c547691baa5cdfcd1198852d525e3cdc563 jakarta-regexp-1.4.tar.gz 137768 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild new file mode 100644 index 000000000000..9fc98391dea3 --- /dev/null +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r1.ebuild @@ -0,0 +1,42 @@ +# 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.4-r1.ebuild,v 1.1 2006/12/03 18:18:25 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.4" +IUSE="doc source" +LICENSE="Apache-1.1" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +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 +} + +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/* +} diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild index 7daa53cefa58..2003120e092d 100644 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4.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.4.ebuild,v 1.4 2006/10/05 17:20:05 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.4.ebuild,v 1.5 2006/12/03 18:18:25 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -24,15 +24,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/* }