diff options
| author |   James Le Cuirot <chewi@aura-online.co.uk> | 2011-12-21 14:01:10 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@aura-online.co.uk> | 2011-12-21 14:01:10 +0000 |
| commit | 1023b8d43ca0abf154dcc001d6196cb0b96badd6 (patch) | |
| tree | 71061fd6ad17505eb3a67131d6ca75806a761f16 | |
| parent | [dev-java/gdata] Version bump. Minor breakage on core jar reported by apichec... (diff) | |
| download | java-1023b8d43ca0abf154dcc001d6196cb0b96badd6.tar.gz java-1023b8d43ca0abf154dcc001d6196cb0b96badd6.tar.bz2 java-1023b8d43ca0abf154dcc001d6196cb0b96badd6.zip | |
[dev-java/guava] Version bump. All versions after 07 need to be built with JDK7+. To avoid pulling this in unnecessarily, a new slot has been assigned.
svn path=/java-overlay/; revision=8932
| -rw-r--r-- | dev-java/guava/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/guava/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/guava/guava-10.0.1.ebuild (renamed from dev-java/guava/guava-09.ebuild) | 19 | ||||
| -rw-r--r-- | profiles/package.mask | 4 |
4 files changed, 16 insertions, 23 deletions
diff --git a/dev-java/guava/ChangeLog b/dev-java/guava/ChangeLog index 9f560a73..1b9285ad 100644 --- a/dev-java/guava/ChangeLog +++ b/dev-java/guava/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*guava-10.0.1 (21 Dec 2011) + + 21 Dec 2011; James Le Cuirot <chewi@aura-online.co.uk> + -guava-09.ebuild, +guava-10.0.1.ebuild: + Version bump. All versions after 07 need to be built with JDK7+ due to an + awkward bug. To avoid pulling this in unnecessarily, a new slot has been + assigned. + 09 Nov 2011; Ralph Sennhauser <gentoo.sera@bluewin.ch> guava-09.ebuild: Use java_prepare instead of src_prepare @@ -13,5 +21,7 @@ 30 Oct 2011; Ralph Sennhauser <gentoo.sera@bluewin.ch> +guava-09.ebuild: Version bump, thanks to Paweł Szklarz for providing an ebuild, bug 377477 +*guava-07 (7 Jan 2011) + 7 Jan 2011; James Le Cuirot <chewi@aura-online.co.uk> +guava-07.ebuild: Initial import. diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest index f9ed25a4..1ec62d78 100644 --- a/dev-java/guava/Manifest +++ b/dev-java/guava/Manifest @@ -1,4 +1,4 @@ -DIST guava-r09.zip 3289340 RMD160 7eac46b87b8d9aff12917f2008714810285b66f3 SHA1 687f3aab924464579673c3cede157eff06a3eb72 SHA256 514f84c503dd5bf53e45053a359f21bd0adc8751a3ab30a6a48547ed418293e8 -EBUILD guava-09.ebuild 793 RMD160 5179c1a4781477cca571b37dd2133ea9e3f58d89 SHA1 b8bdb428fdffd14d8a6f30834f053a90d1bac078 SHA256 089e43d7319e8910da663aebf454bb7c34713010e2a5af6ba5c00b41d0d9c13f -MISC ChangeLog 599 RMD160 d4bbd1e05ec5fda7495cdaa9f6b6b2b815cdcd93 SHA1 72ba4da6467b7e5fea1ad9eee9545433cf296a5f SHA256 dadf77da7cfe7b4c7f09516f5a65a4dc5f5151d29a235c46ad7b18737f39063e +DIST guava-10.0.1-sources.jar 840203 RMD160 82b288120a117cfac42efec72a957a487cc7d6bc SHA1 50c3953eaac12b8067111030ffdb8e44f80f5a79 SHA256 26ea3d3cbab52d12b8f320b946314ceaf340ea030fdf1827b064d1671c530484 +EBUILD guava-10.0.1.ebuild 722 RMD160 9d7de541dab9b80d9f30d6afd7ac69638afa2238 SHA1 40739c181c1b41d019bb4b3f7b1e756c77a4e2cc SHA256 dffd45f5fea9630471a78d2f4a887a6d19b3fbc2df5a2c9e14888ca5a9256df5 +MISC ChangeLog 915 RMD160 8b2703594712917182f9f3d15644d8fae1688220 SHA1 4e36ec9ca9c57190b07dddc8c0ee7180077e5753 SHA256 3e388acc621469c723db3cab131548659f80a9e9ca2a0a1af30c85c95d52dfc0 MISC metadata.xml 482 RMD160 db8681047f913830f6172b4fcdd52583ca803ecb SHA1 2cb2d02efbbbb6d062dff06c07766686e53a7c8e SHA256 43572fb66f6d09d1f9963ebfe6f309170982ca80d7fbfcf00801dcbdaa47f7c4 diff --git a/dev-java/guava/guava-09.ebuild b/dev-java/guava/guava-10.0.1.ebuild index c72b1f29..c42503df 100644 --- a/dev-java/guava/guava-09.ebuild +++ b/dev-java/guava/guava-10.0.1.ebuild @@ -8,14 +8,12 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple -MY_P="${PN}-r${PV}" - DESCRIPTION="A collection of Google's core Java libraries" HOMEPAGE="http://code.google.com/p/guava-libraries/" -SRC_URI="http://guava-libraries.googlecode.com/files/${MY_P}.zip" +SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar" LICENSE="Apache-2.0" -SLOT="0" +SLOT="10" KEYWORDS="~amd64 ~x86" IUSE="" @@ -25,17 +23,6 @@ COMMON_DEP=" RDEPEND="${COMMON_DEP} >=virtual/jre-1.5" DEPEND="${COMMON_DEP} - >=virtual/jdk-1.5 - app-arch/unzip" + >=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635 -S="${WORKDIR}/${MY_P}" JAVA_GENTOO_CLASSPATH="jsr305" - -java_prepare() { - unpack ./${PN}-src-r${PV}.zip -} - -src_install() { - java-pkg-simple_src_install - dodoc README -} diff --git a/profiles/package.mask b/profiles/package.mask index 289bb984..c9cbedf5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -6,10 +6,6 @@ # NOTE: Please add your entry at the top! # -# Ralph Sennhauser <gentoo.sera@bluewin.ch> (30 Oct 2011) -# Fails to build with icedtea:6 -=dev-java/guava-09 - # Vlastimil Babka <caster@gentoo.org) (2 Feb 2010) # Instruction for migration from icedtea6 to new slotted icedtea:6 # It is a bit tricky due to a blocker needed to prevent file collisions. |