diff options
author | Vlastimil Babka <caster@gentoo.org> | 2009-06-01 21:56:22 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2009-06-01 21:56:22 +0000 |
commit | 09ddedb8c7d3183f45aee9177260afbd2de2fe7b (patch) | |
tree | 880b7e211335cf9e74ed7d30562f136ad79df3eb /dev-java | |
parent | Version bump. Updated to telepathy-spec 0.17.25. With blessing from peper. (diff) | |
download | gentoo-2-09ddedb8c7d3183f45aee9177260afbd2de2fe7b.tar.gz gentoo-2-09ddedb8c7d3183f45aee9177260afbd2de2fe7b.tar.bz2 gentoo-2-09ddedb8c7d3183f45aee9177260afbd2de2fe7b.zip |
Revbump so that the commons-lang slot change works properly, not causing bugs such as #272040.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/xsd2jibx/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild (renamed from dev-java/xsd2jibx/xsd2jibx-0.2a_beta.ebuild) | 25 |
2 files changed, 19 insertions, 15 deletions
diff --git a/dev-java/xsd2jibx/ChangeLog b/dev-java/xsd2jibx/ChangeLog index d17397031bfa..ef01d0ef900d 100644 --- a/dev-java/xsd2jibx/ChangeLog +++ b/dev-java/xsd2jibx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/xsd2jibx # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/ChangeLog,v 1.5 2009/05/23 00:01:17 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/ChangeLog,v 1.6 2009/06/01 21:56:22 caster Exp $ + +*xsd2jibx-0.2a_beta-r2 (01 Jun 2009) + + 01 Jun 2009; Vlastimil Babka <caster@gentoo.org> + -xsd2jibx-0.2a_beta.ebuild, +xsd2jibx-0.2a_beta-r2.ebuild: + Revbump so that the commons-lang slot change works properly, not causing + bugs such as #272040. 23 May 2009; Alistair Bush <ali_bush@gentoo.org> xsd2jibx-0.2a_beta-r1.ebuild: diff --git a/dev-java/xsd2jibx/xsd2jibx-0.2a_beta.ebuild b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild index 4f43d4b7199b..2586c563b3e8 100644 --- a/dev-java/xsd2jibx/xsd2jibx-0.2a_beta.ebuild +++ b/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/xsd2jibx-0.2a_beta.ebuild,v 1.3 2007/05/26 17:21:32 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild,v 1.1 2009/06/01 21:56:22 caster Exp $ +EAPI="2" JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -16,12 +17,11 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -COMMON_DEP="dev-java/commons-logging - dev-java/xpp3 - dev-java/ant-core - dev-java/jaxme - dev-java/jibx - =dev-java/commons-lang-2.0*" +COMMON_DEP="dev-java/commons-logging:0 + dev-java/xpp3:0 + dev-java/jaxme:0 + dev-java/jibx:0 + dev-java/commons-lang:2.1" DEPEND=">=virtual/jdk-1.4 app-arch/unzip ${COMMON_DEP}" @@ -30,10 +30,7 @@ RDEPEND=">=virtual/jre-1.4 S="${WORKDIR}/${PN}" -src_unpack() { - unpack ${A} - cd "${S}" - +java_prepare() { cp "${FILESDIR}/build.xml" . # patch from freemind authors, freemind won't build without it # they sent upstream (that's how I found it) which said he's preparing @@ -41,8 +38,8 @@ src_unpack() { epatch "${FILESDIR}/${P}-freemind.patch" cd "${S}/lib" - rm -v *.jar - java-pkg_jar-from commons-logging,xpp3,ant-core,jaxme,jibx,commons-lang + rm -v *.jar || die + java-pkg_jar-from commons-logging,xpp3,jaxme,jibx,commons-lang-2.1 } EANT_ANT_TASKS="jibx" |