Drop slots 1.0 and 2.1 as no longer offered upstream.

Remove old.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

14 files changed, 18 insertions, 656 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index d5f4b449475e..e3d175a6984f 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.77 2012/06/12 12:14:04 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.78 2012/06/12 12:24:33 sera Exp $
+
+  12 Jun 2012; Ralph Sennhauser <sera@gentoo.org> -maven-bin-1.0.2-r2.ebuild,
+  -maven-bin-1.1-r2.ebuild, -maven-bin-2.0.10.ebuild,
+  -maven-bin-2.0.11-r1.ebuild, -maven-bin-2.1.0.ebuild,
+  -maven-bin-2.1.0-r1.ebuild, -maven-bin-2.2.1-r1.ebuild,
+  -maven-bin-3.0.ebuild, -maven-bin-3.0.2.ebuild, -maven-bin-3.0.3.ebuild,
+  -maven-bin-3.0.3-r1.ebuild, -maven-bin-3.0.4.ebuild:
+  Drop slots 1.0 and 2.1 as no longer offered upstream.
+  Remove old.
 
 *maven-bin-3.0.4-r1 (12 Jun 2012)
 *maven-bin-2.2.1-r2 (12 Jun 2012)
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 78b20678cf7b..fed8e3a66101 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,45 +2,27 @@
 Hash: SHA1
 
 AUX maven 5108 RMD160 324047be03ff25943367b52092e5cb88c5580cff SHA1 f7e1469e6a9a9df7ed3ed1e80cd81829e47d9744 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10
-DIST apache-maven-2.0.10-bin.tar.bz2 2104924 RMD160 e2b292fc981298a8a3fc5d08caf390e3f484026b SHA1 d70a18bc119f60954fcf514312fe048d70996c7e SHA256 a3f62f0f3766a0b8279d650dcc47486bed54d9d0459c96d5caa60359e1f15721
 DIST apache-maven-2.0.11-bin.tar.bz2 2104711 RMD160 f74e8421518a38f300982ecd404f99376c007e53 SHA1 a4f36630522f45566ea0220776de20d5ddff69ce SHA256 f8e91b43def9b78d01f0ad8374644aa737365144dea04a97f9503ac0011ad39c
-DIST apache-maven-2.1.0-bin.tar.bz2 2903842 RMD160 fde285896606d8a380ad07656a6401f6d66b4f6b SHA1 7b18c2968b3c4e0c32aceb3203b776572c161fd3 SHA256 2accbe9358765973ce68f4cc11a9bc8de0358e72164647ac4c2041a83e0cde1b
 DIST apache-maven-2.2.1-bin.tar.bz2 2839688 RMD160 25d523d3dc86cf4695b0e343cf0f6e58ea8a54e3 SHA1 47ac0417a200cbc6d1b967d6b7c6ae1138e9e3e0 SHA256 a8d819f78bec0505f5773962fc50117f0c5db4a69c7207d0c27cabffc950939f
-DIST apache-maven-3.0-bin.tar.gz 2899256 RMD160 eacd100b1ac8291d0ae32a5e10914596d1d9de77 SHA1 996f29b5a19e8145cb00926c68a0200dac554205 SHA256 046a0c7661ca85ac6cef6ac6c7cc2175b77bc5ee915e30897afba6c38fdb27a2
-DIST apache-maven-3.0.2-bin.tar.gz 2968629 RMD160 26214da3e72cd8b9ea0fea0bb81e740b94ae0463 SHA1 eedd18952c373824c32b2fa891569bdf3776f650 SHA256 c7a70e37cbd564a6025288e381e6ad56e20ae2fa537b2eddf3b9e3bc644b0814
-DIST apache-maven-3.0.3-bin.tar.gz 3054807 RMD160 f222733f32badab75c11e0ed3fbca2e594de7328 SHA1 cfd1f5ef8ebb2f09a9446159842cf7cfa1a3ccd6 SHA256 b845479bd5d6d821210d3530c65da628a118abedd176492741e1d9bc5e400e2a
 DIST apache-maven-3.0.4-bin.tar.gz 4873043 RMD160 c55335fb5c10380db64e6b56ee26cd6f42307a72 SHA1 0de5dc162bafde3fcb0a6b009cfeea81a042523b SHA256 d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f
-DIST maven-1.0.2.tar.gz 6060686 RMD160 3d94fad30086f462eb3dd238803d274346ef9e2f SHA1 2978ffff5526dad371b560acb052cc78b6a2cb6b SHA256 8895c3bc0cce94e03aede40322e7485c8c458ad88f377d8170986c18e8f34c83
 DIST maven-1.1.tar.gz 7625074 RMD160 82ef869218ac42d9132fc74316f0e8a5edcf9431 SHA1 d9174675f0e846a225278949869fa2d979fa7f3b SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731
-EBUILD maven-bin-1.0.2-r2.ebuild 1027 RMD160 dbe50bf7500fe26b123d70c6b041539d570f0f62 SHA1 f6ab24e7e116f2a397439a200d475e85181b5b25 SHA256 c2b8ef8bd897477be8ca1bd526f57e17c0149e4e3ade0a55d6361e9d5e37c79a
 EBUILD maven-bin-1.1-r1.ebuild 947 RMD160 10b8407fd09fcfbdb96392c672109bf11d400733 SHA1 2ae01b85bc33a6eb6e356def9aa7a03b658b084c SHA256 e636c50f656c77dc6cfdacade0eb38de3a47dfd64382e767a5fb5ebf4a36b92a
-EBUILD maven-bin-1.1-r2.ebuild 1025 RMD160 ba41e81498487d41bc007b4796f6c02298631cc2 SHA1 c8c651c2a209c7a3ec9a73d52cd30bbed0c3a31d SHA256 ab5d8a21cf84558a0c727b986aef8d38aaccc10206954f517286b503e55cb4ff
 EBUILD maven-bin-1.1-r3.ebuild 1055 RMD160 a079788c5370aeeb604cdceb0c68705e69335708 SHA1 137e241b8a637cac2f7cd72be3a1a688d2cace5a SHA256 25aae1f11a2cb7d245540366ed6cb64a78ba76ff7d7c16fe1ccbc5b894fb3c02
-EBUILD maven-bin-2.0.10.ebuild 1024 RMD160 7b8518567ccbfdaf02aef7b7584c53ccb6978932 SHA1 5a9a2d53d4f079dac99ed32479b2de86ff87cdef SHA256 f098e7e9d89172982fa19d299231d148e1686a32830ad25c178de9fae7e4292f
-EBUILD maven-bin-2.0.11-r1.ebuild 1283 RMD160 16257779eef4ec85467b238a65503e731b067309 SHA1 518d322f3e01ba63624bca4a575cfec73bd69e6f SHA256 91b3a2e8f110f32e8061023bfa78a35fc50f139defdaef0d3266eceb5dbe46b9
 EBUILD maven-bin-2.0.11-r2.ebuild 1313 RMD160 83d1e805b69f6852937135c644598041fe173c8f SHA1 c41af87f697ce8ba3bbe2312a566256d7d58ac25 SHA256 2c3027829264bdc1776326b9496ea760da2fbfcbb2b37ffb0ea6d92ae99f135f
 EBUILD maven-bin-2.0.11.ebuild 1175 RMD160 ae89d9b5d035776e41f5e5550652eae30b2aaf04 SHA1 88b328a1818bef585a35fa220454f3530e74e20c SHA256 a01e6b9031c5728a075983958ac88fd6f69959b14289826b848d6be704726ea6
-EBUILD maven-bin-2.1.0-r1.ebuild 1294 RMD160 ef9d8018c143d93a0f0310288ae3c691bee56fc1 SHA1 e7efe47ce83fa2dcba315111d03a984fafc5f636 SHA256 6938631a6dbd181f9153ff6f343a884432fe9d8b8e84859437c68a7a8dd88a47
-EBUILD maven-bin-2.1.0.ebuild 1176 RMD160 e56db10913887e29c9fc6db9ebd7c7031601fb4a SHA1 bd7ce9c0ed30f08e4762f8b83133ae0f54b3dded SHA256 a5f57b67dda2b095e8fa85e8657944b9f0bb17ad28b102f654789b6f3a22eed9
-EBUILD maven-bin-2.2.1-r1.ebuild 1294 RMD160 492be744cc256ab867755079cf86a776ad57836d SHA1 7d0d0fd04af62204ff7cdb8d385ade41067f4e4f SHA256 05db7278059e7728206511745861599b24c3de7f5745f0eccfa9fdd5051db2e8
 EBUILD maven-bin-2.2.1-r2.ebuild 1312 RMD160 644af7f82c45c7ea3e51e65fcbc26abc7acd4885 SHA1 f0ae42a459a5ebd26fb1a607928976269d705700 SHA256 25100ff74de14b78d2aed74ee8480570223ca38018cddbf0c0e216afa7a8a367
 EBUILD maven-bin-2.2.1.ebuild 1176 RMD160 db3556d99b54efc8bb6a2c8d69ac303491571890 SHA1 4e1f6191655dd4b407d70c0a3a04593f10f838f5 SHA256 9445c670677895e5a525fef6d9094bebb0fe715d9d6f4003b5cb6f4b17974587
-EBUILD maven-bin-3.0.2.ebuild 1254 RMD160 ad6feea9826ec58c2deca437899caab482cdd580 SHA1 1a3d4f2ecffaf69a830770258397d9cbb37bbfa6 SHA256 c70e594f7bc803fcbfd4256cfe1cfe189e568c42752305e22ff3af0f79d67792
-EBUILD maven-bin-3.0.3-r1.ebuild 1371 RMD160 e2db554b884d05b89d0099525bb257af04ee2e82 SHA1 04e10daaa4dbd146e889975f5edc9ddca68b9c34 SHA256 0e22d3b7c6cdf2b66ec6352db6627e097ca8e03071c3566c1f4647d6d5eecd71
-EBUILD maven-bin-3.0.3.ebuild 1254 RMD160 40655df55933b1b9159ad9b86574561512c1756b SHA1 a8e83ac07dc3ecb2c68d284558682f7356883fe3 SHA256 a47e91b1f1bff568cb59d30a2c10ec4f66884c657de62e6bf113c0bdd2eda690
 EBUILD maven-bin-3.0.4-r1.ebuild 1389 RMD160 f5fcc1728700833d63d96e191379f79991252952 SHA1 d8a043b59a6f9348ec91a2e4019b8f163f4a3b6d SHA256 9dcb65bbf8575b843195ee8715b8411508606e291b2b2990dfeae10973a0b93f
-EBUILD maven-bin-3.0.4.ebuild 1372 RMD160 fe8aa83c824c5259be94fa4d1a18c08dacce4806 SHA1 6068969d924589628fdf1f055773de187d09c254 SHA256 4f9a68325fb5583bef3f9db01b4a614873b7fa178dee6645aea5a6a16df83009
-EBUILD maven-bin-3.0.ebuild 1250 RMD160 3e12e3e5c4a438abc4fcb0890fe86393d973c36e SHA1 b12f37583cf094cf69a9755ea85bc22a2840da4b SHA256 b592154a1908fd1c85c9f3b034cb32b28cb987352eb3df215018d9eba204656d
-MISC ChangeLog 13909 RMD160 177f12e04f1edc7677f85a329f6915d537f9409f SHA1 417412051ebbd18dc092bbe357796f6421971b7e SHA256 aa306b8d790e2429f6a0d77430a77cd200bd1c30bb2a2b18a9423d6c3f9906e5
+MISC ChangeLog 14356 RMD160 814accd51fa00cf7c09fee99e99ee13cde2460b2 SHA1 d838a1b1cb8bc5d0acf30f9275022652f4934685 SHA256 68e7ff21f83518ddc2a15649f3e38c79a67cffef30711a6171c9fb9f969f844b
 MISC metadata.xml 532 RMD160 23fa79fc26d775ecf394078ea2b437c13fcb1c1c SHA1 9788d76408e6137cfac15b1cbe453f1f29835b9a SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP1zKgAAoJEIUJ+svaV163q2gH/iTjP5J70pXF8q+OXvEGG2Ro
-pWjMtk4G0d0ZPLlkQC1sSU6bgm6TnDZZ9p3acWhXunoSeaSn0bEZg4AJxVauUj0A
-xfhks+HoUBkmhgNerDBjLVNzzZFl4fZaF0Pgv06IVdkvjunS97yY2HIM3RwstatO
-k7v18BywqH/pWrGaFoMJzoWG2r8u2G45uspws/lPyC9lLMoaq9IPWBHNSflr5qlW
-rnGpcWmm1utARkbUrhrStLuXblx3sk4h0XGZB9OxNQf40PWW/D84Pbo/6Ijh3j4A
-2RLfjs0KTsCRDu88nSbcmG/O8GlJexE7smuRB1ScQ9suj9V5oRbYSvullVbxASs=
-=NTUb
+iQEcBAEBAgAGBQJP1zUSAAoJEIUJ+svaV163idQIAIDMLp3ZRs649BWbbcoB9wv3
+iS/5fSniRUL0gUjTUJz4OpjpcV+lgXyvb3v4RqJCZ1HIr4N0EiPfAdVqO7HAEOXf
+1lnU00Is9+oCWMYFdWsBMufZg3cgHyMjnj45gkPYkVkwjo2Gr1qE8AsHMcj/D4E0
+2Af1Slu25KFTo5jAH65cZ589h86ios7O6IrC28paWHbI4pdm1kP31eag7W7Q+eXM
+zLRCB5BoqbfDGtXBgFlxDM9GGiIuaXwCS8YTx81jM26GtrlGexNLgazzAjKTLO4F
+T0vL2gUklG+mhCdJHdr+TIkl8QJbZbPpc5pya2MQippEy6YeAg18B5oiZ/CKH8E=
+=0Bmn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild b/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
deleted file mode 100644
index d0ad004a7296..000000000000
--- a/dev-java/maven-bin/maven-bin-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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-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"
-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-1.1-r2.ebuild b/dev-java/maven-bin/maven-bin-1.1-r2.ebuild
deleted file mode 100644
index 5609bfcbbe4d..000000000000
--- a/dev-java/maven-bin/maven-bin-1.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.10.ebuild b/dev-java/maven-bin/maven-bin-2.0.10.ebuild
deleted file mode 100644
index 298aa29ffc52..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 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.10.ebuild,v 1.3 2009/04/27 00:03:10 ranger Exp $
-
-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"
-
-RDEPEND=">=virtual/jdk-1.4"
-
-IUSE=""
-
-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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn
-}
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
deleted file mode 100644
index 316045fbd4dd..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
index 8496c4e8705f..000000000000
--- a/dev-java/maven-bin/maven-bin-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.1.0.ebuild b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
deleted file mode 100644
index 693b88c0fa24..000000000000
--- a/dev-java/maven-bin/maven-bin-2.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.ebuild,v 1.6 2011/07/18 07:33:22 xarthisius Exp $
-
-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"
-
-RDEPEND=">=virtual/jdk-1.4
-	app-admin/eselect-maven"
-
-IUSE=""
-
-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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	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}"
-}
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
deleted file mode 100644
index 1729705abc3b..000000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.2.ebuild b/dev-java/maven-bin/maven-bin-3.0.2.ebuild
deleted file mode 100644
index ace580226496..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.2.ebuild,v 1.1 2011/01/15 12:25:40 fordfrog Exp $
-
-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"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	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}"
-}
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
deleted file mode 100644
index 4ba49bb7ffe5..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.3.ebuild b/dev-java/maven-bin/maven-bin-3.0.3.ebuild
deleted file mode 100644
index ab63c55ad187..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.ebuild,v 1.1 2011/03/10 15:27:23 fordfrog Exp $
-
-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"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	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}"
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4.ebuild b/dev-java/maven-bin/maven-bin-3.0.4.ebuild
deleted file mode 100644
index cba52aa09425..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 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.4.ebuild,v 1.1 2012/01/26 16:42:40 fordfrog 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
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.ebuild b/dev-java/maven-bin/maven-bin-3.0.ebuild
deleted file mode 100644
index b0299379ee4b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/10/29 18:41:24 caster Exp $
-
-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"
-
-RDEPEND=">=virtual/jdk-1.5
-	app-admin/eselect-maven"
-
-IUSE=""
-
-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 "${D}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt || die
-
-	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}"
-}