summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/boilerpipe/metadata.xml4
-rw-r--r--dev-java/c3p0/Manifest1
-rw-r--r--dev-java/c3p0/c3p0-0.9.5.1.ebuild55
-rw-r--r--dev-java/cal10n/cal10n-0.8.1.ebuild2
-rw-r--r--dev-java/easymock/Manifest1
-rw-r--r--dev-java/easymock/easymock-3.2-r1.ebuild56
-rw-r--r--dev-java/easymock/easymock-3.3.1.ebuild2
-rw-r--r--dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild2
-rw-r--r--dev-java/glassfish-servlet-api/Manifest2
-rw-r--r--dev-java/glassfish-servlet-api/files/build_xml.patch12
-rw-r--r--dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild36
-rw-r--r--dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild23
-rw-r--r--dev-java/gson/metadata.xml3
-rw-r--r--dev-java/guava/guava-13.0.1-r1.ebuild27
-rw-r--r--dev-java/guava/guava-13.0.1-r2.ebuild27
-rw-r--r--dev-java/hamcrest-core/metadata.xml1
-rw-r--r--dev-java/hamcrest-generator/metadata.xml1
-rw-r--r--dev-java/hamcrest-integration/metadata.xml4
-rw-r--r--dev-java/hamcrest-library/metadata.xml2
-rw-r--r--dev-java/icedtea-bin/Manifest22
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild145
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild (renamed from dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild)4
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild174
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild (renamed from dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild)4
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild2
-rw-r--r--dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch10
-rw-r--r--dev-java/icedtea/files/6-cacao-dynmaxheap.patch42
-rw-r--r--dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch10
-rw-r--r--dev-java/icedtea/files/7-cacao-dynmaxheap.patch42
-rw-r--r--dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild (renamed from dev-java/icedtea/icedtea-6.1.13.8.ebuild)4
-rw-r--r--dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild (renamed from dev-java/icedtea/icedtea-7.2.5.6.ebuild)4
-rw-r--r--dev-java/java-apicheck/Manifest1
-rw-r--r--dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild23
-rw-r--r--dev-java/java-apicheck/metadata.xml8
-rw-r--r--dev-java/java-config/java-config-2.2.0.ebuild2
-rw-r--r--dev-java/java-xmlbuilder/metadata.xml3
-rw-r--r--dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild (renamed from dev-java/jfreesvg/jfreesvg-2.1.ebuild)4
-rw-r--r--dev-java/jsoup/Manifest3
-rw-r--r--dev-java/jsoup/jsoup-1.7.2.ebuild46
-rw-r--r--dev-java/jsoup/jsoup-1.8.3.ebuild (renamed from dev-java/jsoup/jsoup-1.8.1.ebuild)13
-rw-r--r--dev-java/jvyamlb/metadata.xml1
-rw-r--r--dev-java/jython/jython-2.7.0.ebuild4
-rw-r--r--dev-java/kryo/metadata.xml6
-rw-r--r--dev-java/matrix-toolkits-java/metadata.xml1
-rw-r--r--dev-java/maven-bin/Manifest1
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.3.ebuild88
-rw-r--r--dev-java/mchange-commons/Manifest1
-rw-r--r--dev-java/mchange-commons/mchange-commons-0.2.10.ebuild37
-rw-r--r--dev-java/mchange-commons/metadata.xml8
-rw-r--r--dev-java/mojarra/mojarra-2.2.12.ebuild2
-rw-r--r--dev-java/netty-buffer/Manifest1
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.19.ebuild60
-rw-r--r--dev-java/netty-common/netty-common-4.0.21.ebuild4
-rw-r--r--dev-java/netty-transport/Manifest1
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.19.ebuild64
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.21.ebuild48
-rw-r--r--dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild (renamed from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild)15
-rw-r--r--dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild (renamed from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild)9
-rw-r--r--dev-java/osgi-core-api/Manifest1
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-4.3.ebuild30
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild4
-rw-r--r--dev-java/reflections/metadata.xml3
-rw-r--r--dev-java/sbt/sbt-0.13.8-r1.ebuild151
-rw-r--r--dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild2
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild2
-rw-r--r--dev-java/snakeyaml/metadata.xml1
-rw-r--r--dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild2
-rw-r--r--dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild2
-rw-r--r--dev-java/typesafe-config/Manifest1
-rw-r--r--dev-java/typesafe-config/metadata.xml8
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild26
-rw-r--r--dev-java/typesafe-config/typesafe-config-1.3.0.ebuild26
-rw-r--r--dev-java/zemberek/metadata.xml1
73 files changed, 705 insertions, 733 deletions
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
index 4128863055b4..e94379cf02b3 100644
--- a/dev-java/boilerpipe/metadata.xml
+++ b/dev-java/boilerpipe/metadata.xml
@@ -5,5 +5,7 @@
<email>ercpe@gentoo.org</email>
<name>Johann Schmitz (ercpe)</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">kohlschutter/boilerpipe</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 938fec84276b..096fb2bf0b46 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,2 +1,3 @@
DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025 SHA512 4b20c5307f98dfaf82676d21ec9ade0251c043322b544acea912dbc6a866773180c548aa32764fb73894daa9115ae9eec702846a2112f620e90d1e462c879075 WHIRLPOOL 6df9184ef6c1385217e74dd0a5dd21dffce37be80e7f3bc418a3b83d9062e793f20ef436d641e8f03b7b5a2bcf3ce71d19f1b09dae1660c2f103942a6aa2f1c4
DIST c3p0-0.9.1.2.src.tgz 380118 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3 SHA512 a33c413b5471d56d72224e3ad74996828854a2a0227bc674d5956612db517348de1f36695d16ab4cbb38827bddbe03952a5518205296fc35ecbd11b536b5aa32 WHIRLPOOL 864fd5eb470024c1f6072a886ba62732d0c1e06ae3f0cc3235b071112f0d4a20b820d4e3b68194e8af0be07567b38f219d2dc8e597f3e5d6b01afa21fb5882b9
+DIST c3p0-0.9.5.1.src.tgz 839657 SHA256 35383e69cad101168575453c5ae5297a7e0fb2ab2cc885373f8d5b7c46254afd SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724 WHIRLPOOL 04621c0583c918099da5e59a8e2bbbc31ec4e07e73cb9b4377d1ae128606ca3f281cf38e89efa753d2c4367bb8b48d2669b2f405df9680df9616657edcc2219f
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
new file mode 100644
index 000000000000..8a41d9f1d502
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+
+MY_P="${P}.src"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0
+ dev-java/mchange-commons:0"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}
+ test? ( dev-java/junit:4 )
+ "
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+ find . -type f -name \*.jar -exec rm -v {} \; || die
+ find . -type f -name \*.class -exec rm -v {} \; || die
+ java-pkg_jar-from --into lib/ mchange-commons
+ java-pkg_jar-from --into lib/ log4j
+
+}
+
+EANT_TEST_TARGET="junit-tests"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar build/${P}.jar
+ dodoc README-SRC
+ use doc && java-pkg_dojavadoc build/apidocs
+ use source && java-pkg_dosrc src/java/com/mchange/v2
+ use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+}
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 22bd2195dc6d..3c8e21a0b4db 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index ad46f066ffe6..469b59a29116 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,2 +1 @@
-DIST easymock-3.2.zip 970922 SHA256 3ada340522b94d549a887774d42aaea008fb0aabc6f7e649ad6d23399bc7b80c SHA512 472b0f7183f48dcbd60996a78a69f3be0c9c5762856bf827d9a721b3ff03fca2fb68d3baae970a1de3eee0f293d02b3d9dba3c5634575ba395200e67f767ba3b WHIRLPOOL 5bf9dc61bf4716b88d72cbf80553b2629f7e55ffcd00821e74d8fcdb58160d1a494008d75f39a17ef2319c0bb913ae666f7c7e7d45394f6ad69d032d9e125442
DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
deleted file mode 100644
index cbefa0d40e19..000000000000
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides Mock Objects for interfaces in JUnit tests by generating them on the fly"
-HOMEPAGE="http://www.easymock.org/"
-SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
-IUSE=""
-
-CDEPEND="dev-java/junit:4
- dev-java/objenesis:0
- dev-java/cglib:3"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unzip ${P}-sources.jar -d src/ || die
-
- if use examples; then
- unzip ${P}-samples.jar -d examples/ || die
- fi
-}
-
-java_prepare() {
- epatch "${FILESDIR}"/${PV}-no-android.patch
- rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
-}
-
-src_install() {
- java-pkg-simple_src_install
-
- use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
index 446f885bce55..aae38ba8b147 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="3.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
IUSE=""
COMMON_DEPEND="
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index 59d58ede8d05..ce2254034950 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="java-virtuals/xmlrpc-api:0
java-virtuals/transaction-api:0"
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
index f94e1b37ca23..80578b1f8bbb 100644
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -1 +1 @@
-DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
+DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
diff --git a/dev-java/glassfish-servlet-api/files/build_xml.patch b/dev-java/glassfish-servlet-api/files/build_xml.patch
deleted file mode 100644
index 033ebd625271..000000000000
--- a/dev-java/glassfish-servlet-api/files/build_xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build.xml 2007-04-27 03:38:38.000000000 -0400
-+++ build.xml 2007-04-27 03:39:17.000000000 -0400
-@@ -28,7 +28,9 @@
- target="dist" inheritAll="false"/>
- <ant dir="${servlet.api.home}/src/jsr245"
- target="dist" inheritAll="false"/>
-+<!--
- <antcall target="prepare-jar"/>
-+-->
- </target>
-
- <!-- build pwc-->
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
deleted file mode 100644
index 795b4314ad8c..000000000000
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/-b}"
-DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
-HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
-SRC_URI="http://download.java.net/javaee5/trunk/promoted/source/glassfish-v${MY_PV}-src.zip"
-LICENSE="CDDL"
-SLOT="2.5"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/glassfish/servlet-api/"
-
-PATCHES=( "${FILESDIR}/build_xml.patch" )
-
-src_compile() {
- eant build $(use doc || echo -Ddocs.uptodate=true)
-}
-
-src_install() {
- java-pkg_dojar "${S}"/src/jakarta-servletapi-5/jsr154/dist/lib/*.jar
- java-pkg_dojar "${S}"/src/jsr245/dist/lib/*.jar
-
- use doc && java-pkg_dojavadoc src/jsr245/build/docs/api
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
new file mode 100644
index 000000000000..bcdaa586d4eb
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="javax.servlet"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
+HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
+SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
+LICENSE="CDDL"
+SLOT="3.1.1"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/gson/metadata.xml b/dev-java/gson/metadata.xml
index cb549ed01713..f384ea9a98d2 100644
--- a/dev-java/gson/metadata.xml
+++ b/dev-java/gson/metadata.xml
@@ -3,4 +3,7 @@
<pkgmetadata>
<herd>java</herd>
<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
+ <upstream>
+ <remote-id type="github">google/gson</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/guava/guava-13.0.1-r1.ebuild b/dev-java/guava/guava-13.0.1-r1.ebuild
new file mode 100644
index 000000000000..0471a5049c4f
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+ dev-java/jsr305:0
+ java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-13.0.1-r2.ebuild b/dev-java/guava/guava-13.0.1-r2.ebuild
new file mode 100644
index 000000000000..2d8d4719e128
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+ dev-java/jsr305:0
+ java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.7"
+DEPEND="${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.7"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -4,5 +4,6 @@
<herd>java</herd>
<upstream>
<remote-id type="google-code">hamcrest</remote-id>
+ <remote-id type="github">hamcrest/</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -4,5 +4,6 @@
<herd>java</herd>
<upstream>
<remote-id type="google-code">hamcrest</remote-id>
+ <remote-id type="github">hamcrest/</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
index 604e0a4238bb..fe6095912db3 100644
--- a/dev-java/hamcrest-integration/metadata.xml
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -2,5 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
+ <upstream>
+ <remote-id type="github">hamcrest/</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index 314c8dd8ca46..1676f06714ee 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -4,6 +4,6 @@
<herd>java</herd>
<upstream>
<remote-id type="google-code">hamcrest</remote-id>
+ <remote-id type="github">hamcrest/</remote-id>
</upstream>
</pkgmetadata>
-
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 2a5d20b21325..2af2548863da 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,38 +1,20 @@
-DIST icedtea-bin-core-6.1.13.7-amd64.tar.xz 49242728 SHA256 146bc914aa9d2e19d1273f2e0f71888c4ea1130eacc63bd22075f9a79e255f63 SHA512 b9e6509fe3ac033d593863af05d7853b7d4cbaf7dca041035b662dbde7866d56418fd075e4592aaf6640894bb639673a683e9c8add5aaf3c502caabae67ad2ee WHIRLPOOL 05fcd580b9d678a3717692582393d00f8e0f0de621e9edfdd1ecd76269f9d5a0ac87b14416dd49f0df0c572bf99de2436b1b4a15944f771d60c568b51c298706
-DIST icedtea-bin-core-6.1.13.7-ppc.tar.xz 39570240 SHA256 74bee77719b7285c6d91665e572cece092c1f6cee137032c50b9aec35db641d0 SHA512 e13a31f3ee4b60d603019a519047ffea8d97f3c6ff69ed7930c38e85f9051541f5dbe2c526b61175d3bcd371703168ba74949e1c7b44b4c8a790285864466e33 WHIRLPOOL 15f9b33c0edda490b48524996c2f3be263a498d97d969156e41dfbc03e7b780e568db80397a1a4716899c3fa202091bbec1c3358ddd178bdb8c010481e7604a6
-DIST icedtea-bin-core-6.1.13.7-x86.tar.xz 50373836 SHA256 3cc3e7c1fc07370bc7009d0ce7cfc2270de47165c45b8352b429aa1ccca561f2 SHA512 eb3eff46f20ffc93b7babe90aa3b9283119cf369fca503e7bdd7905455b9ac0e2eb389cc77e2e9bb02d802dc846dff75bbd218a844b80fa475e4ff04c88e9cf2 WHIRLPOOL 7593fd10d4c2e95fc02c2a7c94276632b6d99a077ec095018d5003e0c694c63f3e6eb3aa1d872f32911ad5ec2a90eae5f7a40c2784ef1b460e4a24a451369fd2
DIST icedtea-bin-core-6.1.13.8-amd64.tar.xz 49241032 SHA256 4712f3844d1a56ac545b01cdbc76c9e315480ace3120a99b22e5d904091c8b3e SHA512 5cfff7ff5a0d0b4eef382620e98849c318df342a23ea0bb5764b4032ca7a96a86e67991ad97ec95b35786be0e3ac7a39990104e12ea47cc50c1c7326e933feb2 WHIRLPOOL 2e992d99675095aad1b74492d02f3c1fb393bf9bb1d496ace2036c0a40dbe2b1605783a84131fc5c15aa06834605d1ae962e7fee45556b41176cde54f1357273
-DIST icedtea-bin-core-6.1.13.8-ppc.tar.xz 39585952 SHA256 51a9b4c4167b900467f6b1b614f5808af2fa8ef35f7101e1ddc7f5142b3a3ad3 SHA512 04d72e811852df169a20daad73ed56ec454b98a60dd8943286d9ff382283d6b15c6acb1e0a3bc03ccc1d14333dae3ffdf8060c2a7de30c09d6b9cfacf9d90339 WHIRLPOOL 406782e148b4864cb250686a311e34937324ec3442a821d6bb76a016e2a6f7f06fed4b46d9ab8ff5675c629103b2832828efb8f0017fb193cc01209869bfe4c6
+DIST icedtea-bin-core-6.1.13.8-r1-ppc.tar.xz 39586112 SHA256 782019d78fba6562170382fcbe5fff4fca5feaffef442ceabc93e3b4ed40c035 SHA512 81b678673bae9fb07b9aa4ccc98fb6d3132ace2f776c224510787def831ca765bfd8dbea875ae8049f564268952459a692db1125e9f37eccb6ff3684511fc648 WHIRLPOOL ff9400b7d65b9b3661b679ebad6747b9d3a2de882bc1c281565a6220ca0ef45a8abb6c9b2d1db64f491d55d173dd017780514b2b685ec5d3ce7c5e25cec08c46
DIST icedtea-bin-core-6.1.13.8-x86.tar.xz 49676360 SHA256 495171e826414051670fade7ac7af2705b3ecc01ba2ef3e63790cd24ec4fe7b5 SHA512 56cd90d21e30f2451f7206b84d80ed0d227f750f7e9155f2401e12ea4b9bbcdd882abbb01cade21e0bfcc05318552bd1e6102cc78aa601654179058f595ca68a WHIRLPOOL 6eabeca6006f84d912686ecd5921466cc5a7f3308b192e3ad9d4cee7a54356923a0c720e8d3d083533ab7b4baea839ed8247db2d1ee43dcd989ed312ff139323
-DIST icedtea-bin-core-7.2.5.5-amd64.tar.xz 52642552 SHA256 cfa0399d93eab61004c6d3c23c7b2b46623c0fde1c8034adc09a6fdae9ba1a26 SHA512 427b134109bfd92a073f10467f030f2bccf7b3fdcc6ec66f63d0ab5a896dfb4cc4904a9b8f5b6833fe4ae73bffb54e97e75a363500ed897a153ea7a687c75e9a WHIRLPOOL 84fa1a480633d2f2459238c11fa58ba514a8eede37f54eebd19effd5e2dcf01bcf1f320c65f150018b52eea3c630c313ba85166ea9d8d44bb61b42c42738b9ad
-DIST icedtea-bin-core-7.2.5.5-arm.tar.xz 43744840 SHA256 5f508eebadbf51a01677f3dcac2678f5a09eb7e9fd8f224fd397961e56a95a73 SHA512 45524bd6e6c1f8f1ac69e2c8891c647e0dd3e4afe272561f17565f4e21b7104fdb9718f12023bfba308d311d661e00122a82c81e61a7bc6a744108495d343dc8 WHIRLPOOL 4e386a6cd5997a1d169550b3e6fcd29ccdb1bf0f7942e3c4ed02521c13afc7531de78c313ad6d50555e8781bb2566b7a10a6393db09e576bf5579ae8615fb4c4
-DIST icedtea-bin-core-7.2.5.5-ppc.tar.xz 42616472 SHA256 36cc4fd0bfef1c2ae0dcad7116dd2a3b6e7a5ff7fd25da1ae47560755415cf2f SHA512 a0f80ae0701b0f51bd165143b16aa9c9ae7314d1b1ccc5c4ef96f37012598bf1d1c7ace0742573562b642354b5f263e1dd97d026bb3d2addbe94b33c208c79b2 WHIRLPOOL 619901211cb099eb405a46bcf1bee5828c523b29ad8013fccaf77a82d3885b9517888c2461960e344aef8cb3c8b4807c909e0f693f3207c1c2dd35f74784ddac
-DIST icedtea-bin-core-7.2.5.5-x86.tar.xz 53895468 SHA256 f32ddce3e2435334aedc9bbda2319f88b4a0e92a9b7ada7afbc2724d8a1cee07 SHA512 e4e085a9e23f75e79f0172986e83bc5b03373826a11f4240c8331c0086521189a611b6a20b4f7f4c28d8e2436dcb046590a06487e14d1d79c454698ac0a5a9bc WHIRLPOOL 0785f0cac8655b6c9843b592bfe71a4c28ec4215e18d0257499ac5207458a159fb8d1c56defe6b3bedf07a0fa299531b51182f6c27abdf24bf801157b3b624a5
-DIST icedtea-bin-core-7.2.5.6-ppc.tar.xz 42626788 SHA256 e6b3d928264fba2fb526266751cba5b08e59d3a79620d4ec35fb40887ad5432d SHA512 f6c55d4d536066576a9dcb318ac3441235a00bb8fea93484bcca3715ba1ea191eeb66907982f48bb1ca4bf01c5733be65c12cd145402041c76f31f3acc4ef51a WHIRLPOOL 729bf0ffbb7e35ea68ed8f5a874f5798e33b7456ce6105244a1ce1f85dee2b747e079b7437613342e9b9e1b9b71e0d85b7c232d84c185c4466bf1e925460c02f
+DIST icedtea-bin-core-7.2.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb8096c27b6ebbc458cded8ad5a50a129867bab74872cffb3 SHA512 0eb6ff3d44da0fe05cdf2af0e630db74c46fc201c0cb7f0d833442f153b701ece58c60cd5a273d48f233374743090b841810f0caf9640bf5e9977019deb8504b WHIRLPOOL 8c29d11dbe6576d8d485bd67ea13b891848762069823b10216469de0c9e87420d1e7b57e6dc9c640cafe0545ecdbb68fc226ed0a77b1bbee0cdc73c3a3b0932f
DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
-DIST icedtea-bin-doc-6.1.13.7.tar.xz 9845104 SHA256 75e2d37caa2bbcca8d77f4b6b63be7337484f1a0cd35ba784f191ac433b4f8bc SHA512 0f78642a0a27cee3439aac44f2df4cb43dd167c1bdb84c337636357f63195a3dfc4d2157a2368fdc72eceaad73eea17d016ca4f39f4c09a62322abac72111999 WHIRLPOOL 66db5023cd88c241427731aa66f227cab917a389ad89140a9e9174d8da5aa9a83850edd42a9359121633305e542d74c9f9b73788c7683da733c1b407d71df8e0
DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
-DIST icedtea-bin-doc-7.2.5.5.tar.xz 10599388 SHA256 ced6f04aeb35bdcfbeffff1f631db4ad523e16705fcce3697145cb7af111f8bb SHA512 f55dc8bb5a3c5d0b1016b03605f38f0dcb25adb1b615cd185bce771959ebe079213efb9ad25b46d2a21edf6c4338111eed2efd2e16ef6f1ca8e9458a6de22196 WHIRLPOOL 4a32c77494f7c2dbab4f682f2747f88ace7bedc43f38ffe8ffef84d0b3dfcd3269b1fff91c7e221070fc5bf2057bda1d60168d6dc428242904d2842193a0ab49
DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
-DIST icedtea-bin-examples-6.1.13.7-amd64.tar.xz 1903880 SHA256 1bd0657d389cd046eb1d6dfab32edb66a3a18e97c8ea7d60e066cc5a48fddb3e SHA512 77892fc66c49f746d23a692bf9f6716be613111fc697cb92aef9ad12ba8cebdb32f1d434a6bcfa9237e7a382e613590dc06f8d9b6746cbf381ae8b8e9b47bda9 WHIRLPOOL 1f4d94314430ab12c0aa1cb6fd7d16ceda2a1a3e055982b590877c29d7f2c4ea94c2ebd0d8ce631b98522493a3326d68a2756a3eaa4e043c7a7e0558ae37fb15
-DIST icedtea-bin-examples-6.1.13.7-ppc.tar.xz 1889572 SHA256 c0a4d1f0cdf1bed63c62a7f261c3188bdf53dec288bb501c402325d51677297d SHA512 6c8da2362d25143cafe00c75231125a731b443bcf9325a9baf5807d56e073f551023b6b6a86bc860f615c5f28032f27dbaecf26de79d179a92dd642cc4adee3e WHIRLPOOL d87f7c9cc80481c16e68e31d13c023614b7fbc35e0b39e4adecef2e9a476253460448de935c0988ff349fda3537e900f24b6d38a4ec3805c8a331e3061b19c4f
-DIST icedtea-bin-examples-6.1.13.7-x86.tar.xz 1902248 SHA256 98efdac63222f1bffd65dc791a3bf752e10c8083d23f5d4d6a2b3c0784ba4bca SHA512 247dc6d80425af835c153bd6503e30725183a23b05f0108640040a05ca3f6d86467d174a7e92a64e4513b119040fdafc6ebcc6cffac1bc65aa778f9972f408d7 WHIRLPOOL 8eeabadbab0ad2426d6a191202991c023621f98982b87a1b62f40d2bde6282bf63d095b4c2edff27b950da846385b3cfa0917061f4ff5fab181c9b5d82d2cd0d
DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
-DIST icedtea-bin-examples-7.2.5.5-amd64.tar.xz 1795668 SHA256 373db6d3bc88e8572a81b03e2dc5b539acb2a48347f6bdc797bf59ad7330e108 SHA512 a34b979094dd337d365d089e49aa6363f201499db2eec3d46edbec2235a55e8d0f488e1329bc699ddbc32c3d11cece95c4678ef5f49d3b4e4fd8a4481739f561 WHIRLPOOL d1112d0ddac4bb329416655e5083e762cb674a5935f655dd0d7759f4950a979b441e6bf3e1be87b596bc0cdb1c226efb96fd0b78b941f53e45c8eec66355b176
-DIST icedtea-bin-examples-7.2.5.5-arm.tar.xz 1778824 SHA256 11b02d038f5d02286200a9d1e58342aef432f0b475d3555068c6ee988407acea SHA512 5e46c15df71684124cdeb6f9ce2978bd86dd795c6c2422d4e67abcee6c230ebee3de8e235b95203fec1e06830253a86ad724d36f843fc2e385d7c3b5cb0e69fb WHIRLPOOL e8930ff6714def3c4dfdf9f1b40d5538a66897d6e9bd397f6167c264f1434889bd15c13ee965ae9db254653c084d47dd6e032c2f8228a6bb2d2c66e8d820f828
-DIST icedtea-bin-examples-7.2.5.5-ppc.tar.xz 1785508 SHA256 0b50cd010ceee2d3c0804897f9934127c4cdfc8c91729df422748ed9a7043365 SHA512 1d7e27b5391ecfa408c5d5e0c1979e732ee43fd3f295311c82d6a9a6f5014136cdbc5f449bf5343b417a66691ff8667364050072d93c2be4b3d7009d6a50980f WHIRLPOOL 42501a028a975e00ebf5449dba0fb6f67c83efa2d8c7639c23b74d96a2d06f576094089432ea28d13eb63dee7c2531fb816d39811e11381cfe33bc8c0ada2f47
-DIST icedtea-bin-examples-7.2.5.5-x86.tar.xz 1794656 SHA256 3ff68a31470260231bbf9b8a9c242705bea4303158ea5b0a739548ce2fe9702b SHA512 59819a6bdc7f74aea90f2a1c1e5714518d28fdf23b508f10fd6ad52707aea9561a4afd12997742e21583fb15008e0fb1213bc677d3930a51f9786b4a54c74f14 WHIRLPOOL dc51882d96791f4a02ee5232efe759ba2f233779765f08c275635430c60f460119e7360a4bb15f676652125c1b6257c8825b909190b51bfcc610f10401362888
DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df303d2ae334a416bf4c29afff76f425e94d9ef36e81992d SHA512 e3ba6ca13a1f0f76e0a9fc12979b571560bcf74f2c8ae3e23bfd693452f14d7a153ed4fe32058cb9ec8e2071c43cc57094e12a3345f9d36c7d3b8d1744259f05 WHIRLPOOL 05b7463c5d7b36aba805718dbf3c3d37bf30ca2ef61de3672784f20635283c1005443f265821ce52848a35ac656681a125ce31479736435f74db997c82ecae2e
DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
-DIST icedtea-bin-src-6.1.13.7.tar.xz 39750536 SHA256 4b778433141b0231da1615266566d1881bf9f1674f5f5721f669dc130710c38d SHA512 43a7baae4874681b438e477790479dbe339a88904deec6c91acf79d09fb25d562f83070e74a8691c51a28b4ebb1f3bd7c9befa52adc4785099e08b84fa8c5eb7 WHIRLPOOL 57d14e18a8365684f5d090f86709d0d3b110ad7fb506e0bae9ff796aebf110c396fa3707bddc85af32e23b004b09d9d107e99fc392a98b5046473b39068f2876
DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
-DIST icedtea-bin-src-7.2.5.5.tar.xz 39995356 SHA256 c4f7843ffa9a401307d60b3eae192efb2792079d5d75d5954f4e03211b52f094 SHA512 7128e4255a7587d1167f6f2b1978cc0a8f6d079b2f189e5931c424c812c6c668a0afe0390cb492592c4cbf5f9375c11ed5d9ac9870161ad710ddddb7358ba60a WHIRLPOOL 607a4160d724ba38daebda75efe80aaf2ad87f534b3a9d089a43d172b7464fadee7b5e18b03eb1b84c3ec8ec14059023b75c9f16a93907a485c3af7a2cf38b2a
DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
deleted file mode 100644
index 382769ef989a..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 prefix versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 ppc x86; do
- SRC_URI+="
- ${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
- examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
- )"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 ppc x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-2.0"
-X_COMMON_DEP="
- >=media-libs/freetype-2.5:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/libX11-1.6
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.2"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- >=media-libs/lcms-2.6:2
- media-libs/libpng:0/16
- >=sys-devel/gcc-4.8.4
- >=sys-libs/glibc-2.20
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg:62"
-
-RDEPEND="${COMMON_DEP}
- X? (
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
- nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-src_prepare() {
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # Reprefixify because prefix may be different.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- # doins doesn't preserve executable bits.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r doc/html
-
- if use examples; then
- cp -pRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
- dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
- fi
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
- elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
- elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
-
-pkg_postinst() {
- if use nsplugin; then
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
- elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
- elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
- elog "The switch should complete properly during the subsequent installation of icedtea-web"
- elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
- fi
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild
index 94f9ee2f2712..4ff8ac9b8e56 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild
@@ -17,14 +17,14 @@ SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
for arch in amd64 ppc x86; do
SRC_URI+="
${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+ ${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
)"
done
LICENSE="GPL-2-with-linking-exception"
SLOT="6"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
+KEYWORDS="-* amd64 ppc x86"
IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
deleted file mode 100644
index d03ca30b0c06..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 arm ppc x86; do
- SRC_URI+="
- ${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
- examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
- )"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* amd64 ~arm ppc x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
- >=net-print/cups-2.0"
-X_COMMON_DEP="
- >=dev-libs/atk-2.12
- >=dev-libs/glib-2.40:2
- >=media-libs/fontconfig-2.11:1.0
- >=media-libs/freetype-2.5.3:2
- >=x11-libs/cairo-1.12
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/libX11-1.6
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.4
- >=x11-libs/libXtst-1.2
- >=x11-libs/pango-1.36"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- >=media-libs/lcms-2.6:2
- media-libs/libpng:0/16
- >=sys-devel/gcc-4.8.4
- >=sys-libs/glibc-2.20
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg:62"
-
-# cups is needed for X. #390945 #390975
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
- X? (
- ${CUPS_COMMON_DEP}
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )
- selinux? ( sec-policy/selinux-java )
- >=gnome-base/gsettings-desktop-schemas-3.12.2"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # Reprefixify because prefix may be different.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- # doins doesn't preserve executable bits.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r doc/html
-
- if use examples; then
- cp -pRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
- dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
- fi
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- if use nsplugin; then
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
- elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
- elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
- elog "The switch should complete properly during the subsequent installation of icedtea-web"
- elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
- fi
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
index 21861cd84fbe..80e436690a79 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
@@ -17,14 +17,14 @@ SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
for arch in ppc; do
SRC_URI+="
${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+ ${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
)"
done
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="-* ~ppc"
+KEYWORDS="-* ppc"
IUSE="+alsa +awt cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
index 5dde0522f792..9b33188ae2ff 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
@@ -24,7 +24,7 @@ done
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 000000000000..dc87ae8b0242
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2015-07-28 07:21:16.447388803 -0700
++++ Makefile.in 2015-09-06 09:13:16.548000000 -0700
+@@ -182,6 +182,7 @@
+ @WITH_RHINO_TRUE@ patches/rhino.patch
+
+ @BUILD_CACAO_TRUE@am__append_22 = \
++@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
new file mode 100644
index 000000000000..33b98183769e
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+# Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // More than 2GB will overflow so cap it.
++ opt_heapmaxsize = 2047 * 1024 * 1024;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = (s4) qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 000000000000..13e30537e2ac
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2015-07-22 14:54:37.116940780 -0700
++++ Makefile.in 2015-09-06 05:05:47.220000000 -0700
+@@ -134,6 +134,7 @@
+ @WITH_RHINO_TRUE@ patches/rhino.patch
+
+ @BUILD_CACAO_TRUE@am__append_10 = \
++@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@ patches/cacao/armhf.patch \
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
new file mode 100644
index 000000000000..33b98183769e
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+# Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ opt_heapstartsize = HEAP_STARTSIZE;
+ opt_stacksize = STACK_SIZE;
+
++#if defined(__LINUX__)
++ // Calculate 1/4 of the physical memory.
++ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++ if (qmem > INT32_MAX) {
++ // More than 2GB will overflow so cap it.
++ opt_heapmaxsize = 2047 * 1024 * 1024;
++ } else if (qmem > HEAP_MAXSIZE) {
++ // Otherwise use this if greater than default (128MB).
++ opt_heapmaxsize = (s4) qmem;
++ }
++#endif
++
+ // First of all, parse the -XX options.
+
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/icedtea-6.1.13.8.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
index 745d54be40f6..ff53a1134fc1 100644
--- a/dev-java/icedtea/icedtea-6.1.13.8.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
@@ -152,6 +152,10 @@ src_unpack() {
}
java_prepare() {
+ # CACAO has a fixed default max heap of 128MB. This sucks.
+ cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+ epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
diff --git a/dev-java/icedtea/icedtea-7.2.5.6.ebuild b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
index 06dbc68ac67f..d8a172f95c05 100644
--- a/dev-java/icedtea/icedtea-7.2.5.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
@@ -196,6 +196,10 @@ src_unpack() {
}
java_prepare() {
+ # CACAO has a fixed default max heap of 128MB. This sucks.
+ cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+ epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
if ! use cups; then
# CUPS is always needed at build time but you can at least make it dlopen.
sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
diff --git a/dev-java/java-apicheck/Manifest b/dev-java/java-apicheck/Manifest
new file mode 100644
index 000000000000..e48b49b98caa
--- /dev/null
+++ b/dev-java/java-apicheck/Manifest
@@ -0,0 +1 @@
+DIST java-apicheck-0_p20150907.tar.gz 1550 SHA256 4f8a108e78b556d3400e334d3cd0b972628a8cee97bfe903e656ddbb46368449 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70 WHIRLPOOL 0640404622635f36c2dab7623510b5ea913a409382b77699c0dea5904fdedf0d83ba5bdf3e2247d3ed3b3b33a2dd271b9ba1d4b2913428adfa01381be1cdbdef
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
new file mode 100644
index 000000000000..d116fc596635
--- /dev/null
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Command line tool to check Java packages for API compatibility"
+HOMEPAGE="https://github.com/gentoo/java-apicheck/"
+SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-java/japitools
+ dev-java/java-config
+ "
+
+src_install() {
+ dobin ${PN}
+}
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
new file mode 100644
index 000000000000..0715bc757941
--- /dev/null
+++ b/dev-java/java-apicheck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="github">gentoo/java-apicheck</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
index 79a340743873..0635431b0f4e 100644
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -25,5 +25,5 @@ RDEPEND="
sys-apps/portage"
python_test() {
- esetup.py test || die
+ esetup.py test
}
diff --git a/dev-java/java-xmlbuilder/metadata.xml b/dev-java/java-xmlbuilder/metadata.xml
index 7303cef96964..99c17d026dce 100644
--- a/dev-java/java-xmlbuilder/metadata.xml
+++ b/dev-java/java-xmlbuilder/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
+ <upstream>
+ <remote-id type="github">jmurty/java-xmlbuilder</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/jfreesvg/jfreesvg-2.1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
index 4678b34b1b7d..ea0116cb082d 100644
--- a/dev-java/jfreesvg/jfreesvg-2.1.ebuild
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -17,9 +17,9 @@ SLOT="2.1"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.7
app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
+RDEPEND=">=virtual/jre-1.7"
java_prepare() {
find "${WORKDIR}" -name '*.jar' -print -delete || die
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
index f587ebb3ea9b..6e4097870d09 100644
--- a/dev-java/jsoup/Manifest
+++ b/dev-java/jsoup/Manifest
@@ -1,2 +1 @@
-DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
-DIST jsoup-1.8.1.a.tar.gz 303388 SHA256 788832a1a3fa639fecb71b52c5b1c062663f5b3a21c1451968910c4731393b60 SHA512 4afcc42187fd034e2c6f45d369c4fdd0cc7523f4aa2f2526a21aebdebb8608e1ced51f3d6c8de02ac519eccd5ef415e9b7619450fb2e958a0f7a4d5bf492ed8a WHIRLPOOL 7c1f8a0db34b8907bbc2ce849d85a845956059520202346a1d608e43cb264d2b478738868a2d183d97eff85b8df085ced10130400f2612a26faff7f688e4e698
+DIST jsoup-1.8.3a.zip 370626 SHA256 3a2dd962eb3f3bf0ef14f526d89795836d06bff411e68f0adfcc4a8dd5915876 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85 WHIRLPOOL e1b5d4ed64b4460223b38aea43466465638236edf0ef6bd987430e16bb2bd12796a4900da797320c5bebcd8de0f823533f2a40bfb6cc50ad30183912eb34eee7
diff --git a/dev-java/jsoup/jsoup-1.7.2.ebuild b/dev-java/jsoup/jsoup-1.7.2.ebuild
deleted file mode 100644
index 1744b83d3da8..000000000000
--- a/dev-java/jsoup/jsoup-1.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- rm pom.xml || die
- mkdir -p target/classes/org/jsoup/nodes/ || die
- cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
- testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
- mkdir target/tests || die
- ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
- cp -r src/test/resources/* target/tests || die
-
- tests=$(find target/tests -name "*Test.class" \
- | sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
- | grep -vP '\$');
- ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/jsoup/jsoup-1.8.1.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
index bac8d54ce0b7..878940e96667 100644
--- a/dev-java/jsoup/jsoup-1.8.1.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@@ -6,13 +6,14 @@ EAPI="5"
JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
+inherit java-pkg-2 java-pkg-simple
-MY_PV="${PV}.a"
+MY_PV="${PV}a"
+MY_P="${PN}-${PN}-${MY_PV}"
DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.tar.gz"
+SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
LICENSE="MIT"
SLOT="0"
@@ -20,11 +21,11 @@ KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
test? ( dev-java/junit:4 )"
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
index 46ab2b1323bf..76c4f7b31ad5 100644
--- a/dev-java/jvyamlb/metadata.xml
+++ b/dev-java/jvyamlb/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="google-code">jvyamlb</remote-id>
+ <remote-id type="github">olabini/jvyamlb</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index fdf4a09c6d1c..f46891f5c2a4 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -39,9 +39,9 @@ CDEPEND="dev-java/ant-core:0
java-virtuals/servlet-api:3.0
readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.7"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.7
app-arch/unzip
test? (
dev-java/junit:4
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
index 2d2ccc0795d8..649088ab7d53 100644
--- a/dev-java/kryo/metadata.xml
+++ b/dev-java/kryo/metadata.xml
@@ -7,7 +7,9 @@
The goals of the project are speed, efficiency, and an easy to use API. The project
is useful any time objects need to be persisted, whether to a file, database, or over
the network. Kryo can also perform automatic deep and shallow copying/cloning. This is direct copying
- from object to object, not object->bytes->object.
+ from object to object, not object-&gt;bytes-&gt;object.
</longdescription>
+ <upstream>
+ <remote-id type="github">EsotericSoftware/kryo</remote-id>
+ </upstream>
</pkgmetadata>
-
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
index 1c59ceec112f..3316a10f58a2 100644
--- a/dev-java/matrix-toolkits-java/metadata.xml
+++ b/dev-java/matrix-toolkits-java/metadata.xml
@@ -4,5 +4,6 @@
<herd>java</herd>
<upstream>
<remote-id type="google-code">matrix-toolkits-java</remote-id>
+ <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 5d11a8e2cb40..3a51904910dc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -5,4 +5,5 @@ DIST apache-maven-3.1.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e72086
DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
DIST apache-maven-3.2.3-bin.tar.gz 6956162 SHA256 bf3f04aadee3a67158aebdfb0b4cb022063329d459d10fd6b4b02223e10aa8ed SHA512 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 WHIRLPOOL 6a254dc8beb6d1d42299dd563da1eaeccff11bbfd18a122cb015ee28e55f59ae0b4e512a48b697fa09004edd8bae7dbef32bce24dbc9f5913b7cdd311a6ec6b3
DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
+DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
diff --git a/dev-java/maven-bin/maven-bin-3.3.3.ebuild b/dev-java/maven-bin/maven-bin-3.3.3.ebuild
new file mode 100644
index 000000000000..f304b7ee4aaa
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+dev-java/aopalliance:1
+dev-java/avalon-framework:4.1
+dev-java/commons-cli:1
+dev-java/commons-io:1
+dev-java/javax-inject:0
+dev-java/jsoup:0
+dev-java/jsr250:0
+dev-java/juel:0
+dev-java/osgi-core-api:0
+java-virtuals/interceptor-api:0
+java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.8
+>=virtual/jre-1.8
+${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+ rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+ chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+ # Symlink jars.
+ cd lib || die
+ java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
+ has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
+ has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
+ has_version dev-java/log4j:0 && java-pkg_jar-from log4j
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
new file mode 100644
index 000000000000..d8369fcbf2fb
--- /dev/null
+++ b/dev-java/mchange-commons/Manifest
@@ -0,0 +1 @@
+DIST mchange-commons-java-0.2.10.zip 773768 SHA256 ae3f9d3d12d517d19036a8ede709d9df5e158733aa79e8276e800b508ee278ca SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9 WHIRLPOOL 8c1f1501001bf94eff17493d0a3efaf0f844381e16c608d4c009d687de4597eef7ad47642b7ae58ef972347ebe6470ebc635ab01483b4b5b5ee7aecab57ecfcf
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
new file mode 100644
index 000000000000..545c48201527
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+
+IUSE="doc source"
+
+CDEPEND="
+ dev-java/log4j:0
+ dev-java/slf4j-api:0
+ dev-java/typesafe-config:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/zip
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+JAVA_GENTOO_CLASSPATH="log4j,slf4j-api,typesafe-config"
diff --git a/dev-java/mchange-commons/metadata.xml b/dev-java/mchange-commons/metadata.xml
new file mode 100644
index 000000000000..885373c1666a
--- /dev/null
+++ b/dev-java/mchange-commons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="github">swaldman/mchange-commons-java</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12.ebuild
index 8a94ed405b29..455992f659ca 100644
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/java
LICENSE="CDDL"
SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 2665155da82f..f3f3b5b6250a 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,2 +1 @@
-DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
deleted file mode 100644
index 37449f68d875..000000000000
--- a/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}
- test? (
- dev-java/ant-core:0
- dev-java/easymock:3.2
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,hamcrest-library-1.3,junit-4"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- # Remove the odd memory restriction in the generated build files.
- sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index eeb2263ddc94..52c5735bf687 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -23,9 +23,9 @@ CDEPEND="dev-java/commons-logging:0
dev-java/log4j:0
dev-java/slf4j-nop:0
dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.7
${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.7
${CDEPEND}"
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 2665155da82f..f3f3b5b6250a 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,2 +1 @@
-DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-transport/netty-transport-4.0.19.ebuild b/dev-java/netty-transport/netty-transport-4.0.19.ebuild
deleted file mode 100644
index 81341925b9a4..000000000000
--- a/dev-java/netty-transport/netty-transport-4.0.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/${MY_PN}-buffer:0
- dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}
- test? (
- dev-java/ant-core:0
- dev-java/easymock:3.2
- dev-java/logback:0
- dev-java/junit:4
- )"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,junit-4,logback"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
-
-# error: package ch.qos.logback.classic does not exist
-RESTRICT="test"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- # Remove the odd memory restriction in the generated build files.
- sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/netty-transport/netty-transport-4.0.21.ebuild b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
deleted file mode 100644
index f44c11543f4d..000000000000
--- a/dev-java/netty-transport/netty-transport-4.0.21.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/${MY_PN}-buffer:0
- dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-# error: package ch.qos.logback.classic does not exist
-RESTRICT="test"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
- java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
index 21c8c97aec3a..5c7418a14f6e 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
@@ -108,7 +108,8 @@ RDEPEND="!x64-macos? (
# A PaX header isn't created by scanelf so depend on paxctl to avoid
# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
+DEPEND="app-arch/zip
+ jce? ( app-arch/unzip )
examples? ( x64-macos? ( app-arch/unzip ) )
pax_kernel? ( sys-apps/paxctl )"
@@ -181,6 +182,18 @@ src_prepare() {
if use jce ; then
mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
fi
+
+ if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+ eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+ eqawarn
+ eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+ fi
+
+ # Remove the hook that calls Oracle's evil usage tracker. Not just
+ # because it's evil but because it breaks the sandbox during builds
+ # and we can't find any other feasible way to disable it or make it
+ # write somewhere else. See bug #559936 for details.
+ zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
}
src_install() {
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
index b6ecedea21da..89907ab5900e 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
@@ -80,7 +80,8 @@ RDEPEND="!x64-macos? (
# A PaX header isn't created by scanelf so depend on paxctl to avoid
# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
+DEPEND="app-arch/zip
+ jce? ( app-arch/unzip )
pax_kernel? ( sys-apps/paxctl )"
S="${WORKDIR}/jre"
@@ -121,6 +122,12 @@ src_prepare() {
if use jce ; then
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
fi
+
+ # Remove the hook that calls Oracle's evil usage tracker. Not just
+ # because it's evil but because it breaks the sandbox during builds
+ # and we can't find any other feasible way to disable it or make it
+ # write somewhere else. See bug #559936 for details.
+ zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
}
src_install() {
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index d5c0c843e5a7..aff3618168e0 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,2 +1 @@
-DIST osgi-core-api-4.3-all.zip 337463 SHA256 e03188926e6dfbc87ef7a097226c6cd01e399747d75e03a233961de661b13fbc SHA512 4620e96e0a24661a0d3f3a570598d51ba9068b7204f3dd34179bdca76ad9f2edf2e20c1656f0dc355be647a2b5befc064ff50b8f75167639580fb5ef661292c1 WHIRLPOOL 97634762b8c2042301d78312baff5bc575314d5ded28d673d69f354c1e5b23d3845bd4d90421f6d2fe20574386ae5d88e126da90d1fde8aabe71530cc2b8f65f
DIST osgi.core-5.0.0.jar 418232 SHA256 22fe6c64753a0479fb450bcb740ea5e51747cca2e1aabb8a582d50c02c3eec94 SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 WHIRLPOOL 9164e08ccd6f079898d0dedd33df1ea1f76f3ed4e65fe9205d17e72e6d8f6e5820fbab7a0bbe9633efa85f9ff4a9045813ea9d193dc110f5b6bd7d67a98b621c
diff --git a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
deleted file mode 100644
index 40fa4291c0af..000000000000
--- a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
-HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r4v${PV//./}/osgi.core-${PV}.0.jar -> ${P}-all.zip"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.5"
-DEPEND="
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-java_prepare() {
- rm -r org || die
-}
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
index f0528eaa5133..11c36bfa46de 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
index 909a9b33f6fd..4e7ae7699d82 100644
--- a/dev-java/reflections/metadata.xml
+++ b/dev-java/reflections/metadata.xml
@@ -3,4 +3,7 @@
<pkgmetadata>
<herd>java</herd>
<longdescription>Reflections scans your classpath, indexes the metadata, allows you to query it on runtime and may save and collect that information for many modules within your project.</longdescription>
+ <upstream>
+ <remote-id type="github">ronmamo/reflections</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-java/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
new file mode 100644
index 000000000000..3c3360f20210
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.8-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${PV}"
+
+B_PV="0.13.7"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+# creating the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.8
+# cd sbt-0.13.8
+# git checkout v0.13.8
+# cd ..
+# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
+
+# creating the binary:
+# cd $WORDKIR
+# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://www.scala-sbt.org/"
+EGIT_COMMIT="v${PV}"
+EGIT_REPO_URI="https://github.com/sbt/sbt.git"
+SRC_URI="!binary?
+(
+ https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+ https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+ https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+ https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+ http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="=virtual/jdk-1.7*
+ >=dev-lang/scala-2.10.4-r1:${SV}"
+RDEPEND=">=virtual/jre-1.7
+ dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+src_unpack() {
+ # if ! use binary; then
+ # git-r3_src_unpack
+ # fi
+ # Unpack tar files only.
+ for f in ${A} ; do
+ [[ ${f} == *".tar."* ]] && unpack ${f}
+ done
+}
+
+java_prepare() {
+ if ! use binary; then
+ # Note: to bump sbt, some things to try are:
+ # 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+ # https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+ # https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
+ # 2. Comment the sbt publishLocal line in src_compile.
+ # 3. try:
+ # FEATURES='noclean -test' emerge -v dev-java/sbt
+ # It should fail in src_install since the sbt publishLocal is not done.
+ # Check if it downloads more stuff in
+ # src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt.
+ # 4. If some of the downloads fail, it might be necessary to run the sbt compile
+ # again manually to obtain all the dependencies, if so (with jdk 1.6):
+ # cd to ${S}
+ # export EROOT=/
+ # export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
+ # export SV="2.10"
+ # export B_P=sbt-0.13.7
+ # export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+ # sbt compile
+ # cd ${WORKDIR}
+ # find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+ # 5. cd ${WORKDIR}
+ # tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
+ # tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
+ # 6. It downloads more dependencies for src_test, however the presence of some of these may cause
+ # the src_compile to fail. So download them seperately as root so we can identify the
+ # additional files. Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+ # hopefully be ignored. As root:
+ # cd ${S}
+ # sbt test
+ # cd ${WORKDIR}
+ # find .ivy2 .sbt -uid 0 -print
+ # Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
+ # .ivy2/local
+ # .ivy2/cache/org.scala-sbt
+ # Something like:
+ # tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
+ # 7. Undo the earlier temporary edits to the ebuild.
+
+ mkdir "${WORKDIR}/${B_P}" || die
+ cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+ cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+ #!/bin/sh
+ SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+ java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+ EOF
+ chmod u+x "${WORKDIR}/${B_P}/sbt" || die
+ local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+ local SFV="${SCALA_PVR/-*}"
+ sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+ -i "${S}/build.sbt" || die
+ fi
+}
+
+src_compile() {
+ if ! use binary; then
+ export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+ einfo "=== sbt compile ..."
+ "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+ einfo "=== sbt publishLocal ..."
+ cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+ set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+ publishLocal
+ EOF
+ fi
+}
+
+src_test() {
+ if ! use binary; then
+ export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+ "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
+ fi
+}
+
+src_install() {
+ if ! use binary; then
+ pushd sbt-launch/target || die
+ mv ${L_P}.jar ${L_PN}.jar || die
+ popd
+ fi
+ java-pkg_dojar sbt-launch/target/${L_PN}.jar
+ java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
index cc798166fb63..43aeb4c368e5 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
COMMON_DEP="dev-java/slf4j-api:0
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index ffe05a9cd2ca..9b41e7364c12 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
COMMON_DEP="dev-java/slf4j-api:0"
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index 8c290ebcf0ab..a37d95efc2a6 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -6,5 +6,6 @@
</longdescription>
<upstream>
<remote-id type="google-code">snakeyaml</remote-id>
+ <remote-id type="bitbucket">asomov/snakeyaml</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
index 6ac34002d82c..695b680775fb 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
index 64dcb531679e..62f34c4140c0 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
new file mode 100644
index 000000000000..db7a1de38c1a
--- /dev/null
+++ b/dev-java/typesafe-config/Manifest
@@ -0,0 +1 @@
+DIST v1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2
diff --git a/dev-java/typesafe-config/metadata.xml b/dev-java/typesafe-config/metadata.xml
new file mode 100644
index 000000000000..09402e6456b2
--- /dev/null
+++ b/dev-java/typesafe-config/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="github">typesafehub/config</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..23f3b50a50f0
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+JAVA_PKG_IUSE="doc source"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+CDEPEND=""
+
+RDEPEND=">=virtual/jre-1.8
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.8
+ app-arch/zip
+ ${CDEPEND}"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild
new file mode 100644
index 000000000000..34440cdbdaad
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+JAVA_PKG_IUSE="doc source"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE="doc source"
+
+CDEPEND=""
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/zip
+ ${CDEPEND}"
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
index 755a350e8c7f..808a4a60d64c 100644
--- a/dev-java/zemberek/metadata.xml
+++ b/dev-java/zemberek/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="google-code">zemberek</remote-id>
+ <remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
</upstream>
</pkgmetadata>