diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-12 23:34:32 -0400 |
| commit | 64b3189079aa6c10a0204880a58df53b36b9f36a (patch) | |
| tree | 7508f174756528dfe5ad3a359ef24ac3c2baf3f7 /dev-java | |
| parent | 5d6f128da92287fc0b2643d810ecd96f81ac3aa2 (diff) | |
| parent | fbc240f551b32a009511d34ac5c3fd7c15ef82b9 (diff) | |
| download | gentoo-64b3189079aa6c10a0204880a58df53b36b9f36a.tar.gz | |
Merge https://github.com/gentoo/gentoo.gitbrillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
Diffstat (limited to 'dev-java')
83 files changed, 2046 insertions, 1689 deletions
diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild deleted file mode 100644 index 7294a5aa44..0000000000 --- a/dev-java/batik/batik-1.8-r1.ebuild +++ /dev/null @@ -1,116 +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" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="Java based SVG toolkit" -HOMEPAGE="https://xmlgraphics.apache.org/batik/" -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.8" -KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc python tcl" - -CDEPEND="dev-java/xalan:0 - dev-java/rhino:1.6 - dev-java/xml-commons-external:1.3 - dev-java/xmlgraphics-commons:2 - python? ( dev-java/jython:0 ) - tcl? ( dev-java/jacl:0 ) - dev-java/ant-core:0" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH=" - xml-commons-external-1.3 - xmlgraphics-commons-2 - xalan - rhino-1.6 -" - -java_prepare() { - # bug #318323 - for file in build.xml contrib/rasterizertask/build.xml; do - java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m - done - - # Add some missing imports to avoid a compiling issue. - # https://bugs.gentoo.org/show_bug.cgi?id=551952 - # https://issues.apache.org/jira/browse/BATIK-1123 - local imports=() - imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java) - imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java) - for import in ${imports[@]}; do - einfo "Fixing missing import in ${import}" - sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die - eend $? - done - - cd lib || die - rm -v *.jar build/*.jar || die - use python && java-pkg_jar-from jython - use tcl && java-pkg_jar-from jacl -} - -src_compile() { - # Fails to build on amd64 without this - if use amd64 ; then - export ANT_OPTS="-Xmx1g" - else - export ANT_OPTS="-Xmx256m" - fi - - eant jars all-jar $(use_doc) - cd contrib/rasterizertask || die - eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc) - - cd "${S}"/"${P}/lib" || die - - # batik-all-1.8.jar is a all-in-one jar that contains all other jars. - # We don't want to package it. - rm -v ${PN}-all-${PV}.jar || die -} - -src_install() { - batik_unversion_jars() { - for jar in batik-*.jar; do - newj="${jar%-*}.jar" - java-pkg_newjar ${jar} ${newj} - done - } - - # First unversion jars in ${P}/lib - cd "${S}"/"${P}"/lib || die - batik_unversion_jars - - # Then, only those in ${P} - cd "${S}"/"${P}" || die - batik_unversion_jars - - # Proceed with documentation installation - cd "${S}" || die - dodoc README CHANGES - use doc && java-pkg_dojavadoc ${P}/docs/javadoc - - # pwd fixes bug #116976 - java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \ - --main org.apache.batik.apps.svgbrowser.Main - - # To find these lsjar batik-${SLOT} | grep Main.class - for launcher in ttf2svg slideshow svgpp rasterizer; do - java-pkg_dolauncher batik-${launcher}-${SLOT} \ - --main org.apache.batik.apps.${launcher}.Main - done - - # Install and register the ant task. - java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar - java-pkg_register-ant-task -} diff --git a/dev-java/batik/batik-1.8-r2.ebuild b/dev-java/batik/batik-1.8-r2.ebuild index 3de7fc0186..79bf96db90 100644 --- a/dev-java/batik/batik-1.8-r2.ebuild +++ b/dev-java/batik/batik-1.8-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou LICENSE="Apache-2.0" SLOT="1.8" -KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc python tcl" CDEPEND="dev-java/xalan:0 diff --git a/dev-java/bcmail/bcmail-1.38-r3.ebuild b/dev-java/bcmail/bcmail-1.38-r3.ebuild deleted file mode 100644 index 1bb25d7e3a..0000000000 --- a/dev-java/bcmail/bcmail-1.38-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=1 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk14-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.38" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -COMMON_DEPEND="dev-java/bcprov:${SLOT} - =dev-java/junit-3.8* - dev-java/sun-jaf - java-virtuals/javamail" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEPEND}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPEND}" -IUSE="" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - unpack ./src.zip -} - -src_compile() { - mkdir "${S}/classes" - - find org -name "*.java" > "${T}/src.list" - ejavac -d "${S}/classes" \ - -classpath $(java-pkg_getjars bcprov-${SLOT},junit,sun-jaf,javamail) \ - "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcmail/bcmail-1.38-r4.ebuild b/dev-java/bcmail/bcmail-1.38-r4.ebuild index a8bfef406e..b55f9d3ff6 100644 --- a/dev-java/bcmail/bcmail-1.38-r4.ebuild +++ b/dev-java/bcmail/bcmail-1.38-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="1.38" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" CDEPEND=" dev-java/bcprov:${SLOT} diff --git a/dev-java/bcmail/bcmail-1.45-r2.ebuild b/dev-java/bcmail/bcmail-1.45-r2.ebuild deleted file mode 100644 index 622c2b6758..0000000000 --- a/dev-java/bcmail/bcmail-1.45-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.45" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" - -COMMON_DEPEND="dev-java/bcprov:1.45 - =dev-java/junit-3.8* - dev-java/sun-jaf - java-virtuals/javamail" -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${COMMON_DEPEND}" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip -} - -src_compile() { - mkdir "${S}/classes" - - find org -name "*.java" > "${T}/src.list" - ejavac -d "${S}/classes" \ - -classpath $(java-pkg_getjars bcprov-1.45,junit,sun-jaf,javamail) \ - "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcmail/bcmail-1.45-r3.ebuild b/dev-java/bcmail/bcmail-1.45-r3.ebuild index adb6f91724..547575d174 100644 --- a/dev-java/bcmail/bcmail-1.45-r3.ebuild +++ b/dev-java/bcmail/bcmail-1.45-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="1.45" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" CDEPEND=" dev-java/bcprov:${SLOT} diff --git a/dev-java/bcmail/bcmail-1.50-r1.ebuild b/dev-java/bcmail/bcmail-1.50-r1.ebuild index a615264ec6..e4fa2be0e5 100644 --- a/dev-java/bcmail/bcmail-1.50-r1.ebuild +++ b/dev-java/bcmail/bcmail-1.50-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="dev-java/bcprov:0[test?] dev-java/bcpkix:0[test?] @@ -41,7 +41,7 @@ JAVA_GENTOO_CLASSPATH=" oracle-javamail " -# Package can't be build with test as bcprov and bcpkix can't be built with test. +# Package can't be built with test as bcprov and bcpkix can't be built with test. RESTRICT="test" src_unpack() { diff --git a/dev-java/bcmail/bcmail-1.50.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild deleted file mode 100644 index d8298f467c..0000000000 --- a/dev-java/bcmail/bcmail-1.50.ebuild +++ /dev/null @@ -1,82 +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 source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" - -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" - -COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?] - ~dev-java/bcpkix-${PV}:0[test?] - dev-java/sun-jaf:0 - java-virtuals/javamail:0" - -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - test? ( dev-java/junit:0 ) - ${COMMON_DEPEND}" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" - -S="${WORKDIR}/${MY_P}" - -# Package can't be build with test as bcprov and bcpkix can't be built with test. -RESTRICT="test" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes - - if use test ; then - java-pkg_jar-from --build-only junit - fi -} - -src_compile() { - find org -name "*.java" > "${T}"/src.list - - local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)" - if use test ; then - cp="${cp}:junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list - - cd "${S}"/classes - jar -cf "${S}"/${PN}.jar * || die "failed to create jar" -} - -src_test() { - local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar" - - java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar "${S}"/${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcmail/bcmail-1.52-r1.ebuild b/dev-java/bcmail/bcmail-1.52-r1.ebuild index a615264ec6..e4fa2be0e5 100644 --- a/dev-java/bcmail/bcmail-1.52-r1.ebuild +++ b/dev-java/bcmail/bcmail-1.52-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="dev-java/bcprov:0[test?] dev-java/bcpkix:0[test?] @@ -41,7 +41,7 @@ JAVA_GENTOO_CLASSPATH=" oracle-javamail " -# Package can't be build with test as bcprov and bcpkix can't be built with test. +# Package can't be built with test as bcprov and bcpkix can't be built with test. RESTRICT="test" src_unpack() { diff --git a/dev-java/bcmail/bcmail-1.52.ebuild b/dev-java/bcmail/bcmail-1.52.ebuild deleted file mode 100644 index dcc7f07fa3..0000000000 --- a/dev-java/bcmail/bcmail-1.52.ebuild +++ /dev/null @@ -1,84 +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 source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" - -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" - -CDEPEND=">=dev-java/bcprov-${PV}:0[test?] - ~dev-java/bcpkix-${PV}:0[test?] - dev-java/sun-jaf:0 - java-virtuals/javamail:0" - -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - test? ( - dev-java/junit:0 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -# Package can't be build with test as bcprov and bcpkix can't be built with test. -RESTRICT="test" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes - - if use test; then - java-pkg_jar-from --build-only junit - fi -} - -src_compile() { - find org -name "*.java" > "${T}"/src.list - - local cp="$(java-pkg_getjars bcprov,bcpkix,sun-jaf,javamail)" - if use test ; then - cp="${cp}:junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list - - cd "${S}"/classes - jar -cf "${S}"/${PN}.jar * || die "failed to create jar" -} - -src_test() { - local cp="${PN}.jar:bcprov.jar:bcpkix.jar:junit.jar" - - java -cp ${cp} org.bouncycastle.mail.smime.test.AllTests | tee mail.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar "${S}"/${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcpg/bcpg-1.52-r1.ebuild b/dev-java/bcpg/bcpg-1.52-r1.ebuild index 05fe7b2915..1a6a57a84e 100644 --- a/dev-java/bcpg/bcpg-1.52-r1.ebuild +++ b/dev-java/bcpg/bcpg-1.52-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="1.52" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" # Tests are currently broken. Appears to need older version of bcprov; but since bcprov is not slotted, this can cause conflicts. # Needs further investigation; though, only a small part has tests and there are no tests for bcpg itself. diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index e5c853a769..32e4da05c5 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,7 +1,7 @@ -DIST bcprov-jdk14-138.tar.gz 3374082 SHA256 15a8099fca68fde937cdfc87ae486498a7c12c7d1ebaca9f26aa31b7ad11d413 SHA512 a320a49ca775a5d0dfb8aa7c7fd900384e4e789df2e11be2bfd84cd3ce0ba1d755a680f1d09d3030b178c7d7c52a469601f40b023ac402e6523731d8098793e1 WHIRLPOOL d08c4401003b1b217594f4ebe4bb55a0ff03df72dff45c84e05b605341aaf3af3b6f5824e179547df3c6777cade20891cdcdd79d52df8e20cbfdb6186fd871f8 -DIST bcprov-jdk15-140.tar.gz 3494846 SHA256 4284e5b4eef0ae410aa1e65868058230a86c5cc591a47b391c87d4a18e913bbf SHA512 22cbbaa81709c8dcf28ceb0e984ca6181b835fb20f4381a2123291b638d07b987572ddf58d33ae07f7cb7dca9f1a67e3b6a1c0467cb2e0dca7625b622517ddb6 WHIRLPOOL 76c7973f3b4668ac438a0fed38b893b5eee8810aa91c0e43309063f064021e637190a1238d0e8f03c5d8303f91c50cb6beba22fd6dc712985c8b114ba2b75cea -DIST bcprov-jdk15-145.tar.gz 3427337 SHA256 7751a677d2cf7f8f9494a9b80c884e88de63be3be6fd9fccecee854196c611e2 SHA512 789ae99942e7d565ee58b2411f1ac089a999c4b947d81d640850190ff80d8aa27448d401deff5f44d9ebb4b75f492cf58a6d1d7bcab78198872bea6e98c9f7c3 WHIRLPOOL bb30f3c4192aef793d1193ce4a85f7aa801dca5ae5c0e17807e8c0d549bf883424985025b157266fc5b504a8892e37494295f780c736903d484c5cee70b5bc33 DIST bcprov-jdk15on-148.tar.gz 4070349 SHA256 e3fc3dab563e52939c7fa22f93a051a819729a03dbeabfb6e1998ed41943b56b SHA512 5216f6511c2ab280dc5a06a94017c2045befaa23c4ba71e67f20375f498ac2e1706b772440b5f5615cc18a52ce79fd61f7f95d2663202b50f29196dff33cde46 WHIRLPOOL 9020e24c3f7a63a555760f07ee93ffd0f58350558bf2bf02a5229468867d747e29521b48784ca9f8aeaa832059fe62f02f622ab141c8608d71692ca8c68d9b89 DIST bcprov-jdk15on-149.tar.gz 4329897 SHA256 a22ca93539a34bdbce793a0093dd3f7f8c313e318368772806fa5db3f0603ac6 SHA512 123b2c7063b8a1fe068571d8227269fd77b6d07163aec35dca2219b5a2e0ad970995a74027cc515ecaa6112ccb395fcc4db6fa323f9eadab2c4d6e62991c9143 WHIRLPOOL 9c4057cbf11254a7d99d492840b7921dbe296bc5675a5527b917a1b4496c027fbf5db60a555e4abe05f03d528836c6512d4241d4a1a7425750957c3a43680103 DIST bcprov-jdk15on-150.tar.gz 4629743 SHA256 468259c9166fbcf87ad284ae46fae45408cb7cfc9c406862ea75d5b8696f4f2a SHA512 95400c338a65cbb7d1e80c776de41d3d372b4237aee91526a06774c3d4beb735dcfb4c1ed182a12f2ccac8204b9c546863d79eb99723394d48c415fa32b6ee0e WHIRLPOOL 4f0db66b6e7cc4faf7fbd09a9c4ba7618123657d86e4552157d998e5ae8bb21843fe5ebfa8a9e622b1d9697a0e6e9637a55501fefda238c91a0bbd5be7010c38 DIST bcprov-jdk15on-152.tar.gz 6334971 SHA256 b798e67553ff77aaaf42bfdf06a2560cd1b550aa6270a7cd3155f6f13534c2b6 SHA512 df769d2647c1c0b535b1f6922df3f02ed7e13c941f8d954256fddb2ff31d5682924fedf2f2908bc09ebd20058413f40a4c2d62190b63542aa7840b860aeab07c WHIRLPOOL 29475be8ff0ee5bdf8212526510600eec9d1c1613a629ebcadd90a9ec8de27973336a55c3e2cd5b880d6adac5eab4521f3ad1cc3ca3672c840720be8603af2e6 +DIST bcprov-jdk16-1.38-sources.jar 1197644 SHA256 f2faec59d32f01b76f1c675d286f96721f76a7325e492c11aae03c6ed288fe3a SHA512 e8ab0b6f47b9737f19ee548dfc6cf09087d1b9339bc48b599fac05d0eb3b00d355f203787a84ee3a504eff2dffd707237a0cc5e26c64a672a362b9161077326f WHIRLPOOL ce3f685669fd31689284d7ad0cc0dbafb496808b6c56d1b6f0a9abb8741585000ad54b18577d608ff4f917dfdd4a25c5332f493d60e90e8b4c27cf1f464fb292 +DIST bcprov-jdk16-1.40-sources.jar 1221202 SHA256 583d7e045e7022107453d218240afc3db17461ccbd34ace0ec7f54df1ce153c2 SHA512 ed94e54cd7a53b5219d0eebb1651f93201c177faf26724613a520e045987e74c462e7adde491bda5bd092fd651b9a7abef93bfac2fd6f0765fb7651525c199ce WHIRLPOOL f387cfe7181d189df08ab2c8c932b777c03cfeb57dac7a95995a1c8a915dc113dd79b8291b3ce3f20f590f9b79a853c7b6113d3eff7bd2c16ec1c5c5d1ffbe0e +DIST bcprov-jdk16-1.45-sources.jar 1286663 SHA256 fe4f8a7b78515e69f48145f172f698f5d6f8433ac8388cf97e3791aae021eb87 SHA512 541b390efafba17c21a25bdf84725fd0f9808555eec9c4db51b0642c348d552417d9ba8d584d54690146f3e72fe3b348ab49f92ca263ea8a7a8f7b27bb7b8e5d WHIRLPOOL 65243c247fd68000368d16446c6bd9079af101faae6d011c4c455c9b1b833ebc7e5484eb899a7b195764e3d00058a33bedb05a8584a217084a583f8f16ef0cc7 diff --git a/dev-java/bcprov/bcprov-1.38-r2.ebuild b/dev-java/bcprov/bcprov-1.38-r2.ebuild deleted file mode 100644 index 38f288d553..0000000000 --- a/dev-java/bcprov/bcprov-1.38-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk14-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.4 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.4" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - unpack ./src.zip - - # so that we don't need junit - echo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." -} - -src_compile() { - mkdir "${S}/classes" - - find . -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.38-r3.ebuild b/dev-java/bcprov/bcprov-1.38-r3.ebuild deleted file mode 100644 index 887278148f..0000000000 --- a/dev-java/bcprov/bcprov-1.38-r3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk14-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.38" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.4 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.4" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - unpack ./src.zip - - # so that we don't need junit - echo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." -} - -src_compile() { - mkdir "${S}/classes" - - find . -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.38-r4.ebuild b/dev-java/bcprov/bcprov-1.38-r4.ebuild new file mode 100644 index 0000000000..2f75cba835 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.38-r4.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 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 + +MY_PN="${PN}-jdk16" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar" +LICENSE="BSD" +SLOT="1.38" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +JAVA_ENCODING="ISO-8859-1" +JAVA_SRC_DIR="org" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.40-r1.ebuild b/dev-java/bcprov/bcprov-1.40-r1.ebuild deleted file mode 100644 index ac913873e9..0000000000 --- a/dev-java/bcprov/bcprov-1.40-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.40" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip - - # so that we don't need junit - echo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." -} - -src_compile() { - mkdir "${S}/classes" - - find . -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.40-r2.ebuild b/dev-java/bcprov/bcprov-1.40-r2.ebuild new file mode 100644 index 0000000000..04c02fb8bb --- /dev/null +++ b/dev-java/bcprov/bcprov-1.40-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 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 + +MY_PN="${PN}-jdk16" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar" +LICENSE="BSD" +SLOT="1.40" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +JAVA_ENCODING="ISO-8859-1" +JAVA_SRC_DIR="org" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.45-r1.ebuild b/dev-java/bcprov/bcprov-1.45-r1.ebuild deleted file mode 100644 index 0cea3e9359..0000000000 --- a/dev-java/bcprov/bcprov-1.45-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.45" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip - - # so that we don't need junit - echo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." -} - -src_compile() { - mkdir "${S}/classes" - - find . -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.45-r2.ebuild b/dev-java/bcprov/bcprov-1.45-r2.ebuild new file mode 100644 index 0000000000..28c5f32e5c --- /dev/null +++ b/dev-java/bcprov/bcprov-1.45-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 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 + +MY_PN="${PN}-jdk16" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://central.maven.org/maven2/org/bouncycastle/${MY_PN}/${PV}/${MY_P}-sources.jar" +LICENSE="BSD" +SLOT="1.45" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +JAVA_ENCODING="ISO-8859-1" +JAVA_SRC_DIR="org" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.45.ebuild b/dev-java/bcprov/bcprov-1.45.ebuild deleted file mode 100644 index 4dd1d5ec6d..0000000000 --- a/dev-java/bcprov/bcprov-1.45.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - cd "${S}" - unpack ./src.zip - - # so that we don't need junit - echo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." -} - -src_compile() { - mkdir "${S}/classes" - - find . -name "*.java" > "${T}/src.list" - ejavac -encoding ISO-8859-1 -d "${S}/classes" "@${T}/src.list" - - cd "${S}/classes" - jar -cf "${S}/${PN}.jar" * || die "failed to create jar" -} - -src_install() { - java-pkg_dojar "${S}/${PN}.jar" - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.48-r1.ebuild b/dev-java/bcprov/bcprov-1.48-r1.ebuild deleted file mode 100644 index 0948f5b7f7..0000000000 --- a/dev-java/bcprov/bcprov-1.48-r1.ebuild +++ /dev/null @@ -1,64 +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" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.48" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - - cd "${S}" || die - unpack ./src.zip -} - -java_prepare() { - # This should eventually split the tests - # and call them separately, it's not clean - # to just throw the tests away. - einfo "Removing testcases' sources:" - find . -path '*test/*.java' -print -delete \ - || die "Failed to delete testcases." - find . -name '*Test*.java' -print -delete \ - || die "Failed to delete testcases." - - mkdir "${S}"/classes || die -} - -src_compile() { - find . -name "*.java" > "${T}"/src.list - ejavac -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list - - cd "${S}"/classes || die - jar -cf "${S}"/${PN}.jar * || die "Failed to create jar." -} - -src_install() { - java-pkg_dojar "${S}"/${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.48-r2.ebuild b/dev-java/bcprov/bcprov-1.48-r2.ebuild new file mode 100644 index 0000000000..795b0383c3 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.48-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 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 + +MY_P="${PN}-jdk15on-${PV/./}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="1.48" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +JAVA_ENCODING="ISO-8859-1" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +src_unpack() { + default + cd "${S}" + unpack ./src.zip +} + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.49-r2.ebuild b/dev-java/bcprov/bcprov-1.49-r2.ebuild deleted file mode 100644 index fa1a02fc31..0000000000 --- a/dev-java/bcprov/bcprov-1.49-r2.ebuild +++ /dev/null @@ -1,81 +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-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# Tests are currently broken. Needs further investigation. -# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256 -RESTRICT="test" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip - test? ( dev-java/junit:4 )" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - - cd "${S}" || die - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes || die - - if use test ; then - java-pkg_jar-from --build-only junit-4 - fi -} - -src_compile() { - find . -name "*.java" > "${T}"/src.list - - local cp - if use test ; then - cp="-cp junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list - - cd "${S}"/classes || die - - jar -cf "${S}"/${PN}.jar * || die "Failed to create jar." -} - -src_test() { - java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar ${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.49-r3.ebuild b/dev-java/bcprov/bcprov-1.49-r3.ebuild deleted file mode 100644 index 3e23923799..0000000000 --- a/dev-java/bcprov/bcprov-1.49-r3.ebuild +++ /dev/null @@ -1,81 +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_P="${PN}-jdk15on-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="1.49" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# Tests are currently broken. Needs further investigation. -# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256 -RESTRICT="test" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip - test? ( dev-java/junit:4 )" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - - cd "${S}" || die - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes || die - - if use test ; then - java-pkg_jar-from --build-only junit-4 - fi -} - -src_compile() { - find . -name "*.java" > "${T}"/src.list - - local cp - if use test ; then - cp="-cp junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list - - cd "${S}"/classes || die - - jar -cf "${S}"/${PN}.jar * || die "Failed to create jar." -} - -src_test() { - java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar ${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.49-r4.ebuild b/dev-java/bcprov/bcprov-1.49-r4.ebuild new file mode 100644 index 0000000000..17d91d2424 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.49-r4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 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 + +MY_P="${PN}-jdk15on-${PV/./}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="1.49" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +JAVA_ENCODING="ISO-8859-1" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +src_unpack() { + default + cd "${S}" + unpack ./src.zip +} + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.50-r2.ebuild b/dev-java/bcprov/bcprov-1.50-r2.ebuild new file mode 100644 index 0000000000..b0deca88b8 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.50-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 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 + +MY_P="${PN}-jdk15on-${PV/./}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="1.50" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +JAVA_ENCODING="ISO-8859-1" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +src_unpack() { + default + cd "${S}" + unpack ./src.zip +} + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.50-r3.ebuild b/dev-java/bcprov/bcprov-1.50-r3.ebuild new file mode 100644 index 0000000000..b10fce6228 --- /dev/null +++ b/dev-java/bcprov/bcprov-1.50-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 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 + +MY_P="${PN}-jdk15on-${PV/./}" + +DESCRIPTION="Java cryptography APIs" +HOMEPAGE="http://www.bouncycastle.org/java.html" +SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" + +CDEPEND="" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${MY_P}" + +JAVA_ENCODING="ISO-8859-1" + +# Package can't be built with test as bcprov and bcpkix can't be built with test. +RESTRICT="test" + +src_unpack() { + default + cd "${S}" + unpack ./src.zip +} + +java_prepare() { + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die + fi +} + +src_compile() { + java-pkg-simple_src_compile +} + +src_install() { + java-pkg-simple_src_install + use source && java-pkg_dosrc org +} diff --git a/dev-java/bcprov/bcprov-1.50.ebuild b/dev-java/bcprov/bcprov-1.50.ebuild deleted file mode 100644 index 6a541955b7..0000000000 --- a/dev-java/bcprov/bcprov-1.50.ebuild +++ /dev/null @@ -1,81 +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 source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# Tests are currently broken. Needs further investigation. -# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256 -RESTRICT="test" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.5 - userland_GNU? ( >=sys-apps/findutils-4.3 ) - app-arch/unzip - test? ( dev-java/junit:4 )" -RDEPEND=">=virtual/jre-1.5" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - - cd "${S}" || die - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes || die - - if use test ; then - java-pkg_jar-from --build-only junit-4 - fi -} - -src_compile() { - find . -name "*.java" > "${T}"/src.list - - local cp - if use test ; then - cp="-cp junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list - - cd "${S}"/classes || die - - jar -cf "${S}"/${PN}.jar * || die "Failed to create jar." -} - -src_test() { - java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar ${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/bcprov/bcprov-1.52-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r1.ebuild index f6bb54a7db..add187a0f7 100644 --- a/dev-java/bcprov/bcprov-1.52-r1.ebuild +++ b/dev-java/bcprov/bcprov-1.52-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="1.52" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="" @@ -41,7 +41,7 @@ src_unpack() { } java_prepare() { - if ! test; then + if ! use test; then # There are too many files to delete so we won't be using JAVA_RM_FILES # (it produces a lot of output). local RM_TEST_FILES=() @@ -52,7 +52,7 @@ java_prepare() { RM_TEST_FILES+=("${file}") done < <(find . -name "*Mock*.java" -type f -print0) - rm -f "${RM_TEST_FILES[@]}" + rm -v "${RM_TEST_FILES[@]}" fi } diff --git a/dev-java/bcprov/bcprov-1.50-r1.ebuild b/dev-java/bcprov/bcprov-1.52-r2.ebuild index 99e56563e8..990b7ff335 100644 --- a/dev-java/bcprov/bcprov-1.50-r1.ebuild +++ b/dev-java/bcprov/bcprov-1.52-r2.ebuild @@ -15,8 +15,8 @@ HOMEPAGE="http://www.bouncycastle.org/java.html" SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" LICENSE="BSD" -SLOT="1.50" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" CDEPEND="" @@ -41,10 +41,18 @@ src_unpack() { } java_prepare() { - if ! test; then - for test_file in $(find . -type f -name '*Test*'.java); do - JAVA_RM_FILES+=("${test_file}") - done + if ! use test; then + # There are too many files to delete so we won't be using JAVA_RM_FILES + # (it produces a lot of output). + local RM_TEST_FILES=() + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Test*.java" -type f -print0) + while read -d $'\0' -r file; do + RM_TEST_FILES+=("${file}") + done < <(find . -name "*Mock*.java" -type f -print0) + + rm -v "${RM_TEST_FILES[@]}" || die fi } diff --git a/dev-java/bcprov/bcprov-1.52.ebuild b/dev-java/bcprov/bcprov-1.52.ebuild deleted file mode 100644 index c2e5a3c31a..0000000000 --- a/dev-java/bcprov/bcprov-1.52.ebuild +++ /dev/null @@ -1,84 +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 source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-jdk15on-${PV/./}" -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="http://www.bouncycastle.org/java.html" -SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos" - -# Tests are currently broken. Needs further investigation. -# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256 -RESTRICT="test" - -# The src_unpack find needs a new find -# https://bugs.gentoo.org/show_bug.cgi?id=182276 -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - userland_GNU? ( - sys-apps/findutils - ) - test? ( - dev-java/junit:4 - )" -RDEPEND=">=virtual/jre-1.6" - -IUSE="userland_GNU" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - default - cd "${S}" || die - unpack ./src.zip -} - -java_prepare() { - mkdir "${S}"/classes || die - - if use test; then - java-pkg_jar-from --build-only junit-4 - fi -} - -src_compile() { - find . -name "*.java" > "${T}"/src.list - - local cp - if use test ; then - cp="-cp junit.jar" - else - sed -i '/\/test\//d' "${T}"/src.list || die "Failed to remove test classes" - fi - - ejavac $cp -encoding ISO-8859-1 -d "${S}"/classes "@${T}"/src.list - - cd "${S}"/classes || die - - jar -cf "${S}"/${PN}.jar * || die "Failed to create jar." -} - -src_test() { - java -cp ${PN}.jar:junit.jar org.bouncycastle.pqc.jcajce.provider.test.AllTests | tee pqc.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.ocsp.test.AllTests | tee oscp.tests - java -cp ${PN}.jar:junit.jar org.bouncycastle.jce.provider.test.AllTests | tee jce.tests - - grep -q FAILURES *.tests && die "Tests failed." -} - -src_install() { - java-pkg_dojar ${PN}.jar - - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc docs -} diff --git a/dev-java/blowfishj/blowfishj-2.14-r2.ebuild b/dev-java/blowfishj/blowfishj-2.14-r2.ebuild deleted file mode 100644 index d423e69c95..0000000000 --- a/dev-java/blowfishj/blowfishj-2.14-r2.ebuild +++ /dev/null @@ -1,42 +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 source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Blowfish implementation in Java" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" -HOMEPAGE="http://blowfishj.sourceforge.net/index.html" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.4 - test? ( =dev-java/junit-3* dev-java/ant-junit ) " -RDEPEND=">=virtual/jre-1.4" - -src_unpack() { - unpack ${A} - cd "${S}" || die - java-ant_ignore-system-classes - mkdir -p target/lib || die - cd target/lib || die - use test && java-pkg_jar-from --build-only junit -} - -src_test() { - ANT_TASKS="ant-junit" eant test -DJunit.present=true -} - -src_install() { - java-pkg_newjar target/${P}.jar - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/net -} diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild index dfa8b48baf..110a4aff1c 100644 --- a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild +++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://blowfishj.sourceforge.net/index.html" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" DEPEND=">=virtual/jdk-1.6 diff --git a/dev-java/cglib/cglib-3.1.ebuild b/dev-java/cglib/cglib-3.1.ebuild index 7318c56cf7..c2d4fa4b34 100644 --- a/dev-java/cglib/cglib-3.1.ebuild +++ b/dev-java/cglib/cglib-3.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar" LICENSE="Apache-2.0" SLOT="3" -KEYWORDS="~amd64 ~x86 ~ppc ~ppc64" +KEYWORDS="amd64 x86 ppc ppc64" IUSE="" diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild new file mode 100644 index 0000000000..d190857ba9 --- /dev/null +++ b/dev-java/colt/colt-1.2.0-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +JAVA_PKG_IUSE="source doc" + +inherit java-pkg-2 java-ant-2 eutils + +DESCRIPTION="A set of Open Source Libraries for High Performance Scientific and Technical Computing in Java" +SRC_URI="http://dsd.lbl.gov/~hoschek/colt-download/releases/${P}.tar.gz" +HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/" + +LICENSE="colt" +IUSE="" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=">=virtual/jdk-1.7" +RDEPEND=">=virtual/jre-1.7" + +S="${WORKDIR}/${PN}" + +EANT_BUILD_TARGET="javac jar" +JAVA_ANT_ENCODING="ISO-8859-1" + +# [0]: I don't know but it must be useful. +# [1]: Monkey patch manually some classes to get rid of the +# oswego.edu.concurrent.util imports. +PATCHES=( + "${FILESDIR}/${P}-benchmark-no-deprecation.patch" + "${FILESDIR}/${P}-remove-concurrent-util-imports.patch" +) + +java_prepare() { + epatch "${PATCHES[@]}" + java-pkg_clean +} + +src_install() { + java-pkg_dojar "lib/${PN}.jar" + + dohtml README.html || die + use doc && java-pkg_dojavadoc doc/api + use source && java-pkg_dosrc src/* +} diff --git a/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch new file mode 100644 index 0000000000..2cfbef761b --- /dev/null +++ b/dev-java/colt/files/colt-1.2.0-remove-concurrent-util-imports.patch @@ -0,0 +1,210 @@ +--- src/cern/colt/matrix/linalg/SmpBlas.java.orig 2015-10-07 22:23:44.969486000 +0000 ++++ src/cern/colt/matrix/linalg/SmpBlas.java 2015-10-07 22:29:15.475486000 +0000 +@@ -10,7 +10,8 @@ +
+ import cern.colt.matrix.DoubleMatrix1D;
+ import cern.colt.matrix.DoubleMatrix2D;
+-import EDU.oswego.cs.dl.util.concurrent.FJTask;
++
++import java.util.concurrent.ForkJoinTask;
+ /**
+ Parallel implementation of the Basic Linear Algebra System for symmetric multi processing boxes.
+ Currently only a few algorithms are parallelised; the others are fully functional, but run in sequential mode.
+@@ -198,7 +199,7 @@ +
+ // set up concurrent tasks
+ int span = width/noOfTasks;
+- final FJTask[] subTasks = new FJTask[noOfTasks];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
+ for (int i=0; i<noOfTasks; i++) {
+ final int offset = i*span;
+ if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
+@@ -217,24 +218,30 @@ + CC = C.viewPart(offset,0,span,p);
+ }
+
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ seqBlas.dgemm(transposeA,transposeB,alpha,AA,BB,beta,CC);
+ //System.out.println("Hello "+offset);
+ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.smp.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.smp.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ public void dgemv(final boolean transposeA, final double alpha, DoubleMatrix2D A, final DoubleMatrix1D x, final double beta, DoubleMatrix1D y) {
+ /*
+@@ -271,7 +278,7 @@ +
+ // set up concurrent tasks
+ int span = width/noOfTasks;
+- final FJTask[] subTasks = new FJTask[noOfTasks];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[noOfTasks];
+ for (int i=0; i<noOfTasks; i++) {
+ final int offset = i*span;
+ if (i==noOfTasks-1) span = width - span*i; // last span may be a bit larger
+@@ -280,24 +287,30 @@ + final DoubleMatrix2D AA = A.viewPart(offset,0,span,n);
+ final DoubleMatrix1D yy = y.viewPart(offset,span);
+
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ seqBlas.dgemv(transposeA,alpha,AA,x,beta,yy);
+ //System.out.println("Hello "+offset);
+ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.smp.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.smp.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ public void dger(double alpha, DoubleMatrix1D x, DoubleMatrix1D y, DoubleMatrix2D A) {
+ seqBlas.dger(alpha,x,y,A);
+@@ -369,9 +382,6 @@ + /**
+ * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
+ */
+-public void stats() {
+- if (this.smp!=null) this.smp.stats();
+-}
+ private double xsum(DoubleMatrix2D A) {
+ double[] sums = run(A,true,
+ new Matrix2DMatrix2DFunction() {
+--- src/cern/colt/matrix/linalg/Smp.java.orig 2015-10-07 21:08:19.443486000 +0000 ++++ src/cern/colt/matrix/linalg/Smp.java 2015-10-07 22:28:24.722486000 +0000 +@@ -9,12 +9,13 @@ + package cern.colt.matrix.linalg;
+
+ import cern.colt.matrix.DoubleMatrix2D;
+-import EDU.oswego.cs.dl.util.concurrent.FJTask;
+-import EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup;
++import java.util.concurrent.ForkJoinTask;
++import java.util.concurrent.ForkJoinPool;
++
+ /*
+ */
+ class Smp {
+- protected FJTaskRunnerGroup taskGroup; // a very efficient and light weight thread pool
++ protected ForkJoinPool taskGroup; // a very efficient and light weight thread pool
+
+ protected int maxThreads;
+ /**
+@@ -24,41 +25,39 @@ + maxThreads = Math.max(1,maxThreads);
+ this.maxThreads = maxThreads;
+ if (maxThreads>1) {
+- this.taskGroup = new FJTaskRunnerGroup(maxThreads);
++ this.taskGroup = new ForkJoinPool(maxThreads);
+ }
+ else { // avoid parallel overhead
+ this.taskGroup = null;
+ }
+ }
+-/**
+- * Clean up deamon threads, if necessary.
+- */
+-public void finalize() {
+- if (this.taskGroup!=null) this.taskGroup.interruptAll();
+-}
+ protected void run(final DoubleMatrix2D[] blocksA, final DoubleMatrix2D[] blocksB, final double[] results, final Matrix2DMatrix2DFunction function) {
+- final FJTask[] subTasks = new FJTask[blocksA.length];
++ final ForkJoinTask[] subTasks = new ForkJoinTask[blocksA.length];
+ for (int i=0; i<blocksA.length; i++) {
+ final int k = i;
+- subTasks[i] = new FJTask() {
++ subTasks[i] = new ForkJoinTask() {
+ public void run() {
+ double result = function.apply(blocksA[k],blocksB != null ? blocksB[k] : null);
+ if (results!=null) results[k] = result;
+ //System.out.print(".");
+ }
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
+ };
+ }
+
+ // run tasks and wait for completion
+- try {
+- this.taskGroup.invoke(
+- new FJTask() {
+- public void run() {
+- coInvoke(subTasks);
+- }
+- }
+- );
+- } catch (InterruptedException exc) {}
++ this.taskGroup.invoke(
++ new ForkJoinTask() {
++ public void run() {
++ invokeAll(subTasks);
++ }
++ public boolean exec() { return true; }
++ public void setRawResult(Object o) {}
++ public Object getRawResult() {return null;}
++ }
++ );
+ }
+ protected DoubleMatrix2D[] splitBlockedNN(DoubleMatrix2D A, int threshold, long flops) {
+ /*
+@@ -186,10 +185,4 @@ + }
+ return blocks;
+ }
+-/**
+- * Prints various snapshot statistics to System.out; Simply delegates to {@link EDU.oswego.cs.dl.util.concurrent.FJTaskRunnerGroup#stats}.
+- */
+-public void stats() {
+- if (this.taskGroup!=null) this.taskGroup.stats();
+-}
+ }
diff --git a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild b/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild index 0860a7b646..adc43c0d68 100644 --- a/dev-java/commons-attributes/commons-attributes-2.2-r2.ebuild +++ b/dev-java/commons-attributes/commons-attributes-2.2-r2.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$ @@ -14,18 +14,18 @@ SRC_URI="mirror://apache/commons/attributes/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" -COMMON_DEP="dev-java/ant-core:0 +CDEPEND="dev-java/ant-core:0 dev-java/gjdoc:0 dev-java/qdox:1.6 dev-java/xjavadoc:0" -DEPEND=">=virtual/jdk-1.4 - ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH="ant-core,gjdoc,qdox-1.6" diff --git a/dev-java/commons-chain/commons-chain-1.2.ebuild b/dev-java/commons-chain/commons-chain-1.2.ebuild index 39cccd08e6..4e20ef49d0 100644 --- a/dev-java/commons-chain/commons-chain-1.2.ebuild +++ b/dev-java/commons-chain/commons-chain-1.2.ebuild @@ -14,11 +14,11 @@ SRC_URI="mirror://apache/commons/chain/source/${MY_P}.zip" LICENSE="Apache-2.0" SLOT="1.2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" -# Too many missing imports from javax.servlet.* which cause the +# Too many missing imports from javax.servlet.* which causes the # "compile-tests" target to fail compiling. -# I gave up on it after wasting nearly half a day. +# I gave up on them after wasting nearly half a day. RESTRICT="test" IUSE="" diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest index 99045263e5..3e5e508839 100644 --- a/dev-java/commons-compress/Manifest +++ b/dev-java/commons-compress/Manifest @@ -1,2 +1 @@ -DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452 DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild deleted file mode 100644 index 12176cdfe0..0000000000 --- a/dev-java/commons-compress/commons-compress-1.4.1.ebuild +++ /dev/null @@ -1,56 +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 test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND="dev-java/xz-java" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEPEND} - test? ( dev-java/junit:4 - dev-java/hamcrest-core - dev-java/ant-junit:0 )" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning" -EANT_GENTOO_CLASSPATH="xz-java" -EANT_BUILD_TARGET="compile package" -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java" - -java_prepare() { - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml" - - # osgi stuff mvn ant:ant doesn't handle - mkdir -p target/osgi || die "Failed to create target dir" - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest" - - if ! use test; then - find -name "*.jar" -delete || die "Failed to remove test resources" - fi -} - -src_test() { - EANT_TEST_TARGET="compile-tests test" - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}-1.1.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/commons-compress/commons-compress-1.8.1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild deleted file mode 100644 index d52a6db089..0000000000 --- a/dev-java/commons-compress/commons-compress-1.8.1.ebuild +++ /dev/null @@ -1,56 +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 test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND="dev-java/xz-java" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.5 - ${COMMON_DEPEND} - test? ( dev-java/junit:4 - dev-java/hamcrest-core - dev-java/ant-junit:0 )" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning" -EANT_GENTOO_CLASSPATH="xz-java" -EANT_BUILD_TARGET="compile package" -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java" - -java_prepare() { - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml" - - # osgi stuff mvn ant:ant doesn't handle - mkdir -p target/osgi || die "Failed to create target dir" - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest" - - if ! use test; then - find -name "*.jar" -delete || die "Failed to remove test resources" - fi -} - -src_test() { - EANT_TEST_TARGET="compile-tests test" - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}-1.1.jar - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/commons-dbutils/Manifest b/dev-java/commons-dbutils/Manifest index 4be4cdd0ba..edbf114c42 100644 --- a/dev-java/commons-dbutils/Manifest +++ b/dev-java/commons-dbutils/Manifest @@ -1 +1 @@ -DIST commons-dbutils-1.1-src.tar.gz 60062 SHA256 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59 SHA512 03859d0ddc65b1f0254f71e9de371f131a81dc839de6bea938a0547b63759d18a9e957f44ac887b7ae9ea85ee3aeea90ffd8f03069c670ec7b700fe8b6e45fe2 WHIRLPOOL b4b3e670b30101657c0d57fcf33993cdca89838135f147b54c63ac4bbced6fe1ed1218af36e95bec60e856c73a9d47fbfc1eecdbbd55dd7e476f6883fd94f3fd +DIST commons-dbutils-1.6-src.tar.gz 90708 SHA256 c7cb1bd7e0f9a6d509c98bb60f9941503473d6fe0fbe144736fb1819096c4524 SHA512 05aa5fb448d949ac4d5d34f1219539e57cfb550fa423af0691cb35002984036b0de62b8f618199bd2f562a441867c5b7138e9204afc36bd6d0fa2c4c5e9cd2c6 WHIRLPOOL 012a8cace08c96c136b9e9a05ec34d173d544aecad465908ad823a47ec535cfa91c609e5280e9e05967b3d863b13e999ad2c9a826a100e3faa3333869c26dd97 diff --git a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild deleted file mode 100644 index 3a63ce873b..0000000000 --- a/dev-java/commons-dbutils/commons-dbutils-1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source test" - -inherit base java-pkg-2 java-ant-2 - -DESCRIPTION="A small set of classes designed to make working with JDBC easier" -HOMEPAGE="http://commons.apache.org/dbutils/" -SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.4 - test? ( dev-java/ant-junit )" -RDEPEND=">=virtual/jre-1.4" - -S="${WORKDIR}/${P}-src" - -PATCHES=( "${FILESDIR}/1.1-tests.patch" ) -JAVA_ANT_REWRITE_CLASSPATH="yes" - -src_install() { - java-pkg_newjar target/${P}.jar - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild new file mode 100644 index 0000000000..b76f51a783 --- /dev/null +++ b/dev-java/commons-dbutils/commons-dbutils-1.6.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 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 + +DESCRIPTION="A small set of classes designed to make working with JDBC easier" +HOMEPAGE="http://commons.apache.org/dbutils/" +SRC_URI="mirror://apache/commons/dbutils/source/${P}-src.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=virtual/jdk-1.6 + test? ( + dev-java/mockito:0 + dev-java/ant-junit:0 + dev-java/hamcrest-core:1.3 + )" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${P}-src" + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_TEST_TARGET="test" +EANT_TEST_GENTOO_CLASSPATH=" + mockito + hamcrest-core-1.3 +" + +# Uses a bunch of deprecated methods. +JAVA_RM_FILES=( + src/test/java/org/apache/commons/dbutils/handlers/ArrayHandlerTest.java +) + +java_prepare() { + cp "${FILESDIR}"/"${P}-build.xml" build.xml || die +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java +} diff --git a/dev-java/commons-dbutils/files/1.1-tests.patch b/dev-java/commons-dbutils/files/1.1-tests.patch deleted file mode 100644 index a2036d4180..0000000000 --- a/dev-java/commons-dbutils/files/1.1-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur commons-dbutils-1.1-src.old/build.xml commons-dbutils-1.1-src/build.xml ---- commons-dbutils-1.1-src.old/build.xml 2008-02-13 22:18:49.000000000 +0200 -+++ commons-dbutils-1.1-src/build.xml 2008-02-13 22:18:59.000000000 +0200 -@@ -62,7 +62,7 @@ - </classpath> - </javac> - </target> -- <target name="jar" description="o Create the jar" depends="compile,test"> -+ <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> - </jar> - </target> diff --git a/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml new file mode 100644 index 0000000000..725d4eaca0 --- /dev/null +++ b/dev-java/commons-dbutils/files/commons-dbutils-1.6-build.xml @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 10/5/15 8:20 PM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="commons-dbutils-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="commons-dbutils-1.6"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="src/main/resources"/> + <property name="maven.build.resourceDir.1" value="."/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.build.testResourceDir.1" value="."/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"/> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/junit/junit/4.11/junit-4.11.jar"/> + <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/> + <pathelement location="${maven.repo.local}/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.jar"/> + <pathelement location="${maven.repo.local}/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/> + <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + <javac destdir="${maven.build.outputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.srcDir.0}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <mkdir dir="${maven.build.outputDir}/META-INF"/> + <copy todir="${maven.build.outputDir}/META-INF"> + <fileset dir="${maven.build.resourceDir.1}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + <javac destdir="${maven.build.testOutputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.testDir.0}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + </classpath> + </javac> + <copy todir="${maven.build.testOutputDir}"> + <fileset dir="${maven.build.testResourceDir.0}"/> + </copy> + <mkdir dir="${maven.build.testOutputDir}/META-INF"/> + <copy todir="${maven.build.testOutputDir}/META-INF"> + <fileset dir="${maven.build.testResourceDir.1}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${maven.test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/TestBean.java"/> + <exclude name="**/BaseTestCase.java"/> + </fileset> + </batchtest> + <batchtest todir="${maven.test.reports}" if="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/${test}.java"/> + <exclude name="**/BaseTestCase.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${maven.build.srcDir.0}" + packagenames="*" + destdir="${maven.reporting.outputDirectory}/apidocs" + access="protected" + old="false" + verbose="false" + encoding="iso-8859-1" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + docencoding="iso-8859-1" + source="1.6" + linksource="true" + breakiterator="false"> + <link href="http://docs.oracle.com/javase/6/docs/api/"/> + <link href="http://docs.oracle.com/javaee/6/api/"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + basedir="${maven.build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Main-Class" value="Main"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + +</project> diff --git a/dev-java/commons-graph/Manifest b/dev-java/commons-graph/Manifest index e8bbd79bd0..674c558fec 100644 --- a/dev-java/commons-graph/Manifest +++ b/dev-java/commons-graph/Manifest @@ -1 +1 @@ -DIST graph2-0.8.1.cvs20040118.tar.gz 42653 SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 SHA512 110f2365b9568a4059233c6c6e75aec1a52b4fdd9110d55f0a6b79df324f047bde87d49134d8ba73417223919ddce972dd4a3c86841f843dd0109ebb17177083 WHIRLPOOL e3cd70bc98187a4f581bfa60125cfbfd0490264582d8fe4f536f7ecfd12a2f8228b1ff64db5414f8fa95ea976be5db08a054eecbb86e098cba62cc8cedd6f4c1 +DIST commons-graph-0.1.tar.gz 96009 SHA256 b68f5c7132e9eea4872dfc0d5fd74c138d2489355540dff752a91311cbac040d SHA512 7214fd60eb348a7feee9c194f562e5a7cf1f211ba589d2a85eaae52ed3ced7089842405dfbd99413b1f06f87ea1a19d244989daa1e0f6fb857fa752647d52b16 WHIRLPOOL 90c014761b2a1f8572eba4339f2ea81ec34666a83c21ea27326b366f0089cc5f20a5d6bc53aefa1d09019114b34f424496af95a604c1b55b5bdfec879ab51a0b diff --git a/dev-java/commons-graph/commons-graph-0.1.ebuild b/dev-java/commons-graph/commons-graph-0.1.ebuild new file mode 100644 index 0000000000..2d7af9bab4 --- /dev/null +++ b/dev-java/commons-graph/commons-graph-0.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 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 + +DESCRIPTION="A toolkit for managing graphs and graph based data structures" +HOMEPAGE="https://commons.apache.org/sandbox/commons-graph/" +SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" + +DEPEND=">=virtual/jdk-1.6 + test? ( + dev-java/ant-junit:0 + )" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +EANT_TEST_TARGET="test" + +# Dubious tests. +JAVA_RM_FILES=( + src/test/java/org/apache/commons/graph/coloring/GraphColoringTestCase.java + src/test/java/org/apache/commons/graph/spanning/KruskalTestCase.java + src/test/java/org/apache/commons/graph/scc/TarjanTestCase.java +) + +java_prepare() { + cp "${FILESDIR}"/"${P}-build.xml" build.xml || die +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc target/site/apidocs + use source && java-pkg_dosrc src/main/java +} diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild deleted file mode 100644 index 7a80de01da..0000000000 --- a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 eutils -MY_PN=graph2 -MY_PV=${PV%%_*}.cvs${PV##*_p} -MY_P=${MY_PN}-${MY_PV} -API_PV=${PV%%_*} -DESCRIPTION="A toolkit for managing graphs and graph based data structures" -# There doesn't seem to be a real home page, so we'll point to a viewcvs -HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/" -# this was extracted from a source rpm at jpackage -SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz" -COMMON_DEP=" - dev-java/commons-collections - dev-java/jdepend" -DEPEND=">=virtual/jdk-1.3 - test? ( dev-java/ant-junit ) - ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.3 - ${COMMON_DEP}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -S=${WORKDIR}/${MY_P} - -src_unpack(){ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.diff" - mkdir -p target/lib - cd target/lib - java-pkg_jar-from commons-collections - java-pkg_jar-from jdepend -} - -src_install(){ - java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} - -src_test() { - cd "${S}/target/lib" - java-pkg_jar-from junit - cd "${S}" - ANT_TASKS="ant-junit" eant test -} diff --git a/dev-java/commons-graph/files/commons-graph-0.1-build.xml b/dev-java/commons-graph/files/commons-graph-0.1-build.xml new file mode 100644 index 0000000000..5c3a9c19cd --- /dev/null +++ b/dev-java/commons-graph/files/commons-graph-0.1-build.xml @@ -0,0 +1,258 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 10/6/15 9:24 AM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="commons-graph-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="commons-graph-0.1"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="."/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.build.testResourceDir.1" value="."/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"/> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/junit/junit/4.10/junit-4.10.jar"/> + <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> + <pathelement location="${maven.repo.local}/com/carrotsearch/junit-benchmarks/0.3.0/junit-benchmarks-0.3.0-jdk15.jar"/> + <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/> + <pathelement location="${maven.repo.local}/com/h2database/h2/1.3.158/h2-1.3.158.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + <javac destdir="${maven.build.outputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.srcDir.0}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + <mkdir dir="${maven.build.outputDir}/META-INF"/> + <copy todir="${maven.build.outputDir}/META-INF"> + <fileset dir="${maven.build.resourceDir.0}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + <javac destdir="${maven.build.testOutputDir}" + encoding="iso-8859-1" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.6" + verbose="false" + fork="false" + source="1.6"> + <src> + <pathelement location="${maven.build.testDir.0}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + </classpath> + </javac> + <mkdir dir="${maven.build.testOutputDir}/META-INF"/> + <copy todir="${maven.build.testOutputDir}/META-INF"> + <fileset dir="${maven.build.testResourceDir.1}"> + <include name="NOTICE.txt"/> + <include name="LICENSE.txt"/> + </fileset> + </copy> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${maven.test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/*Abstract*Test.java"/> + <exclude name="**/TestRunner.java"/> + </fileset> + </batchtest> + <batchtest todir="${maven.test.reports}" if="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${maven.build.srcDir.0}" + packagenames="*" + destdir="${maven.reporting.outputDirectory}/apidocs" + access="protected" + old="false" + verbose="false" + encoding="iso-8859-1" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + source="1.6" + linksource="true" + breakiterator="false"> + <link href="http://download.oracle.com/javase/6/docs/api/"/> + <link href="http://download.oracle.com/javaee/6/api/"/> + </javadoc> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + basedir="${maven.build.outputDir}" + excludes="**/package.html"> + <manifest> + <attribute name="Main-Class" value="Main"/> + </manifest> + </jar> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + +</project> diff --git a/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff b/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff deleted file mode 100644 index c7ffe457a1..0000000000 --- a/dev-java/commons-graph/files/commons-graph-0.8.1_p20040118-gentoo.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru graph2-0.8.1.cvs20040118/build.xml graph2-0.8.1.cvs20040118-patched/build.xml ---- graph2-0.8.1.cvs20040118/build.xml 2003-02-18 09:45:49.000000000 -0500 -+++ graph2-0.8.1.cvs20040118-patched/build.xml 2005-09-04 22:44:31.000000000 -0400 -@@ -46,7 +47,7 @@ - </classpath> - </javac> - </target> -- <target name="jar" description="o Create the jar" depends="compile,test"> -+ <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> - </jar> - </target> -@@ -162,4 +163,4 @@ - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> - </unjar> - </target> --</project> -\ No newline at end of file -+</project> diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild deleted file mode 100644 index cefc4203e3..0000000000 --- a/dev-java/commons-jelly/commons-jelly-1.0-r5.ebuild +++ /dev/null @@ -1,66 +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 test" - -inherit java-pkg-2 java-ant-2 eutils - -MY_P="${P}-src" -DESCRIPTION="A Java and XML based scripting and processing engine" -HOMEPAGE="http://commons.apache.org/jelly/" -SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEP=" - dev-java/commons-beanutils:1.7 - dev-java/commons-cli:1 - dev-java/commons-collections:0 - dev-java/commons-discovery:0 - dev-java/commons-jexl:1.0 - dev-java/commons-lang:0 - dev-java/commons-logging:0 - dev-java/dom4j:1 - dev-java/jakarta-jstl:0 - dev-java/jaxen:1.1 - dev-java/junit:0 - java-virtuals/servlet-api:2.5" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 - test? ( dev-java/ant-junit:0 )" - -S=${WORKDIR}/${MY_P} - -java_prepare() { - # disables dependency fetching, and remove tests as a dependency of jar - epatch "${FILESDIR}/${P}-gentoo.patch" -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -EANT_EXTRA_ARGS="-Dlibdir=." -EANT_GENTOO_CLASSPATH=" - commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery - commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,jakarta-jstl - jaxen-1.1,junit,servlet-api-2.5" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${P}.jar ${PN}.jar - - dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild index 0aca10135c..1442a62884 100644 --- a/dev-java/commons-jelly/commons-jelly-1.0-r6.ebuild +++ b/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 +EAPI=5 JAVA_PKG_IUSE="doc source test" -inherit java-pkg-2 java-ant-2 eutils +inherit java-pkg-2 java-ant-2 MY_P="${P}-src" DESCRIPTION="A Java and XML based scripting and processing engine" @@ -18,23 +18,23 @@ SLOT="1" KEYWORDS="~amd64 ~x86" IUSE="" -COMMON_DEP=" - dev-java/commons-beanutils:1.7 +CDEPEND=" + dev-java/dom4j:1 + dev-java/junit:0 + dev-java/jaxen:1.1 dev-java/commons-cli:1 - dev-java/commons-collections:0 - dev-java/commons-discovery:0 - dev-java/commons-jexl:1.0 dev-java/commons-lang:0 + dev-java/commons-jexl:1.0 dev-java/commons-logging:0 - dev-java/dom4j:1 + dev-java/commons-discovery:0 + dev-java/commons-collections:0 + dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:1.2.5 - dev-java/jaxen:1.1 - dev-java/junit:0 - java-virtuals/servlet-api:2.5" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 + java-virtuals/servlet-api:3.0" +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" +DEPEND="${CDEPEND} + >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 )" S=${WORKDIR}/${MY_P} @@ -50,7 +50,7 @@ EANT_EXTRA_ARGS="-Dlibdir=." EANT_GENTOO_CLASSPATH=" commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5 - jaxen-1.1,junit,servlet-api-2.5" + jaxen-1.1,junit,servlet-api-3.0" src_test() { java-pkg-2_src_test @@ -58,9 +58,7 @@ src_test() { src_install() { java-pkg_newjar target/${P}.jar ${PN}.jar - dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api use source && java-pkg_dosrc src/java/* } diff --git a/dev-java/commons-jexl/commons-jexl-1.1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild index 8f01544149..424d1f5125 100644 --- a/dev-java/commons-jexl/commons-jexl-1.1.ebuild +++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 + JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 +inherit java-pkg-2 java-ant-2 DESCRIPTION="Expression language engine, can be embedded in applications and frameworks" HOMEPAGE="http://commons.apache.org/jexl/" SRC_URI="mirror://apache/jakarta/commons/jexl/source/${P}-src.tar.gz" CDEPEND="dev-java/commons-logging - =dev-java/junit-3*" + dev-java/junit:0" -RDEPEND=">=virtual/jre-1.4 +RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 +DEPEND=">=virtual/jdk-1.6 test? ( dev-java/ant-junit ) ${CDEPEND}" @@ -26,12 +28,9 @@ IUSE="" S="${WORKDIR}/${P}-src" -src_unpack() { - unpack ${A} - cd "${S}" - +java_prepare() { # https://issues.apache.org/jira/browse/JEXL-31 - epatch "${FILESDIR}/1.1-test-target.patch" + epatch "${FILESDIR}/${PV}-test-target.patch" mkdir -p target/lib && cd target/lib java-pkg_jar-from junit junit.jar @@ -44,9 +43,7 @@ src_test() { src_install() { java-pkg_newjar target/${P}*.jar - dodoc RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api use source && java-pkg_dosrc "${S}"/src/java/* } diff --git a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild b/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild index b38d155d2a..22b774f20d 100644 --- a/dev-java/commons-jexl/commons-jexl-2.1.1.ebuild +++ b/dev-java/commons-jexl/commons-jexl-2.1.1.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$ @@ -14,23 +14,28 @@ SRC_URI="mirror://apache/commons/jexl/source/${P}-src.tar.gz" CDEPEND="dev-java/commons-logging:0" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.6 >=dev-java/javacc-5 test? ( dev-java/ant-junit:0 ) ${CDEPEND}" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" S="${WORKDIR}/${P}-src" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH="commons-logging" +# Dubious tests. +JAVA_RM_FILES=( + src/test/java/org/apache/commons/jexl2/ArithmeticTest.java +) + java_prepare() { cp "${FILESDIR}"/${PV}-build.xml build.xml || die @@ -43,15 +48,13 @@ java_prepare() { || die "Parser.java code generation via javacc failed" } +src_test() { + java-pkg-2_src_test +} + src_install() { java-pkg_dojar target/${PN}.jar - dodoc RELEASE-NOTES.txt NOTICE.txt - use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs use source && java-pkg_dosrc "${S}"/src/main/java/* } - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/constantine/Manifest b/dev-java/constantine/Manifest index a49d39b2ef..38ecc1857b 100644 --- a/dev-java/constantine/Manifest +++ b/dev-java/constantine/Manifest @@ -1,2 +1 @@ -DIST constantine-0.6.tar.bz2 35684 SHA256 1d4cf61f15d508de1f5f4058a12529cfbe60f4056f167056f24e515695d39733 SHA512 16063f59a868ca6f629dcf9e42957edaebc9c5db21a6d856040420b943a127c89e7b1979e5ba051b26eabfb67fb70abd0ab6d2f5f6109d0fefbffbe716c0c980 WHIRLPOOL 42a4ac393889eab46ba133e86afd19ad90d3921abbe4c2c6871480d1747429f5bde46ec3d0a08ee3e1ffa885e3c4e40cf06b787b47976b56c7fc46124d62dcf2 DIST constantine-0.7.tar.gz 65563 SHA256 5600c264d3f32a48342e4b00643a8a8a543f15c6107a1c1be024e328a74e59b1 SHA512 2694caae29bae1a3e1d765ac02c4014bc6fd3dac8370feb5d12f43119c057fc2a2e75b0aa37eec0164bf8a82a1bafb0f41565f397b956ae53a52f7cb803508c7 WHIRLPOOL 6a7c3ae5b0423690005656c69897d82244d05ea27056c4dbe4229390b648bce23775b699e8d719f347ea602e76313af5e19d47e932637fd919fb2fa2b64142d6 diff --git a/dev-java/constantine/constantine-0.6.ebuild b/dev-java/constantine/constantine-0.6.ebuild deleted file mode 100644 index b22a2a7156..0000000000 --- a/dev-java/constantine/constantine-0.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="source test" -inherit base java-pkg-2 java-ant-2 - -DESCRIPTION="Provides Java values for common platform C constants" -HOMEPAGE="http://kenai.com/projects/constantine" -SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND=">=virtual/jre-1.5" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit4 )" - -src_compile() { - # ecj doesn't like some cast for some reason - java-pkg_force-compiler javac - java-pkg-2_src_compile -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - use source && java-pkg_dosrc src/* -} - -src_test() { - ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" -} diff --git a/dev-java/constantine/constantine-0.7.ebuild b/dev-java/constantine/constantine-0.7-r1.ebuild index 9b5555de66..b1e08eb8b8 100644 --- a/dev-java/constantine/constantine-0.7.ebuild +++ b/dev-java/constantine/constantine-0.7-r1.ebuild @@ -1,22 +1,27 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI=5 + JAVA_PKG_IUSE="source test" -inherit base java-pkg-2 java-ant-2 + +inherit java-pkg-2 java-ant-2 DESCRIPTION="Provides Java values for common platform C constants" HOMEPAGE="https://github.com/wmeissner/jnr-constants" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" -RDEPEND=">=virtual/jre-1.5" +RDEPEND=">=virtual/jre-1.6" -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit4 )" +DEPEND=">=virtual/jdk-1.6 + test? ( + dev-java/ant-junit:0 + )" src_compile() { # ecj doesn't like some cast for some reason @@ -24,11 +29,11 @@ src_compile() { java-pkg-2_src_compile } +src_test() { + ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" +} + src_install() { java-pkg_dojar dist/${PN}.jar use source && java-pkg_dosrc src/* } - -src_test() { - ANT_TASKS="ant-junit4" eant test -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" -} diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest index 4af7701300..618b261384 100644 --- a/dev-java/cssparser/Manifest +++ b/dev-java/cssparser/Manifest @@ -1,2 +1 @@ -DIST cssparser-0.9.16-sources.jar 243889 SHA256 e21b075401a7a17fd3316a392631b77c245f8217d9da90e89fd926436098f151 SHA512 dac0f322d21c6f2ae65128ab83a6de9eb93f5c152e9e6f42de3e18b9be23d73083f42af50eeaa415da400c297fad34381ddd0f626b7aafa89c97a8b46a0d61b4 WHIRLPOOL 0c73080c9bf916eddc694de40da8a8b8ae543cf7863179f33649f3a38c95a7304d6ad98a79d78621225767c430ca1409063209b5012870557027554611648562 DIST cssparser-0.9.17-sources.jar 244187 SHA256 5bb68dd6788951487eedeb1ba198a290899e9fe04eab9598ef051e42218aaa88 SHA512 6506483bb11d0d1a306308d8f458057f410b7e26db2f930e433878dfa97d29a3ece42cb27ce8715d908360e5ff7cacaf9d09323510ba036c7599ec67de970414 WHIRLPOOL 46781cb9d1fd939c11d5e2d816c70d3eef0bb7c2c421c9a45ddce5d2433a7e75d9540848743a62b7494ee2cd162ed10e71a9faacabc5bd897107627b011cea9a diff --git a/dev-java/cssparser/cssparser-0.9.16.ebuild b/dev-java/cssparser/cssparser-0.9.16.ebuild deleted file mode 100644 index 6a4d934f01..0000000000 --- a/dev-java/cssparser/cssparser-0.9.16.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# 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 - -DESCRIPTION="API for parsing CSS 2 in Java" -HOMEPAGE="http://cssparser.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -CDEPEND="dev-java/sac:0" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -JAVA_GENTOO_CLASSPATH="sac" diff --git a/dev-java/cssparser/cssparser-0.9.17.ebuild b/dev-java/cssparser/cssparser-0.9.17.ebuild index cda7022c6d..6a4d934f01 100644 --- a/dev-java/cssparser/cssparser-0.9.17.ebuild +++ b/dev-java/cssparser/cssparser-0.9.17.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://cssparser.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" CDEPEND="dev-java/sac:0" DEPEND=">=virtual/jdk-1.6 diff --git a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild index d6477b931e..679a03610b 100644 --- a/dev-java/ehcache/ehcache-1.2.4-r4.ebuild +++ b/dev-java/ehcache/ehcache-1.2.4-r4.ebuild @@ -27,15 +27,10 @@ DEPEND=">=virtual/jdk-1.6 app-arch/unzip" S="${WORKDIR}/${P}" - -JAVA_PKG_WANT_SOURCE="1.7" -JAVA_PKG_WANT_TARGET="1.7" -JAVA_SRC_DIR="src" - JAVA_GENTOO_CLASSPATH="commons-collections,commons-logging,servlet-api-2.5" java_prepare() { - unzip -d src ${P}-sources.jar || die - rm -rf src/net/sf/ehcache/hibernate || die - rm *.jar || die + unpack ./${P}-sources.jar + rm -vr net/sf/ehcache/hibernate || die + java-pkg_clean } diff --git a/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch new file mode 100644 index 0000000000..16d0a05a77 --- /dev/null +++ b/dev-java/hibernate/files/hibernate-3.1.3-EhCache.java.patch @@ -0,0 +1,22 @@ +--- src/org/hibernate/cache/EhCache.java.orig 2015-10-07 14:06:39.968486000 +0000 ++++ src/org/hibernate/cache/EhCache.java 2015-10-07 14:06:49.900486000 +0000 +@@ -192,9 +192,9 @@ + catch (IllegalStateException e) {
+ throw new CacheException(e);
+ }
+- catch (IOException e) {
+- throw new CacheException(e);
+- }
++ // catch (IOException e) {
++ // throw new CacheException(e);
++ // }
+ }
+
+ /**
+@@ -289,4 +289,4 @@ + return "EHCache(" + getRegionName() + ')';
+ }
+
+-} +\ No newline at end of file ++}
diff --git a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild index a1cb1e1599..151b3535e9 100644 --- a/dev-java/hibernate/hibernate-3.1.3-r4.ebuild +++ b/dev-java/hibernate/hibernate-3.1.3-r5.ebuild @@ -19,14 +19,14 @@ IUSE="" SLOT="3.1" KEYWORDS="amd64 x86" -COMMON_DEPEND=" +CDEPENDEND=" >=dev-java/antlr-2.7.7:0[java] dev-java/c3p0:0 dev-java/cglib:3 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/dom4j:1 - dev-java/ehcache:0 + dev-java/ehcache:1.2 dev-java/oscache:0 dev-java/proxool:0 dev-java/swarmcache:1.0 @@ -35,18 +35,21 @@ COMMON_DEPEND=" dev-java/ant-core:0 dev-java/asm:2.2" RDEPEND=">=virtual/jre-1.6 - ${COMMON_DEPEND}" + ${CDEPENDEND}" DEPEND=">=virtual/jdk-1.6 - ${COMMON_DEPEND}" + ${CDEPENDEND}" S="${WORKDIR}/${PN}-${MY_PV}" -# Avoid this to happen. -# [javac] /var/tmp/portage/dev-java/hibernate-3.1.3-r4/work/hibernate-3.1/src/org/hibernate/dialect/MimerSQLDialect.java:13: error: unmappable character for encoding UTF8 -# [javac] * @author Fredrik �lund <fredrik.alund@mimer.se> JAVA_ANT_ENCODING="ISO-8859-1" +PATCHES=( + "${FILESDIR}"/"${P}-EhCache.java.patch" +) + java_prepare() { + epatch "${PATCHES[@]}" + java-ant_rewrite-bootclasspath 1.5 # this depends on jboss @@ -60,7 +63,7 @@ java_prepare() { JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH=" c3p0,commons-collections,commons-logging,cglib-3,transaction-api -dom4j-1,ehcache,oscache,proxool,swarmcache-1.0 +dom4j-1,ehcache-1.2,oscache,proxool,swarmcache-1.0 sun-jacc-api,antlr,ant-core,asm-2.2 " EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist" diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch new file mode 100644 index 0000000000..4157bb6bac --- /dev/null +++ b/dev-java/icedtea/files/TryXShmAttach.patch @@ -0,0 +1,201 @@ + +# HG changeset patch +# User andrew +# Date 1438275152 -3600 +# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3 +# Parent ab23850139cb2c666e613010842a1f984b184a3a +PR2568: openjdk causes a full desktop crash on RHEL 6 i586 +Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba + +diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100 +@@ -699,9 +699,4 @@ + public static final long XkbModifierMapMask = (1L<<2); + public static final long XkbVirtualModsMask = (1L<<6); //server map + +- /***************************************************************** +- * X SHARED MEMORY EXTENSION FUNCTIONS +- *****************************************************************/ +- +- public static final int X_ShmAttach = 1; + } +diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100 +@@ -41,29 +41,6 @@ + return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err); + } + } +- +- /** +- * This is a base synthetic error handler containing a boolean flag which allows +- * to show that an error is handled or not. +- */ +- public static class XErrorHandlerWithFlag extends XBaseErrorHandler { +- private volatile boolean errorOccurred = false; +- +- public boolean getErrorOccurredFlag() { +- return errorOccurred; +- } +- +- /** +- * Sets an internal boolean flag to a particular value. Should be always called +- * with {@code false} value of the parameter {@code errorOccurred} before this +- * error handler is set as current. +- * @param errorOccurred {@code true} to indicate that an error was handled, +- * {@code false} to reset the internal boolean flag +- */ +- public void setErrorOccurredFlag(boolean errorOccurred) { +- this.errorOccurred = errorOccurred; +- } +- } + + /* + * Instead of validating window id, we simply call XGetWindowProperty, +@@ -99,75 +76,4 @@ + return theInstance; + } + } +- +- /** +- * This is a synthetic error handler for errors generated by the native function +- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the +- * handler is set to {@code true}. +- */ +- public static final class XShmAttachHandler extends XErrorHandlerWithFlag { +- private XShmAttachHandler() {} +- +- @Override +- public int handleError(long display, XErrorEvent err) { +- if (err.get_minor_code() == XConstants.X_ShmAttach) { +- setErrorOccurredFlag(true); +- return 0; +- } +- return super.handleError(display, err); +- } +- +- // Shared instance +- private static XShmAttachHandler theInstance = new XShmAttachHandler(); +- public static XShmAttachHandler getInstance() { +- return theInstance; +- } +- } +- +- /** +- * This is a synthetic error handler for {@code BadAlloc} errors generated by the +- * native {@code glX*} functions. Its internal boolean flag is set to {@code true}, +- * if an error is handled. +- */ +- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag { +- private GLXBadAllocHandler() {} +- +- @Override +- public int handleError(long display, XErrorEvent err) { +- if (err.get_error_code() == XConstants.BadAlloc) { +- setErrorOccurredFlag(true); +- return 0; +- } +- return super.handleError(display, err); +- } +- +- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler(); +- public static GLXBadAllocHandler getInstance() { +- return theInstance; +- } +- } +- +- /** +- * This is a synthetic error handler for errors generated by the native function +- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean +- * flag of the handler is set to {@code true}. +- */ +- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag { +- private XChangeWindowAttributesHandler() {} +- +- @Override +- public int handleError(long display, XErrorEvent err) { +- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) && +- (err.get_error_code() == XConstants.BadAccess)) { +- setErrorOccurredFlag(true); +- return 0; +- } +- return super.handleError(display, err); +- } +- +- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler(); +- public static XChangeWindowAttributesHandler getInstance() { +- return theInstance; +- } +- } + } +diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h +--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100 +@@ -54,7 +54,7 @@ + + void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps); + void resetXShmAttachFailed(); +-jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo); ++jboolean isXShmAttachFailed(); + + #endif /* MITSHM */ + +diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c +--- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100 +@@ -644,19 +644,12 @@ + return dim; + } + +-Boolean isMapped(JNIEnv* env, Window w) { ++Boolean isMapped(Window w) { + XWindowAttributes attr; + Status status = 0; +- jboolean errorOccurredFlag; +- jobject errorHandlerRef; +- jobject savedError; +- unsigned char xerror_code; +- +- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler", +- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE, +- errorHandlerRef, errorOccurredFlag, +- status = XGetWindowAttributes(awt_display, w, &attr)); +- xerror_code = GET_XERROR_CODE(env, savedError); ++ WITH_XERROR_HANDLER(xerror_ignore_bad_window); ++ status = XGetWindowAttributes(awt_display, w, &attr); ++ RESTORE_XERROR_HANDLER; + if (status == 0 || xerror_code != Success) { + return False; + } +@@ -692,7 +685,7 @@ + sdata->version = *data; + flags = *(data+1); + new_mapped = (flags & XEMBED_MAPPED) != 0; +- currently_mapped = isMapped(env, sdata->handle); ++ currently_mapped = isMapped(sdata->handle); + if (new_mapped != currently_mapped) { + if (new_mapped) { + XMapWindow(awt_display, sdata->handle); +diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c +--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200 ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100 +@@ -551,8 +551,6 @@ + { + XImage *img = NULL; + XShmSegmentInfo *shminfo; +- JNIEnv* env; +- jboolean xShmAttachResult; + + shminfo = malloc(sizeof(XShmSegmentInfo)); + if (shminfo == NULL) { +@@ -603,7 +601,7 @@ + */ + shmctl(shminfo->shmid, IPC_RMID, 0); + +- if (xShmAttachResult == JNI_FALSE) { ++ if (isXShmAttachFailed() == JNI_TRUE) { + J2dRlsTraceLn1(J2D_TRACE_ERROR, + "X11SD_SetupSharedSegment XShmAttach has failed: %s", + strerror(errno)); + diff --git a/dev-java/icedtea/icedtea-7.2.6.1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild index 2027cea989..9645c540ad 100644 --- a/dev-java/icedtea/icedtea-7.2.6.1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild @@ -284,6 +284,10 @@ src_configure() { unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + # https://bugs.gentoo.org/show_bug.cgi?id=561500 + ln -s "${FILESDIR}/TryXShmAttach.patch" || die + export DISTRIBUTION_PATCHES="TryXShmAttach.patch" + econf ${config} \ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \ diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest index a1dfa6bc1e..966c75c5a0 100644 --- a/dev-java/invokebinder/Manifest +++ b/dev-java/invokebinder/Manifest @@ -1 +1,2 @@ DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859 +DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de diff --git a/dev-java/invokebinder/files/invokebinder-1.6-build.xml b/dev-java/invokebinder/files/invokebinder-1.6-build.xml new file mode 100644 index 0000000000..55c846cf04 --- /dev/null +++ b/dev-java/invokebinder/files/invokebinder-1.6-build.xml @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 10/12/15 9:24 PM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="invokebinder-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="invokebinder-1.6"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="src/main/resources"/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"/> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/> + <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + <javac destdir="${maven.build.outputDir}" + encoding="UTF-8" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.7" + verbose="false" + fork="false" + source="1.7"> + <src> + <pathelement location="${maven.build.srcDir.0}"/> + </src> + <classpath refid="build.classpath"/> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + <javac destdir="${maven.build.testOutputDir}" + encoding="UTF-8" + nowarn="false" + debug="true" + optimize="false" + deprecation="true" + target="1.7" + verbose="false" + fork="false" + source="1.7"> + <src> + <pathelement location="${maven.build.testDir.0}"/> + </src> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + </classpath> + </javac> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"> + <mkdir dir="${maven.test.reports}"/> + <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> + <sysproperty key="basedir" value="."/> + <formatter type="xml"/> + <formatter type="plain" usefile="false"/> + <classpath> + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/Test*.java"/> + <include name="**/*Test.java"/> + <include name="**/*TestCase.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + <batchtest todir="${maven.test.reports}" if="test"> + <fileset dir="${maven.build.testDir.0}"> + <include name="**/${test}.java"/> + <exclude name="**/*Abstract*Test.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> + <javadoc sourcepath="${maven.build.srcDir.0}" + packagenames="*" + destdir="${maven.reporting.outputDirectory}/apidocs" + access="protected" + old="false" + verbose="false" + version="true" + use="true" + author="true" + splitindex="false" + nodeprecated="false" + nodeprecatedlist="false" + notree="false" + noindex="false" + nohelp="false" + nonavbar="false" + serialwarn="false" + charset="ISO-8859-1" + linksource="false" + breakiterator="false"/> + </target> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + basedir="${maven.build.outputDir}" + excludes="**/package.html"/> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + +</project> diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild new file mode 100644 index 0000000000..dbc0c03120 --- /dev/null +++ b/dev-java/invokebinder/invokebinder-1.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 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 + +DESCRIPTION="Provide a friendly DSL for binding method handles" +HOMEPAGE="https://github.com/headius/invokebinder" +SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="Apache-2.0" + +S="${WORKDIR}/${PN}-${P}" + +DEPEND=">=virtual/jdk-1.7 + test? ( + dev-java/ant-junit:0 + )" +RDEPEND=">=virtual/jre-1.7" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +EANT_TEST_TARGET="test" + +java_prepare() { + cp "${FILESDIR}"/${P}-build.xml build.xml || die +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar "target/${P}.jar" "${PN}.jar" + use source && java-pkg_dosrc src/main/java/com + if use doc; then + java-pkg_dojavadoc target/site/apidocs + dodoc README.markdown + fi +} diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild new file mode 100644 index 0000000000..46145fc469 --- /dev/null +++ b/dev-java/jama/jama-1.0.3-r1.ebuild @@ -0,0 +1,25 @@ +# 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="Jama" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="A Java Matrix Package" +HOMEPAGE="http://math.nist.gov/javanumerics/jama/" +SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}" diff --git a/dev-java/jama/jama-1.0.3.ebuild b/dev-java/jama/jama-1.0.3.ebuild deleted file mode 100644 index c043f057cd..0000000000 --- a/dev-java/jama/jama-1.0.3.ebuild +++ /dev/null @@ -1,42 +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" - -inherit base java-pkg-2 - -MY_PN="Jama" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A Java Matrix Package" -HOMEPAGE="http://math.nist.gov/javanumerics/jama/" -SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}" - -src_compile() { - mkdir -p build || die - - ejavac -d build $(find Jama -name '*.java') - - $(java-config -j) cf ${MY_PN}.jar -C build ${MY_PN} || die -} - -src_install() { - java-pkg_dojar ${MY_PN}.jar - - dodoc Jama/ChangeLog - - use doc && java-pkg_dojavadoc Jama/doc - use source && java-pkg_dosrc Jama -} diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild index 9ab787026b..e4dbc11ad3 100644 --- a/dev-java/javacsv/javacsv-2.1.ebuild +++ b/dev-java/javacsv/javacsv-2.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="http://www.csvreader.com/java_csv.php" SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=">=virtual/jdk-1.6" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/jcodings/jcodings-1.0.11.ebuild b/dev-java/jcodings/jcodings-1.0.11.ebuild index eac57c8a51..d73a6457bb 100644 --- a/dev-java/jcodings/jcodings-1.0.11.ebuild +++ b/dev-java/jcodings/jcodings-1.0.11.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz" LICENSE="MIT" SLOT="1" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" RDEPEND=">=virtual/jre-1.5" DEPEND=">=virtual/jdk-1.5 diff --git a/dev-java/joni/Manifest b/dev-java/joni/Manifest index d8d7066c42..c4a48f7b16 100644 --- a/dev-java/joni/Manifest +++ b/dev-java/joni/Manifest @@ -1,2 +1 @@ -DIST joni-1.1.4.tar.gz 120701 SHA256 644f24378cffa2efe9d59c3a28616c80319693a42eeb0234550f9e1f2e8ba11e SHA512 68ac4559e3b6ac2506126af7c8159a87a7906fe45e71828478051f1a84a10b9b62c966168b260d1e0b0395cbd1792a428b2e1ac458db32b57b7a84c81f9e7804 WHIRLPOOL fce0621bf6302423c31036cb084f92455578321b940ad6b9a91f078fdadd9a94a4e0f52aeb42a9beb7fb6be3b789a54f99becf094c3a7462d3b9246edbb4967f DIST joni-2.1.0.tar.gz 125084 SHA256 9c8cb9abd7d8d086b777ade94a7ac68aaf7b9343720f81796d8c1a6c49e4cc39 SHA512 dd40b3a857deb02848d4a87de010ec6b9c96fb962643ea1022833a1bb5ebd76ffac403ff2a54497df288998939ed81910c22c02a2df1f7290112bb2ea506db0e WHIRLPOOL 4f5befc5b9813fb54cf813184fd152bbe3af98c73fda0d9c89dfbc42aa7b2f621b20738c23bad0682954ff8c7566a4053173857f06dac36036d6178c8ae9b89d diff --git a/dev-java/joni/joni-1.1.4.ebuild b/dev-java/joni/joni-1.1.4.ebuild deleted file mode 100644 index f0d4526383..0000000000 --- a/dev-java/joni/joni-1.1.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" -JAVA_PKG_IUSE="source" -inherit base java-pkg-2 java-ant-2 - -DESCRIPTION="Java port of the Oniguruma regular expression engine" -HOMEPAGE="http://jruby.codehaus.org/" -SRC_URI="https://github.com/jruby/joni/tarball/${PV} -> ${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -CDEPEND="dev-java/asm:3 - dev-java/jcodings:0" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.5" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.5" - -src_unpack() { - unpack ${A} - mv j* "${S}" -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_BUILD_TARGET="build" -EANT_GENTOO_CLASSPATH="asm-3 jcodings" - -src_install() { - java-pkg_dojar target/${PN}.jar - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/joni/joni-2.1.0.ebuild b/dev-java/joni/joni-2.1.0.ebuild index cfc2b47b83..b9bf769007 100644 --- a/dev-java/joni/joni-2.1.0.ebuild +++ b/dev-java/joni/joni-2.1.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$ @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jruby/${PN}/archive/${P}.tar.gz" LICENSE="MIT" SLOT="2.1" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" CDEPEND="dev-java/asm:3 dev-java/jcodings:1" diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild index 2257f1c64e..6ea32d685e 100644 --- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild +++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RDEPEND=">=virtual/jre-1.6" diff --git a/dev-java/portletapi/portletapi-2.0.ebuild b/dev-java/portletapi/portletapi-2.0.ebuild index e5546ac9ee..31306de50b 100644 --- a/dev-java/portletapi/portletapi-2.0.ebuild +++ b/dev-java/portletapi/portletapi-2.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://mirrors.ibiblio.org/maven2/javax/portlet/${MY_PN}/${PV}/${MY_P}- LICENSE="Apache-2.0" SLOT="2.0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild new file mode 100644 index 0000000000..4074eeed92 --- /dev/null +++ b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22-r1.ebuild @@ -0,0 +1,31 @@ +# 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="TGGraphLayout" + +DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization" +HOMEPAGE="http://touchgraph.sourceforge.net" +SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip" +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="amd64 ppc ~ppc64 x86" +IUSE="" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_PN}" + +JAVA_SRC_DIR="com" + +src_install() { + java-pkg-simple_src_install + dodoc "TGGL ReleaseNotes.txt" +} diff --git a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild b/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild deleted file mode 100644 index eda9479ab3..0000000000 --- a/dev-java/touchgraph-graphlayout/touchgraph-graphlayout-1.22.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -MY_PN="TGGraphLayout" -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 - -DESCRIPTION="TouchGraph provides a set of interfaces for graph visualization" -HOMEPAGE="http://touchgraph.sourceforge.net" -SRC_URI="mirror://sourceforge/touchgraph/TGGL_${PV//./}_jre11.zip" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.4" -RDEPEND=">=virtual/jre-1.4" - -S="${WORKDIR}/${MY_PN}" - -src_compile() { - mkdir -p bin || die - ejavac -d bin `find com -name "*.java" || die` - `java-config -j` cvf ${MY_PN}.jar -C bin . || die -} - -src_install() { - java-pkg_newjar ${MY_PN}.jar - dodoc "TGGL ReleaseNotes.txt" || die - use source && java-pkg_dosrc com -} diff --git a/dev-java/vldocking/Manifest b/dev-java/vldocking/Manifest new file mode 100644 index 0000000000..74129905a6 --- /dev/null +++ b/dev-java/vldocking/Manifest @@ -0,0 +1 @@ +DIST vldocking-3.0.5.zip 1734159 SHA256 a2c25fbe8ca1c2a8f3731e224096625d865eedae1843426624946851c58066f6 SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8 WHIRLPOOL 51f1fe5b9365d17e0f3349d1ad8872216dcfd3c643b12303b3b9b19d7a832a4fa643ab3a4071c40857a0a87f2ee563b4d68f2cfaff209d88981b452bd0ea81df diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml new file mode 100644 index 0000000000..ee58970de9 --- /dev/null +++ b/dev-java/vldocking/metadata.xml @@ -0,0 +1,12 @@ +<?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">cmadsen/vldocking</remote-id> + </upstream> + <maintainer> + <email>monsieurp@gentoo.org</email> + <name>Patrice Clement</name> + </maintainer> +</pkgmetadata> diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild new file mode 100644 index 0000000000..46f99c8fbf --- /dev/null +++ b/dev-java/vldocking/vldocking-3.0.5.ebuild @@ -0,0 +1,38 @@ +# 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="Docking solution for Java Swing" +HOMEPAGE="https://github.com/cmadsen/vldocking" +SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/slf4j-log4j12:0 + dev-java/slf4j-api:0 +" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND} +" +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND} +" + +JAVA_GENTOO_CLASSPATH=" + slf4j-log4j12 + slf4j-api +" + +java_prepare() { + java-pkg_clean +} |