dev-java/maven-bin: dropped versions 3.5.x

according to following page it seems that version 3.6.0 replaces versions 3.5.x:
https://maven.apache.org/docs/history.html

versions 3.5 and 3.6 collide when creating debug information as they contain
same libraries (bug #675384)

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 92bc6d4e0a3d90e82f764adbf72e5324c6020f28..b5c682866c2517097f8da7c36d8bd93fe376bfc3 100644 (file)
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -6,7 +6,5 @@ DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5c
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.5.0-bin.tar.gz 8534562 BLAKE2B 200f7c012e2704c9057d4987a295b0fa9a5787d59707415259445952ae05963a7d333e6fc2eae88689161181077d2b9a9b2398b5baacc6527e76ed83d6068198 SHA512 d5a520ca8765ddbc86dca71249c602e2f798dedcc7430bc4979dd01918464c8dc69b694ec0dbbeeff6044179e1b98fce72af952663dd49503203d9742e328f3b
-DIST apache-maven-3.5.4-bin.tar.gz 8842660 BLAKE2B e56e22c2f9e51d47ff34b8516eb3d14d4ca2adddb36c800cfba5cb4e68c19c3c7df7d544c1e81c7be004fe5ceeee24f78b904f68b30b768aaf09562d804b61c3 SHA512 2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86
 DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
 DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0

diff --git a/dev-java/maven-bin/maven-bin-3.5.0.ebuild b/dev-java/maven-bin/maven-bin-3.5.0.ebuild
deleted file mode 100644 (file)
index 034526d..0000000
--- a/dev-java/maven-bin/maven-bin-3.5.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.5"
-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.5.4.ebuild b/dev-java/maven-bin/maven-bin-3.5.4.ebuild
deleted file mode 100644 (file)
index 034526d..0000000
--- a/dev-java/maven-bin/maven-bin-3.5.4.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.5"
-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
-}