* [gentoo-commits] repo/proj/prefix:master commit in: dev-java/maven-bin/
@ 2017-10-17 8:58 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2017-10-17 8:58 UTC (permalink / raw
To: gentoo-commits
commit: a0f16c8aecb479975e8abaef7746e95cc3371d22
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 08:58:20 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 08:58:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a0f16c8a
dev-java/maven-bin: fix and bump, more ready for migration now
Package-Manager: Portage-2.3.11-prefix, Repoman-2.3.3
dev-java/maven-bin/Manifest | 1 +
dev-java/maven-bin/maven-bin-3.2.5.ebuild | 14 ++--
...ven-bin-3.2.5.ebuild => maven-bin-3.3.9.ebuild} | 83 ++++++++++++++--------
3 files changed, 60 insertions(+), 38 deletions(-)
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 1f8f3705ab..0e8c380973 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,3 +1,4 @@
DIST apache-maven-2.2.1-bin.tar.bz2 2839688 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7 WHIRLPOOL 17cdba09856646acf5a37c252c6dcc200bae6eb16ee07ee6620bdee832b452a3a1db8d61289cff3f849f5c0d57c673cfc4749e220dc52b2b5ec50d4d9cd1062a
DIST apache-maven-3.0.4-bin.tar.gz 4873043 SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c WHIRLPOOL f1e15af0bc0f942a8c4e435fa2cde57221e3ef8f86d43197dd4486812b115b684ad8e0ebf5ba3f2f0ad9d0ae0c5f0b0ac26a10e5e170fffe2d47bb77522c4e68
DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
+DIST apache-maven-3.3.9-bin.tar.gz 8491533 SHA256 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0 WHIRLPOOL a17d87711a925d502bb05d09166708b50304942aace82a6ed69dd9f73938590f1cf488eb4b9fb10f94250d804e6342d264f6a9407218fe9b38c242c06375b28b
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
index 7b429d1323..b2dcc09f8a 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.5.ebuild,v 1.2 2015/03/31 18:58:00 ulm Exp $
@@ -24,7 +24,7 @@ KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
# - https://bugs.gentoo.org/show_bug.cgi?id=472850
# - https://bugs.gentoo.org/show_bug.cgi?id=477436
#
-DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+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
@@ -52,6 +52,11 @@ java_prepare() {
chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+ hprefixify -w 1 bin/mvn
+ hprefixify -q '"' bin/mvn
+ # disable searching for JDKs on Darwin, rely on java-config instead
+ sed -i -e 's/Darwin/Gentoo-no-Darwin/' bin/mvn
+
# 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
@@ -60,11 +65,6 @@ java_prepare() {
has_version dev-java/log4j:0 && java-pkg_jar-from log4j
}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.0.3-prefix.patch
- eprefixify bin/mvn
-}
-
# 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.3.9.ebuild
similarity index 52%
copy from dev-java/maven-bin/maven-bin-3.2.5.ebuild
copy to dev-java/maven-bin/maven-bin-3.3.9.ebuild
index 7b429d1323..a8da1ca5b5 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.5.ebuild,v 1.2 2015/03/31 18:58:00 ulm Exp $
EAPI="5"
@@ -16,53 +15,75 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+SLOT="3.3"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
# 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 app-eselect/eselect-maven )
-|| ( 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}"
+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="${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/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+ rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+ hprefixify -w 1 bin/mvn
+ hprefixify -q '"' bin/mvn
+ # disable searching for JDKs on Darwin, rely on java-config instead
+ sed -i -e 's/Darwin/Gentoo-no-Darwin/' bin/mvn
+
# 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
-}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.0.3-prefix.patch
- eprefixify bin/mvn
+ # 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.
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/proj/prefix:master commit in: dev-java/maven-bin/
@ 2021-01-06 11:56 Fabian Groffen
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Groffen @ 2021-01-06 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 378e00aaac3bfd62b370a20200665b9b582ad8ea
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 11:56:53 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 11:56:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=378e00aa
dev-java/maven-bin: drop x86-macos
Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild | 4 ++--
dev-java/maven-bin/maven-bin-2.2.1.ebuild | 4 ++--
dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild | 4 ++--
dev-java/maven-bin/maven-bin-3.2.5.ebuild | 4 ++--
dev-java/maven-bin/maven-bin-3.3.9.ebuild | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
index 58629ae368..eda3d7d584 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild,v 1.6 2015/03/31 18:58:00 ulm Exp $
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="2.2"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE=""
DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-2.2.1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
index f3cf0c3f4b..bbcaf5ba2f 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.8 2015/03/31 18:58:00 ulm Exp $
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2
HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="2.2"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
RDEPEND=">=virtual/jdk-1.5
app-eselect/eselect-maven"
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
index 66e699339d..8706973e65 100644
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild,v 1.6 2015/03/31 18:58:00 ulm Exp $
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE=""
DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
index b2dcc09f8a..68aa4d133b 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.2.5.ebuild,v 1.2 2015/03/31 18:58:00 ulm Exp $
@@ -17,7 +17,7 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
# TODO: Needs further resolution:
#
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
index a8da1ca5b5..3c146d7c3a 100644
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,7 +16,7 @@ HOMEPAGE="http://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.3"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
# TODO: Needs further resolution:
#
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-06 11:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 8:58 [gentoo-commits] repo/proj/prefix:master commit in: dev-java/maven-bin/ Fabian Groffen
-- strict thread matches above, loose matches on Subject: below --
2021-01-06 11:56 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox