EAPI bump, make prefix aware.

Fix symlink name in slot 1.0 and 1.1.
Call eselect maven update when appropriate. #355507, thanks to Kasun Gajasinghe <kasun.gajasinghe@gmail.com> for providing a series of patches.

(Portage version: 2.1.10.39/cvs/Linux x86_64)

7 files changed, 318 insertions, 7 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 22c0edd8b5ad..3355a68f93c9 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.74 2011/07/18 07:33:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.75 2011/12/14 15:43:49 sera Exp $
+
+*maven-bin-3.0.3-r1 (14 Dec 2011)
+*maven-bin-2.2.1-r1 (14 Dec 2011)
+*maven-bin-2.1.0-r1 (14 Dec 2011)
+*maven-bin-2.0.11-r1 (14 Dec 2011)
+*maven-bin-1.1-r2 (14 Dec 2011)
+*maven-bin-1.0.2-r2 (14 Dec 2011)
+
+  14 Dec 2011; Ralph Sennhauser <sera@gentoo.org> -maven-bin-1.0.2-r1.ebuild,
+  +maven-bin-1.0.2-r2.ebuild, +maven-bin-1.1-r2.ebuild,
+  +maven-bin-2.0.11-r1.ebuild, +maven-bin-2.1.0-r1.ebuild,
+  +maven-bin-2.2.1-r1.ebuild, +maven-bin-3.0.3-r1.ebuild:
+  EAPI bump, make prefix aware.
+  Fix symlink name in slot 1.0 and 1.1.
+  Call eselect maven update when appropriate. #355507, thanks to Kasun
+  Gajasinghe <kasun.gajasinghe@gmail.com> for providing a series of patches.
 
   18 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> maven-bin-2.0.11.ebuild,
   maven-bin-2.1.0.ebuild, maven-bin-2.2.1.ebuild:
diff --git a/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild b/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
index 7535130aae95..d0ad004a7296 100644
--- a/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.2-r1.ebuild,v 1.1 2011/01/20 20:39:27 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
 
 MY_PN=${PN/-bin}
 MY_PV=${PV/_/-}
 MY_P=${MY_PN}-${MY_PV}
+
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz"
 HOMEPAGE="http://maven.apache.org/"
+
 LICENSE="Apache-2.0"
 SLOT="1.0"
 KEYWORDS="~amd64 ~ppc ~x86"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jdk-1.5"
 IUSE=""
 
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
 S="${WORKDIR}/${MY_P}"
 MAVEN=${PN}-${SLOT}
 MAVEN_HOME="/usr/share/${MAVEN}"
 MAVEN_BIN="${MAVEN_HOME}/bin"
 
-src_compile() { :; }
-
 src_install() {
 	dodir ${MAVEN_HOME}
 	insinto ${MAVEN_HOME}
@@ -32,5 +36,13 @@ src_install() {
 	doexe "${FILESDIR}/${MY_PN}"
 
 	dodir /usr/bin
-	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/${MY_PN}-${SLOT} || die "dosym failed"
+	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
 }
diff --git a/dev-java/maven-bin/maven-bin-1.1-r2.ebuild b/dev-java/maven-bin/maven-bin-1.1-r2.ebuild
new file mode 100644
index 000000000000..5609bfcbbe4d
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-1.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r2.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
+
+MY_PN=${PN/-bin}
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+MAVEN=${PN}-${SLOT}
+MAVEN_HOME="/usr/share/${MAVEN}"
+MAVEN_BIN="${MAVEN_HOME}/bin"
+
+src_install() {
+	dodir ${MAVEN_HOME}
+	insinto ${MAVEN_HOME}
+	doins -r bin lib *.xsd plugins
+
+	dodir ${MAVEN_BIN}
+	exeinto ${MAVEN_BIN}
+	doexe "${FILESDIR}/${MY_PN}"
+
+	dodir /usr/bin
+	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild
new file mode 100644
index 000000000000..316045fbd4dd
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.4
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# 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}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# 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-2.1.0-r1.ebuild b/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8496c4e8705f
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.4
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# 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}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# 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-2.2.1-r1.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..1729705abc3b
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.bz2"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	rm -v "${S}"/bin/*.bat || die
+}
+
+# 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}"/lib/*.jar
+
+	dodoc NOTICE.txt README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# 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.0.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..4ba49bb7ffe5
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 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.0.3-r1.ebuild,v 1.1 2011/12/14 15:43:49 sera Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect-maven"
+RDEPEND=">=virtual/jdk-1.5
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+src_unpack() {
+	unpack ${A}
+
+	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
+src_install() {
+	dodir "${MAVEN_SHARE}"
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	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}
+
+	# 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
+}