diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-05-21 21:44:12 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-05-21 21:44:12 +0000 |
commit | 5666ae1cc3a6c7245688bda1e32d6d6ee5ab5d76 (patch) | |
tree | 5c6220bd7f2dacf7b5358240feee7b5afc7bf6da | |
parent | 2019-05-21 21:04:56 UTC (diff) | |
parent | dev-java/maven-bin: clean up old. (diff) | |
download | gentoo-5666ae1cc3a6c7245688bda1e32d6d6ee5ab5d76.tar.gz gentoo-5666ae1cc3a6c7245688bda1e32d6d6ee5ab5d76.tar.bz2 gentoo-5666ae1cc3a6c7245688bda1e32d6d6ee5ab5d76.zip |
Merge updates from master
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild (renamed from dev-java/maven-bin/maven-bin-3.0.5.ebuild) | 15 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.1.1.ebuild | 86 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild (renamed from dev-java/maven-bin/maven-bin-3.3.9.ebuild) | 63 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.2.5.ebuild | 87 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.0-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.0.ebuild | 109 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild | 59 | ||||
-rw-r--r-- | dev-java/maven-bin/maven-bin-3.6.1.ebuild | 109 |
10 files changed, 252 insertions, 453 deletions
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild index c8fd2a500821..c17509652106 100644 --- a/dev-java/maven-bin/maven-bin-3.0.5.ebuild +++ b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild @@ -17,22 +17,27 @@ LICENSE="Apache-2.0" SLOT="3.0" KEYWORDS="amd64 x86" -DEPEND="app-eselect/eselect-java" +DEPEND=" + >=virtual/jdk-1.8 + app-eselect/eselect-java" + RDEPEND=" - ${DEPEND} - >=virtual/jdk-1.5" + >=virtual/jre-1.8" S="${WORKDIR}/${MY_P}" MAVEN=${PN}-${SLOT} MAVEN_SHARE="/usr/share/${MAVEN}" -java_prepare() { +src_prepare() { + default rm -v "${S}"/bin/*.bat || die chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die } -# TODO we should use jars from packages, instead of what is bundled +# TODO: +# we should use jars from packages instead of what is bundled. + src_install() { dodir "${MAVEN_SHARE}" cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" diff --git a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild new file mode 100644 index 000000000000..22a30f299033 --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_PV=${PV/_alpha/-alpha-} +MY_P="${MY_PN}-${MY_PV}" +MY_MV="${PV%%.*}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="https://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.1" +KEYWORDS="amd64 x86" + +DEPEND=" + >=virtual/jdk-1.8 + app-eselect/eselect-java" + +RDEPEND=" + >=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}" + +MAVEN=${PN}-${SLOT} +MAVEN_SHARE="/usr/share/${MAVEN}" + +# TODO: +# We should use jars from packages, instead of what is bundled. +src_install() { + dodir "${MAVEN_SHARE}" + + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # See bug #342901. + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild deleted file mode 100644 index b75f0e64b4d2..000000000000 --- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit java-pkg-2 - -MY_PN=apache-${PN%%-bin} -MY_PV=${PV/_alpha/-alpha-} -MY_P="${MY_PN}-${MY_PV}" -MY_MV="${PV%%.*}" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="https://maven.apache.org/" - -LICENSE="Apache-2.0" -SLOT="3.1" -KEYWORDS="amd64 x86" - -# TODO: Needs further resolution: -# -# - https://bugs.gentoo.org/show_bug.cgi?id=472850 -# - https://bugs.gentoo.org/show_bug.cgi?id=477436 -# -DEPEND="app-eselect/eselect-java - || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) - dev-java/aopalliance:1 - dev-java/avalon-framework:4.1 - dev-java/commons-cli:1 - dev-java/commons-io:1 - dev-java/javax-inject:0 - dev-java/jsoup:0 - dev-java/jsr250:0 - dev-java/juel:0 - dev-java/osgi-core-api:0 - java-virtuals/interceptor-api:0 - java-virtuals/servlet-api:2.4" - -RDEPEND=">=virtual/jdk-1.5 - ${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -MAVEN=${PN}-${SLOT} -MAVEN_SHARE="/usr/share/${MAVEN}" - -java_prepare() { - rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die - - chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die - - # Symlink jars. - cd lib || die - java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4 - has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging - has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0 - has_version dev-java/log4j:0 && java-pkg_jar-from log4j -} - -# TODO: We should use jars from packages, instead of what is bundled. -src_install() { - dodir "${MAVEN_SHARE}" - - cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE README.txt - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} - - # See bug #342901. - echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die - doenvd "${T}/25${MAVEN}" -} - -pkg_postinst() { - eselect maven update mvn-${SLOT} -} - -pkg_postrm() { - eselect maven update -} diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild index 45c967a5d4e7..1c7cfabd20fb 100644 --- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild +++ b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 inherit java-pkg-2 @@ -15,72 +15,21 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" HOMEPAGE="https://maven.apache.org/" LICENSE="Apache-2.0" -SLOT="3.3" +SLOT="3.2" KEYWORDS="amd64 x86" -# TODO: Needs further resolution: -# -# - https://bugs.gentoo.org/show_bug.cgi?id=472850 -# - https://bugs.gentoo.org/show_bug.cgi?id=477436 -# -CDEPEND=" - dev-java/juel:0 - dev-java/log4j:0 - dev-java/jsoup:0 - dev-java/jsr250:0 - dev-java/commons-io:1 - dev-java/aopalliance:1 - dev-java/commons-cli:1 - dev-java/javax-inject:0 - dev-java/osgi-core-api:0 - dev-java/commons-logging:0 - java-virtuals/interceptor-api:0 - java-virtuals/servlet-api:3.0" - DEPEND=" - ${CDEPEND} - app-eselect/eselect-java - || ( dev-java/commons-logging:0 dev-java/log4j:0 ) - >=virtual/jdk-1.7" + >=virtual/jdk-1.8 + app-eselect/eselect-java" RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.7" + >=virtual/jre-1.8" S="${WORKDIR}/${MY_P}" -MAVEN="${PN}-${SLOT}" +MAVEN=${PN}-${SLOT} MAVEN_SHARE="/usr/share/${MAVEN}" -MAVEN_DEPENDENCIES=( - juel - jsoup - log4j - jsr250 - javax-inject - commons-io-1 - osgi-core-api - aopalliance-1 - commons-cli-1 - commons-logging - interceptor-api - servlet-api-3.0 -) - -java_prepare() { - rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die - - chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die - - # Symlink jars. - cd lib || die - - # Link deps. - for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do - java-pkg_jar-from "${mvn_dep}" - done -} - # TODO: We should use jars from packages, instead of what is bundled. src_install() { dodir "${MAVEN_SHARE}" diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild deleted file mode 100644 index 74e3ef2b4a48..000000000000 --- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit java-pkg-2 - -MY_PN=apache-${PN%%-bin} -MY_PV=${PV/_alpha/-alpha-} -MY_P="${MY_PN}-${MY_PV}" -MY_MV="${PV%%.*}" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="https://maven.apache.org/" - -LICENSE="Apache-2.0" -SLOT="3.2" -KEYWORDS="amd64 x86" - -# TODO: Needs further resolution: -# -# - https://bugs.gentoo.org/show_bug.cgi?id=472850 -# - https://bugs.gentoo.org/show_bug.cgi?id=477436 -# -DEPEND="app-eselect/eselect-java -|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) -dev-java/aopalliance:1 -dev-java/avalon-framework:4.1 -dev-java/commons-cli:1 -dev-java/commons-io:1 -dev-java/javax-inject:0 -dev-java/jsoup:0 -dev-java/jsr250:0 -dev-java/juel:0 -dev-java/osgi-core-api:0 -java-virtuals/interceptor-api:0 -java-virtuals/servlet-api:2.4" - -RDEPEND=">=virtual/jdk-1.6 ->=virtual/jre-1.6 -${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -MAVEN=${PN}-${SLOT} -MAVEN_SHARE="/usr/share/${MAVEN}" - -java_prepare() { - rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die - - chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die - - # Symlink jars. - cd lib || die - java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4 - has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging - has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0 - has_version dev-java/log4j:0 && java-pkg_jar-from log4j -} - -# TODO: We should use jars from packages, instead of what is bundled. -src_install() { - dodir "${MAVEN_SHARE}" - - cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE README.txt - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} - - # See bug #342901. - echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die - doenvd "${T}/25${MAVEN}" -} - -pkg_postinst() { - eselect maven update mvn-${SLOT} -} - -pkg_postrm() { - eselect maven update -} diff --git a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild new file mode 100644 index 000000000000..966eaa23b60a --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_PV=${PV/_alpha/-alpha-} +MY_P="${MY_PN}-${MY_PV}" +MY_MV="${PV%%.*}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="https://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.3" +KEYWORDS="amd64 x86" + +DEPEND=" + >=virtual/jdk-1.8 + app-eselect/eselect-java" + +RDEPEND=" + >=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}" + +MAVEN="${PN}-${SLOT}" +MAVEN_SHARE="/usr/share/${MAVEN}" + +# TODO: +# We should use jars from packages, instead of what is bundled. +src_install() { + dodir "${MAVEN_SHARE}" + + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # See bug #342901. + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-java/maven-bin/maven-bin-3.6.0-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.0-r1.ebuild new file mode 100644 index 000000000000..d342ce6c5794 --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.6.0-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_PV=${PV/_alpha/-alpha-} +MY_P="${MY_PN}-${MY_PV}" +MY_MV="${PV%%.*}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="https://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.6" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8 + app-eselect/eselect-java" + +RDEPEND=" + >=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}" + +MAVEN="${PN}-${SLOT}" +MAVEN_SHARE="/usr/share/${MAVEN}" + +# TODO: +# We should use jars from packages, instead of what is bundled. +src_install() { + dodir "${MAVEN_SHARE}" + + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # See bug #342901. + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild deleted file mode 100644 index a7e55b1b599d..000000000000 --- a/dev-java/maven-bin/maven-bin-3.6.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-2 - -MY_PN=apache-${PN%%-bin} -MY_PV=${PV/_alpha/-alpha-} -MY_P="${MY_PN}-${MY_PV}" -MY_MV="${PV%%.*}" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="https://maven.apache.org/" - -LICENSE="Apache-2.0" -SLOT="3.6" -KEYWORDS="~amd64 ~x86" - -# TODO: Needs further resolution: -# -# - https://bugs.gentoo.org/show_bug.cgi?id=472850 -# - https://bugs.gentoo.org/show_bug.cgi?id=477436 -# -CDEPEND=" - dev-java/juel:0 - dev-java/log4j:0 - dev-java/jsoup:0 - dev-java/jsr250:0 - dev-java/commons-io:1 - dev-java/aopalliance:1 - dev-java/commons-cli:1 - dev-java/javax-inject:0 - dev-java/osgi-core-api:0 - dev-java/commons-logging:0 - java-virtuals/interceptor-api:0 - java-virtuals/servlet-api:3.0" - -DEPEND=" - ${CDEPEND} - app-eselect/eselect-java - || ( dev-java/commons-logging:0 dev-java/log4j:0 ) - >=virtual/jdk-1.7" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.7" - -S="${WORKDIR}/${MY_P}" - -MAVEN="${PN}-${SLOT}" -MAVEN_SHARE="/usr/share/${MAVEN}" - -MAVEN_DEPENDENCIES=( - juel - jsoup - log4j - jsr250 - javax-inject - commons-io-1 - osgi-core-api - aopalliance-1 - commons-cli-1 - commons-logging - interceptor-api - servlet-api-3.0 -) - -java_prepare() { - rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die - - chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die - - # Symlink jars. - cd lib || die - - # Link deps. - for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do - java-pkg_jar-from "${mvn_dep}" - done -} - -# TODO: We should use jars from packages, instead of what is bundled. -src_install() { - dodir "${MAVEN_SHARE}" - - cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE README.txt - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} - - # See bug #342901. - echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die - doenvd "${T}/25${MAVEN}" -} - -pkg_postinst() { - eselect maven update mvn-${SLOT} -} - -pkg_postrm() { - eselect maven update -} diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild new file mode 100644 index 000000000000..d342ce6c5794 --- /dev/null +++ b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_PV=${PV/_alpha/-alpha-} +MY_P="${MY_PN}-${MY_PV}" +MY_MV="${PV%%.*}" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="https://maven.apache.org/" + +LICENSE="Apache-2.0" +SLOT="3.6" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + >=virtual/jdk-1.8 + app-eselect/eselect-java" + +RDEPEND=" + >=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}" + +MAVEN="${PN}-${SLOT}" +MAVEN_SHARE="/usr/share/${MAVEN}" + +# TODO: +# We should use jars from packages, instead of what is bundled. +src_install() { + dodir "${MAVEN_SHARE}" + + cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar + java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE README.txt + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} + + # See bug #342901. + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +} + +pkg_postinst() { + eselect maven update mvn-${SLOT} +} + +pkg_postrm() { + eselect maven update +} diff --git a/dev-java/maven-bin/maven-bin-3.6.1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1.ebuild deleted file mode 100644 index 4a6edff4651e..000000000000 --- a/dev-java/maven-bin/maven-bin-3.6.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-2 - -MY_PN=apache-${PN%%-bin} -MY_PV=${PV/_alpha/-alpha-} -MY_P="${MY_PN}-${MY_PV}" -MY_MV="${PV%%.*}" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="https://maven.apache.org/" - -LICENSE="Apache-2.0" -SLOT="3.6" -KEYWORDS="~amd64 ~x86" - -# TODO: Needs further resolution: -# -# - https://bugs.gentoo.org/show_bug.cgi?id=472850 -# - https://bugs.gentoo.org/show_bug.cgi?id=477436 -# -CDEPEND=" - dev-java/juel:0 - dev-java/log4j:0 - dev-java/jsoup:0 - dev-java/jsr250:0 - dev-java/commons-io:1 - dev-java/aopalliance:1 - dev-java/commons-cli:1 - dev-java/javax-inject:0 - dev-java/osgi-core-api:0 - dev-java/commons-logging:0 - java-virtuals/interceptor-api:0 - java-virtuals/servlet-api:3.0" - -DEPEND=" - ${CDEPEND} - app-eselect/eselect-java - || ( dev-java/commons-logging:0 dev-java/log4j:0 ) - >=virtual/jdk-1.7" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.7" - -S="${WORKDIR}/${MY_P}" - -MAVEN="${PN}-${SLOT}" -MAVEN_SHARE="/usr/share/${MAVEN}" - -MAVEN_DEPENDENCIES=( - juel - jsoup - log4j - jsr250 - javax-inject - commons-io-1 - osgi-core-api - aopalliance-1 - commons-cli-1 - commons-logging - interceptor-api - servlet-api-3.0 -) - -java_prepare() { - rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die - - chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die - - # Symlink jars. - cd lib || die - - # Link deps. - for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do - java-pkg_jar-from "${mvn_dep}" - done -} - -# TODO: We should use jars from packages, instead of what is bundled. -src_install() { - dodir "${MAVEN_SHARE}" - - cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE README.txt - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} - - # See bug #342901. - echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die - doenvd "${T}/25${MAVEN}" -} - -pkg_postinst() { - eselect maven update mvn-${SLOT} -} - -pkg_postrm() { - eselect maven update -} |