summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2009-06-01 21:56:22 +0000
committerVlastimil Babka <caster@gentoo.org>2009-06-01 21:56:22 +0000
commit9ba974774a0d6a9700ba607f37bf85ab2acfd1b4 (patch)
treee52f198c6fcac6643192ff7f709bdbbb03eea45a /dev-java/xsd2jibx
parentVersion bump. Updated to telepathy-spec 0.17.25. With blessing from peper. (diff)
downloadhistorical-9ba974774a0d6a9700ba607f37bf85ab2acfd1b4.tar.gz
historical-9ba974774a0d6a9700ba607f37bf85ab2acfd1b4.tar.bz2
historical-9ba974774a0d6a9700ba607f37bf85ab2acfd1b4.zip
Revbump so that the commons-lang slot change works properly, not causing bugs such as #272040.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-java/xsd2jibx')
-rw-r--r--dev-java/xsd2jibx/ChangeLog9
-rw-r--r--dev-java/xsd2jibx/Manifest4
-rw-r--r--dev-java/xsd2jibx/xsd2jibx-0.2a_beta-r2.ebuild (renamed from dev-java/xsd2jibx/xsd2jibx-0.2a_beta.ebuild)25
3 files changed, 21 insertions, 17 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/Manifest b/dev-java/xsd2jibx/Manifest
index abfc4eed93d0..89b4d6c0dbb0 100644
--- a/dev-java/xsd2jibx/Manifest
+++ b/dev-java/xsd2jibx/Manifest
@@ -3,6 +3,6 @@ AUX build.xml 2458 RMD160 19b9999e5d03fc604ba4673fecd690c98111ec5a SHA1 4d9011ee
AUX xsd2jibx-0.2a_beta-freemind.patch 3010 RMD160 b1829f98e2d2205ccbe2bafc381c7b6e8e5e85af SHA1 dd6aaba997bdf42464a11210b911b35b2e408d1c SHA256 df51d6a5141f026c44265be3d7528f2ef2f03364bfd345bccc101f94e2e0ee69
DIST xsd2jibx-beta2a.zip 961258 RMD160 a1516ee9e3e042248928d7960116f47dfa2350e7 SHA1 d5cc4c971d696a58ab8d8e321c15803d84cddedf SHA256 615d573d944d361dfa23ff1099c543c78fae1943af0735c7a7743a0472c865db
EBUILD xsd2jibx-0.2a_beta-r1.ebuild 1380 RMD160 21c08948312c8caa7ebcea81a1cf2195ebfd389d SHA1 93bf3f4fc2b3f9de59866bd4a473ee6bef6f57da SHA256 ce5f9e8fc55d70c8e54a1132d187bc773a10f14956367e7d16bf2045583284e0
-EBUILD xsd2jibx-0.2a_beta.ebuild 1410 RMD160 72da6f3bd2a903239bc0dc4a86d4e2269c354785 SHA1 2b9feb2eff81efbba6e686e7055886a4d73e3463 SHA256 a483a4c263c9d7862f028c917d3f4b9d2a798478e12ad8dff646cb3f93428e2b
-MISC ChangeLog 968 RMD160 5b1ad51eb061fd8e9a546bfc512f5f1d34fefc5e SHA1 9cde6a5181ecb7244f049b615be9ffd9669c14f8 SHA256 8b761ac92015cf8b8649ed966ecba88aaa43e9a9ae5289e83ae6dcbfcbbd8350
+EBUILD xsd2jibx-0.2a_beta-r2.ebuild 1386 RMD160 e0a1af4336096e3f5e3d655e192c5728fffa01c4 SHA1 919078a919da5b5f331f7792f2f8484188b8175f SHA256 a8954e952fd477756166ccc45363ec35448c5a00e1c1283eed84f298ef53b018
+MISC ChangeLog 1216 RMD160 08e3543ee76a8eb33911cf0f9d645972c107f454 SHA1 ec8c0430aa4f914523726c1f167db0a36db50140 SHA256 ac8b0b44668d310057d1e55a9d5b48e2cb112f9f6fd5432e8001b87c57d11fec
MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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"