summaryrefslogtreecommitdiff
path: root/dev-java/maven-bin
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/maven-bin')
-rw-r--r--dev-java/maven-bin/Manifest12
-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.ebuild59
-rw-r--r--dev-java/maven-bin/maven-bin-3.1.1.ebuild86
-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.ebuild87
-rw-r--r--dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild59
-rw-r--r--dev-java/maven-bin/maven-bin-3.6.0.ebuild109
-rw-r--r--dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild59
-rw-r--r--dev-java/maven-bin/maven-bin-3.6.1.ebuild109
10 files changed, 198 insertions, 460 deletions
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index cce0bc33579e..89fdd9b60708 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -3,12 +3,10 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
-EBUILD maven-bin-3.0.5.ebuild 1265 BLAKE2B c7942c23734722f217b7d5dbd51168f8e170417337ad336d36bca1d1b2cb0d894f8a183fe5c8d442754e223c3b3d3ce0d136d04dd6340b63349996b00439e543 SHA512 c22ddf526763e7162be557c0bace6ce4ea33edc7786a1d6fe7dc1297700821c6a22d387874e0a9f8b566d5582bc6be149a93d03e3ce60e0a263542ca735ae1b7
-EBUILD maven-bin-3.1.1.ebuild 2274 BLAKE2B cff19f6b3eba70d6e5890f30cb7faaba15a89777c8b35c35be85fb214e2413ac66b49376902a19a85ff8fb955445eaac50d8d2eab105bdd779289b1917c6c8fd SHA512 287cbbdbdbf3c7eb8e029bc35a26b86b9d19bbebd5bb878dbdc4ce03a88f194f8acdb72932040fd1c5574a1fa0eef7aaca07f69478e46c7bcbea6939da2edb03
-EBUILD maven-bin-3.2.5.ebuild 2279 BLAKE2B c94fc09f4aba4b15ad52b300460794d35a213b1218761996dfac0c81be3c71c4103e504ffff9948959c92da75099b5cfe9b9d5160de28318170bb6174012a84d SHA512 e11a7cd2b3620754966cfd6130baec3dbf7b3f8875506c9c80a329e125d0cbe4d360dcd519d62a8fb574b62fae92ffe085c041b3f8da0678d11ad187194f08c8
-EBUILD maven-bin-3.3.9.ebuild 2218 BLAKE2B dff6966b08eef11aebdff6858203257ef76dfd24e79c9360b19b1f2203c176929b1909582e0c0588ca6a811f6ae80d1c0948b3f3e3440e12cda0ede68bd62d83 SHA512 5a73c301485e47b68aa5e5868e8c2ecfdbcd345a4c54a8638db2bbb3767b803308ff726ef9975d146249b6d58a7509989cd97592d74219dfc4e57cde2da80007
-EBUILD maven-bin-3.6.0.ebuild 2218 BLAKE2B 4692451547ef9a1d71f63a974f0a9bf86e43f101874c7f0690be0d3b0d7903fbbf87477cd64994e0e11b8b05f09923caee1a9971dfd0138cc822789c1b2b0890 SHA512 b444131af7c1bf8376a985c88a313a7515aab30aafb69aa4984c7421f0769480c7ed82ce59e811cbd160a42ebbb8224cc7e76414fb67671c9eae2068db9463aa
-EBUILD maven-bin-3.6.1.ebuild 2218 BLAKE2B b5ec30cc9313106e0dec93cdf7bc810673bfbb497912f4329005ba0b87cae08e24723517234af4194ae704b7f83925838eb350a9a0403137f15a0ee41cacd461 SHA512 3de59f5d3bbea858a19d03d90c7deba4f901b8916455dc52849fab7d8251f1d8988f00ca183814a05d1b3354bea6e9a34b3d95011cf6c5330ed312326d6cc9a6
+EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
+EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
+EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
+EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
+EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
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.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..46ef90466cd5
--- /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
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 15:45:21 +0000