* [gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: maven-bin-3.1.0-r1.ebuild ChangeLog
@ 2013-08-10 11:15 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-08-10 11:15 UTC (permalink / raw
To: gentoo-commits
tomwij 13/08/10 11:15:09
Modified: ChangeLog
Added: maven-bin-3.1.0-r1.ebuild
Log:
Revision bump, because package.env could possible change. A first step to fix up dependencies for bug #472850, cuts 2 or more optional dependencies; after which we need to deal with bug #477436 as well as unbundle more dependencies where possible. Thanks to wojtek for reporting and researching the situation.
(Portage version: 2.1.13.5/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.84 dev-java/maven-bin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?r1=1.83&r2=1.84
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog 19 Jul 2013 23:58:10 -0000 1.83
+++ ChangeLog 10 Aug 2013 11:15:09 -0000 1.84
@@ -1,6 +1,14 @@
# ChangeLog for dev-java/maven-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.83 2013/07/19 23:58:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.84 2013/08/10 11:15:09 tomwij Exp $
+
+*maven-bin-3.1.0-r1 (10 Aug 2013)
+
+ 10 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +maven-bin-3.1.0-r1.ebuild:
+ Revision bump, because package.env could possible change. A first step to fix
+ up dependencies for bug #472850, cuts 2 or more optional dependencies; after
+ which we need to deal with bug #477436 as well as unbundle more dependencies
+ where possible. Thanks to wojtek for reporting and researching the situation.
*maven-bin-3.1.0 (19 Jul 2013)
1.1 dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: maven-bin-3.1.0-r1.ebuild
===================================================================
# Copyright 1999-2013 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.1.0-r1.ebuild,v 1.1 2013/08/10 11:15:09 tomwij Exp $
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="http://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-admin/eselect-java app-admin/eselect-maven )
|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
dev-java/avalon-framework:4.1
dev-java/commons-io:1
dev-java/juel:0
dev-java/osgi-core-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 "${S}"/bin/*.bat || die
chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
# Register jars.
java-pkg_getjars avalon-framework-4.1,commons-io-1,commons-logging,juel,osgi-core-api,servlet-api-2.4 > /dev/null
has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null
has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null
}
# 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.txt 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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: maven-bin-3.1.0-r1.ebuild ChangeLog
@ 2013-08-14 15:25 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-08-14 15:25 UTC (permalink / raw
To: gentoo-commits
tomwij 13/08/14 15:25:11
Modified: maven-bin-3.1.0-r1.ebuild ChangeLog
Log:
Move commons-logging under a has_version check just like the other two choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej Piechotka on the bug.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.2 dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild?r1=1.1&r2=1.2
Index: maven-bin-3.1.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-bin-3.1.0-r1.ebuild 10 Aug 2013 11:15:09 -0000 1.1
+++ maven-bin-3.1.0-r1.ebuild 14 Aug 2013 15:25:11 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.1.0-r1.ebuild,v 1.1 2013/08/10 11:15:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.1.0-r1.ebuild,v 1.2 2013/08/14 15:25:11 tomwij Exp $
EAPI="5"
@@ -46,7 +46,8 @@
chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
# Register jars.
- java-pkg_getjars avalon-framework-4.1,commons-io-1,commons-logging,juel,osgi-core-api,servlet-api-2.4 > /dev/null
+ java-pkg_getjars avalon-framework-4.1,commons-io-1,juel,osgi-core-api,servlet-api-2.4 > /dev/null
+ has_version dev-java/commons-logging:0 && java-pkg_getjars commons-logging > /dev/null
has_version dev-java/avalon-logkit:2.0 && java-pkg_getjars avalon-logkit-2.0 > /dev/null
has_version dev-java/log4j:0 && java-pkg_getjars log4j > /dev/null
}
1.85 dev-java/maven-bin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/maven-bin/ChangeLog?r1=1.84&r2=1.85
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog 10 Aug 2013 11:15:09 -0000 1.84
+++ ChangeLog 14 Aug 2013 15:25:11 -0000 1.85
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/maven-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.84 2013/08/10 11:15:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.85 2013/08/14 15:25:11 tomwij Exp $
+
+ 14 Aug 2013; Tom Wijsman <TomWij@gentoo.org> maven-bin-3.1.0-r1.ebuild:
+ Move commons-logging under a has_version check just like the other two
+ choices. Fixes bug #480700, reported by spyder on IRC as well as Maciej
+ Piechotka on the bug.
*maven-bin-3.1.0-r1 (10 Aug 2013)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-14 15:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 15:25 [gentoo-commits] gentoo-x86 commit in dev-java/maven-bin: maven-bin-3.1.0-r1.ebuild ChangeLog Tom Wijsman (tomwij)
-- strict thread matches above, loose matches on Subject: below --
2013-08-10 11:15 Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox