From 7d58e855f388aefd52316750fc54874622f2bae8 Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Sat, 14 May 2005 16:07:59 +0000 Subject: slotted correctly, see #71952 (Portage version: 2.0.51.21) --- dev-java/commons-beanutils/ChangeLog | 13 +++++- dev-java/commons-beanutils/Manifest | 20 +++------ .../commons-beanutils-1.6.1-r1.ebuild | 52 ---------------------- .../commons-beanutils-1.6.1-r2.ebuild | 50 +++++++++++++++++++++ .../commons-beanutils-1.7.0-r1.ebuild | 50 +++++++++++++++++++++ .../commons-beanutils-1.7.0.ebuild | 49 -------------------- .../files/digest-commons-beanutils-1.6.1-r1 | 1 - .../files/digest-commons-beanutils-1.6.1-r2 | 1 + .../files/digest-commons-beanutils-1.7.0 | 1 - .../files/digest-commons-beanutils-1.7.0-r1 | 1 + 10 files changed, 118 insertions(+), 120 deletions(-) delete mode 100644 dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild create mode 100644 dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild create mode 100644 dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild delete mode 100644 dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild delete mode 100644 dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1 create mode 100644 dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r2 delete mode 100644 dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0 create mode 100644 dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0-r1 diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog index 04cf8e688607..d6111261d2b9 100644 --- a/dev-java/commons-beanutils/ChangeLog +++ b/dev-java/commons-beanutils/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/commons-beanutils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.22 2005/05/05 22:11:50 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.23 2005/05/14 16:07:59 luckyduck Exp $ + +*commons-beanutils-1.7.0-r1 (14 May 2005) +*commons-beanutils-1.6.1-r2 (14 May 2005) + + 14 May 2005; Jan Brinkmann + -commons-beanutils-1.6.1-r1.ebuild, +commons-beanutils-1.6.1-r2.ebuild, + -commons-beanutils-1.7.0.ebuild, +commons-beanutils-1.7.0-r1.ebuild: + slotted correctly, see #71952 05 May 2005; Gustavo Zacarias commons-beanutils-1.7.0.ebuild: @@ -8,7 +16,8 @@ 04 May 2005; Jan Brinkmann commons-beanutils-1.7.0.ebuild: - marked stable on amd64, ppc and x86. introduced support for the source useflag. + marked stable on amd64, ppc and x86. introduced support for the + source useflag. 26 Jan 2005; Markus Rothe commons-beanutils-1.7.0.ebuild: diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest index 291833f3d3ca..60d3a7a79c1a 100644 --- a/dev-java/commons-beanutils/Manifest +++ b/dev-java/commons-beanutils/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d34b07fdb900d5f40fec243f64b80d06 ChangeLog 3266 -MD5 5a3fda68f96da061a29ae803f401f594 commons-beanutils-1.6.1-r1.ebuild 1557 -MD5 29d9fadc683607f97242c013c9666fc6 commons-beanutils-1.7.0.ebuild 1487 +MD5 172c867ec21024fd2629e685d57091de commons-beanutils-1.7.0-r1.ebuild 1433 +MD5 84496c91387a5767e4d948add1d1df83 commons-beanutils-1.6.1-r2.ebuild 1431 +MD5 6013cc9fef19d113c5e1532a4120805a ChangeLog 3584 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 a65fcfbd83466bf025820b316482b38a files/digest-commons-beanutils-1.6.1-r1 79 -MD5 776456ec1cdc342af0507027a94da5d3 files/digest-commons-beanutils-1.7.0 79 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFCeposKRy60XGEcJIRAnpEAJwOmboXw+kbHbIbPeGs5VUBDKjgYACfWl+p -Hb6eNvD1FkpsO0haXOg3lqI= -=E+ee ------END PGP SIGNATURE----- +MD5 a65fcfbd83466bf025820b316482b38a files/digest-commons-beanutils-1.6.1-r2 79 +MD5 776456ec1cdc342af0507027a94da5d3 files/digest-commons-beanutils-1.7.0-r1 79 diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild deleted file mode 100644 index b2e984e90908..000000000000 --- a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r1.ebuild,v 1.10 2005/01/20 18:12:46 luckyduck Exp $ - -inherit java-pkg - -S=${WORKDIR}/${PN}-${PV}-src -DESCRIPTION="The Jakarta BeanUtils component provides easy-to-use wrappers around Reflection and Introspection APIs" -HOMEPAGE="http://jakarta.apache.org/commons/beanutils.html" -SRC_URI="mirror://apache/jakarta/commons/beanutils/source/${P}-src.tar.gz" -DEPEND=">=virtual/jdk-1.3 - >=dev-java/ant-core-1.4 - >=dev-java/commons-collections-2.1 - >=dev-java/commons-logging-1.0.2 - jikes? ( dev-java/jikes )" -RDEPEND=">=virtual/jre-1.3 - >=dev-java/commons-collections-2.1 - >=dev-java/commons-logging-1.0.2" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86 ppc sparc amd64" -IUSE="doc jikes" - -src_compile() { - local myc - - cp ${S}/LICENSE.txt LICENSE - cd ${S} - - echo "commons-collections.jar=`java-config --classpath=commons-collections`" > build.properties - echo "commons-logging.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties - - if use jikes ; then - myc="${myc} -Dbuild.compiler=jikes" - fi - - ANT_OPTS=${myc} ant jar || die "Compilation Failed" - - if use doc ; then - ANT_OPTS=${myc} ant javadoc || die "Unable to create documents" - fi -} - -src_install () { - java-pkg_dojar dist/${PN}*.jar || die "Unable to install" - dodoc RELEASE-NOTES.txt LICENSE - dohtml STATUS.html PROPOSAL.html - - if use doc ; then - java-pkg_dohtml -r dist/docs/* - fi -} diff --git a/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild new file mode 100644 index 000000000000..62d8ccfa3587 --- /dev/null +++ b/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.6.1-r2.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $ + +inherit java-pkg + +DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs" +HOMEPAGE="http://jakarta.apache.org/commons/beanutils.html" +SRC_URI="mirror://apache/jakarta/commons/beanutils/source/${P}-src.tar.gz" + +LICENSE="Apache-1.1" +SLOT="1.6" +KEYWORDS="x86 ppc sparc amd64 ppc64" +IUSE="doc jikes source" + +DEPEND=">=virtual/jdk-1.3 + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.3 + >=dev-java/commons-collections-2.1 + >=dev-java/commons-logging-1.0.2" + +S=${WORKDIR}/${P}-src + +src_unpack() { + unpack ${A} + cd ${S} + + echo "commons-collections.jar=$(java-config -p commons-collections)" \ + > build.properties + echo "commons-logging.jar=$(java-config -p commons-logging)" | sed s/\=.*:/\=/ >> build.properties +} + +src_compile() { + local antflags="jar" + use doc && antflags="${antflags} javadoc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + ant ${antflags} || die "compilation failed" +} + +src_install () { + java-pkg_dojar dist/${PN}*.jar + + dodoc RELEASE-NOTES.txt + java-pkg_dohtml STATUS.html PROPOSAL.html + + use doc && java-pkg_dohtml -r dist/docs/* + use source && java-pkg_dosrc src/java/org +} diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild new file mode 100644 index 000000000000..e18970abec12 --- /dev/null +++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r1.ebuild,v 1.1 2005/05/14 16:07:59 luckyduck Exp $ + +inherit java-pkg + +DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs" +HOMEPAGE="http://jakarta.apache.org/commons/beanutils.html" +SRC_URI="mirror://apache/jakarta/commons/beanutils/source/${P}-src.tar.gz" + +LICENSE="Apache-1.1" +SLOT="1.7" +KEYWORDS="x86 ppc sparc amd64 ppc64" +IUSE="doc jikes source" + +DEPEND=">=virtual/jdk-1.3 + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" +RDEPEND=">=virtual/jre-1.3 + >=dev-java/commons-collections-2.1 + >=dev-java/commons-logging-1.0.2" +S=${WORKDIR}/${PN}-${PV}-src + +src_unpack() { + unpack ${A} + cd ${S} + + echo "commons-collections.jar=$(java-config -p commons-collections)" \ + > build.properties + echo "commons-logging.jar=$(java-config -p commons-logging)" \ + | sed s/\=.*:/\=/ >> build.properties +} + +src_compile() { + local antflags="jar" + use doc && antflags="${antflags} javadoc" + use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + ant ${antflags} || die "failed to compile" +} + +src_install () { + java-pkg_dojar dist/${PN}*.jar + + dodoc RELEASE-NOTES.txt + java-pkg_dohtml STATUS.html PROPOSAL.html + + use doc && java-pkg_dohtml -r dist/docs/* + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild deleted file mode 100644 index 1e60f4a4ca57..000000000000 --- a/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0.ebuild,v 1.9 2005/05/05 22:11:50 gustavoz Exp $ - -inherit java-pkg - -S=${WORKDIR}/${PN}-${PV}-src -DESCRIPTION="The Jakarta BeanUtils component provides easy-to-use wrappers around Reflection and Introspection APIs" -HOMEPAGE="http://jakarta.apache.org/commons/beanutils.html" -SRC_URI="mirror://apache/jakarta/commons/beanutils/source/${P}-src.tar.gz" - -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="x86 ppc sparc amd64 ppc64" -IUSE="doc jikes source" - -DEPEND=">=virtual/jdk-1.3 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" -RDEPEND=">=virtual/jre-1.3 - >=dev-java/commons-collections-2.1 - >=dev-java/commons-logging-1.0.2" - -src_unpack() { - unpack ${A} - cd ${S} - - echo "commons-collections.jar=`java-config -p commons-collections`" \ - > build.properties - echo "commons-logging.jar=`java-config -p commons-logging`" | sed s/\=.*:/\=/ \ - >> build.properties -} - -src_compile() { - local antflags="jar" - use doc && antflags="${antflags} javadoc" - use jikes && antflags="${antflags} -Dbuild.compiler=jikes" - ant ${antflags} || die "failed to compile" -} - -src_install () { - java-pkg_dojar dist/${PN}*.jar || die "Unable to install" - - dodoc RELEASE-NOTES.txt - java-pkg_dohtml STATUS.html PROPOSAL.html - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1 deleted file mode 100644 index b51965d2eed6..000000000000 --- a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7f0190fda2d6ec7083e46ed6519aafe5 commons-beanutils-1.6.1-src.tar.gz 148249 diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r2 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r2 new file mode 100644 index 000000000000..b51965d2eed6 --- /dev/null +++ b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.6.1-r2 @@ -0,0 +1 @@ +MD5 7f0190fda2d6ec7083e46ed6519aafe5 commons-beanutils-1.6.1-src.tar.gz 148249 diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0 deleted file mode 100644 index b61844476ffc..000000000000 --- a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 3fd5cbdf70363b151de5cd538f726e67 commons-beanutils-1.7.0-src.tar.gz 258835 diff --git a/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0-r1 b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0-r1 new file mode 100644 index 000000000000..b61844476ffc --- /dev/null +++ b/dev-java/commons-beanutils/files/digest-commons-beanutils-1.7.0-r1 @@ -0,0 +1 @@ +MD5 3fd5cbdf70363b151de5cd538f726e67 commons-beanutils-1.7.0-src.tar.gz 258835 -- cgit v1.2.3-65-gdbad