From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- dev-java/Manifest.gz | Bin 94852 -> 94861 bytes dev-java/ant-core/Manifest | 4 +- dev-java/ant-core/ant-core-1.10.5-r1.ebuild | 117 ---------------------------- dev-java/ant-core/ant-core-1.10.5-r2.ebuild | 117 ++++++++++++++++++++++++++++ dev-java/ant-core/ant-core-1.9.13-r1.ebuild | 117 ---------------------------- dev-java/ant-core/ant-core-1.9.13-r2.ebuild | 117 ++++++++++++++++++++++++++++ 6 files changed, 236 insertions(+), 236 deletions(-) delete mode 100644 dev-java/ant-core/ant-core-1.10.5-r1.ebuild create mode 100644 dev-java/ant-core/ant-core-1.10.5-r2.ebuild delete mode 100644 dev-java/ant-core/ant-core-1.9.13-r1.ebuild create mode 100644 dev-java/ant-core/ant-core-1.9.13-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 7061b9671845..80aa02d1c272 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index ee5b34a16df8..fbef9b90dd60 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -2,6 +2,6 @@ DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810 -EBUILD ant-core-1.10.5-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482 -EBUILD ant-core-1.9.13-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482 +EBUILD ant-core-1.10.5-r2.ebuild 3173 BLAKE2B b558cf3ba6f8ce8c8001d94fa3c46f35d2341edbb32f8eb5f4a59f5dc0c7c313571fda02a96e3dfa89881798dd43bd3fbd736bb9da34bda257a7275657c72c93 SHA512 bb62b796f2282de6e326140690df1e1318269ca8b03ccc0dac2f501ad4782d40c233ad047acde082d1a28544bbf9eda911c0f285c47d327d8d274115d5b099ab +EBUILD ant-core-1.9.13-r2.ebuild 3173 BLAKE2B b558cf3ba6f8ce8c8001d94fa3c46f35d2341edbb32f8eb5f4a59f5dc0c7c313571fda02a96e3dfa89881798dd43bd3fbd736bb9da34bda257a7275657c72c93 SHA512 bb62b796f2282de6e326140690df1e1318269ca8b03ccc0dac2f501ad4782d40c233ad047acde082d1a28544bbf9eda911c0f285c47d327d8d274115d5b099ab MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 diff --git a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild b/dev-java/ant-core/ant-core-1.10.5-r1.ebuild deleted file mode 100644 index a5340c00be7d..000000000000 --- a/dev-java/ant-core/ant-core-1.10.5-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Don't depend on itself. -JAVA_ANT_DISABLE_ANT_CORE_DEP="true" - -# Rewriting build.xml files for the testcases has no use at the moment. -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver - -MY_P="apache-ant-${PV}" - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" -SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND=">=virtual/jdk-1.8:* - !dev-java/ant-tasks - !dev-java/ant-optional" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -src_prepare() { - epatch "${WORKDIR}/${PV}-build.patch" - epatch "${WORKDIR}/${PV}-launch.patch" - - eprefixify "${S}/src/script/ant" - - # Fixes bug 556008. - java-ant_xml-rewrite -f build.xml \ - -c -e javadoc \ - -a failonerror \ - -v "false" - - # See bug #196080 for more details. - java-ant_bsfix_one build.xml - java-pkg-2_src_prepare -} - -src_compile() { - export ANT_HOME="" - # Avoid error message that package ant-core was not found - export ANT_TASKS="none" - - local bsyscp - - # This ensures that when building ant with bootstrapped ant, - # only the source is used for resolving references, and not - # the classes in bootstrapped ant but jikes in kaffe has issues with this... - if ! java-pkg_current-vm-matches kaffe; then - bsyscp="-Dbuild.sysclasspath=ignore" - fi - - CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \ - $(use_doc javadocs) || die "build failed" -} - -src_install() { - dodir /usr/share/ant/lib - - for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do - java-pkg_dojar build/lib/${jar} - dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} - done - - dobin src/script/ant - - dodir /usr/share/${PN}/bin - for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do - dobin "${S}/src/script/${each}" - dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} - done - dosym ../${PN}/bin /usr/share/ant/bin - - insinto /usr/share/${PN} - doins -r dist/etc - dosym ../${PN}/etc /usr/share/ant/etc - - echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" - doenvd "${T}/20ant" - - dodoc NOTICE README WHATSNEW KEYS - - if use doc; then - dohtml -r manual/* - java-pkg_dojavadoc --symlink manual/api build/javadocs - fi - - use source && java-pkg_dosrc src/main/* -} - -pkg_postinst() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then - elog "The way of packaging ant in Gentoo has changed significantly since" - elog "the 1.7.0 version, For more information, please see:" - elog "https://www.gentoo.org/proj/en/java/ant-guide.xml" - fi - - if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then - elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" - elog "flags have been moved to dev-java/ant." - fi - fi -} diff --git a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild new file mode 100644 index 000000000000..d5c615d4701a --- /dev/null +++ b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Don't depend on itself. +JAVA_ANT_DISABLE_ANT_CORE_DEP="true" + +# Rewriting build.xml files for the testcases has no use at the moment. +JAVA_PKG_BSFIX_ALL="no" +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver + +MY_P="apache-ant-${PV}" + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" +HOMEPAGE="https://ant.apache.org/" +SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 + https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.8:* + !dev-java/ant-tasks + !dev-java/ant-optional" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +RESTRICT="test" + +src_prepare() { + epatch "${WORKDIR}/${PV}-build.patch" + epatch "${WORKDIR}/${PV}-launch.patch" + + eprefixify "${S}/src/script/ant" + + # Fixes bug 556008. + java-ant_xml-rewrite -f build.xml \ + -c -e javadoc \ + -a failonerror \ + -v "false" + + # See bug #196080 for more details. + java-ant_bsfix_one build.xml + java-pkg-2_src_prepare +} + +src_compile() { + export ANT_HOME="" + # Avoid error message that package ant-core was not found + export ANT_TASKS="none" + + local bsyscp + + # This ensures that when building ant with bootstrapped ant, + # only the source is used for resolving references, and not + # the classes in bootstrapped ant but jikes in kaffe has issues with this... + if ! java-pkg_current-vm-matches kaffe; then + bsyscp="-Dbuild.sysclasspath=ignore" + fi + + CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \ + $(use_doc javadocs) || die "build failed" +} + +src_install() { + dodir /usr/share/ant/lib + + for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do + java-pkg_dojar build/lib/${jar} + dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} + done + + dobin src/script/ant + + dodir /usr/share/${PN}/bin + for each in antRun antRun.pl runant.pl runant.py ; do + dobin "${S}/src/script/${each}" + dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} + done + dosym ../${PN}/bin /usr/share/ant/bin + + insinto /usr/share/${PN} + doins -r dist/etc + dosym ../${PN}/etc /usr/share/ant/etc + + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" + doenvd "${T}/20ant" + + dodoc NOTICE README WHATSNEW KEYS + + if use doc; then + dohtml -r manual/* + java-pkg_dojavadoc --symlink manual/api build/javadocs + fi + + use source && java-pkg_dosrc src/main/* +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then + elog "The way of packaging ant in Gentoo has changed significantly since" + elog "the 1.7.0 version, For more information, please see:" + elog "https://www.gentoo.org/proj/en/java/ant-guide.xml" + fi + + if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then + elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" + elog "flags have been moved to dev-java/ant." + fi + fi +} diff --git a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild b/dev-java/ant-core/ant-core-1.9.13-r1.ebuild deleted file mode 100644 index a5340c00be7d..000000000000 --- a/dev-java/ant-core/ant-core-1.9.13-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Don't depend on itself. -JAVA_ANT_DISABLE_ANT_CORE_DEP="true" - -# Rewriting build.xml files for the testcases has no use at the moment. -JAVA_PKG_BSFIX_ALL="no" -JAVA_PKG_IUSE="doc source" - -inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver - -MY_P="apache-ant-${PV}" - -DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" -HOMEPAGE="https://ant.apache.org/" -SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND=">=virtual/jdk-1.8:* - !dev-java/ant-tasks - !dev-java/ant-optional" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -src_prepare() { - epatch "${WORKDIR}/${PV}-build.patch" - epatch "${WORKDIR}/${PV}-launch.patch" - - eprefixify "${S}/src/script/ant" - - # Fixes bug 556008. - java-ant_xml-rewrite -f build.xml \ - -c -e javadoc \ - -a failonerror \ - -v "false" - - # See bug #196080 for more details. - java-ant_bsfix_one build.xml - java-pkg-2_src_prepare -} - -src_compile() { - export ANT_HOME="" - # Avoid error message that package ant-core was not found - export ANT_TASKS="none" - - local bsyscp - - # This ensures that when building ant with bootstrapped ant, - # only the source is used for resolving references, and not - # the classes in bootstrapped ant but jikes in kaffe has issues with this... - if ! java-pkg_current-vm-matches kaffe; then - bsyscp="-Dbuild.sysclasspath=ignore" - fi - - CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \ - $(use_doc javadocs) || die "build failed" -} - -src_install() { - dodir /usr/share/ant/lib - - for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do - java-pkg_dojar build/lib/${jar} - dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} - done - - dobin src/script/ant - - dodir /usr/share/${PN}/bin - for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do - dobin "${S}/src/script/${each}" - dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} - done - dosym ../${PN}/bin /usr/share/ant/bin - - insinto /usr/share/${PN} - doins -r dist/etc - dosym ../${PN}/etc /usr/share/ant/etc - - echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" - doenvd "${T}/20ant" - - dodoc NOTICE README WHATSNEW KEYS - - if use doc; then - dohtml -r manual/* - java-pkg_dojavadoc --symlink manual/api build/javadocs - fi - - use source && java-pkg_dosrc src/main/* -} - -pkg_postinst() { - if [[ -n ${REPLACING_VERSIONS} ]]; then - if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then - elog "The way of packaging ant in Gentoo has changed significantly since" - elog "the 1.7.0 version, For more information, please see:" - elog "https://www.gentoo.org/proj/en/java/ant-guide.xml" - fi - - if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then - elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" - elog "flags have been moved to dev-java/ant." - fi - fi -} diff --git a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild new file mode 100644 index 000000000000..d5c615d4701a --- /dev/null +++ b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Don't depend on itself. +JAVA_ANT_DISABLE_ANT_CORE_DEP="true" + +# Rewriting build.xml files for the testcases has no use at the moment. +JAVA_PKG_BSFIX_ALL="no" +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver + +MY_P="apache-ant-${PV}" + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files" +HOMEPAGE="https://ant.apache.org/" +SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2 + https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.8:* + !dev-java/ant-tasks + !dev-java/ant-optional" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +RESTRICT="test" + +src_prepare() { + epatch "${WORKDIR}/${PV}-build.patch" + epatch "${WORKDIR}/${PV}-launch.patch" + + eprefixify "${S}/src/script/ant" + + # Fixes bug 556008. + java-ant_xml-rewrite -f build.xml \ + -c -e javadoc \ + -a failonerror \ + -v "false" + + # See bug #196080 for more details. + java-ant_bsfix_one build.xml + java-pkg-2_src_prepare +} + +src_compile() { + export ANT_HOME="" + # Avoid error message that package ant-core was not found + export ANT_TASKS="none" + + local bsyscp + + # This ensures that when building ant with bootstrapped ant, + # only the source is used for resolving references, and not + # the classes in bootstrapped ant but jikes in kaffe has issues with this... + if ! java-pkg_current-vm-matches kaffe; then + bsyscp="-Dbuild.sysclasspath=ignore" + fi + + CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \ + $(use_doc javadocs) || die "build failed" +} + +src_install() { + dodir /usr/share/ant/lib + + for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do + java-pkg_dojar build/lib/${jar} + dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar} + done + + dobin src/script/ant + + dodir /usr/share/${PN}/bin + for each in antRun antRun.pl runant.pl runant.py ; do + dobin "${S}/src/script/${each}" + dosym ../../../bin/${each} /usr/share/${PN}/bin/${each} + done + dosym ../${PN}/bin /usr/share/ant/bin + + insinto /usr/share/${PN} + doins -r dist/etc + dosym ../${PN}/etc /usr/share/ant/etc + + echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant" + doenvd "${T}/20ant" + + dodoc NOTICE README WHATSNEW KEYS + + if use doc; then + dohtml -r manual/* + java-pkg_dojavadoc --symlink manual/api build/javadocs + fi + + use source && java-pkg_dosrc src/main/* +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + if _ver_compare ${REPLACING_VERSIONS} 1.7.0 -eq 1; then + elog "The way of packaging ant in Gentoo has changed significantly since" + elog "the 1.7.0 version, For more information, please see:" + elog "https://www.gentoo.org/proj/en/java/ant-guide.xml" + fi + + if _ver_compare ${REPLACING_VERSIONS} 1.7.1 -eq 1; then + elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE" + elog "flags have been moved to dev-java/ant." + fi + fi +} -- cgit v1.2.3