dev-java/maven-bin: resurrected version 1.0.2

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

4 files changed, 62 insertions, 9 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 6f7f6fef509d..6fe77dc7a830 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,14 @@
 # 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.65 2011/01/15 12:25:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.66 2011/01/19 01:58:27 fordfrog Exp $
+
+*maven-bin-1.1-r1 (19 Jan 2011)
+
+  19 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> +maven-bin-1.0.2.ebuild,
+  -maven-bin-1.1.ebuild, +maven-bin-1.1-r1.ebuild:
+  Resurrected version 1.0.2, reslotted version 1.1 to slot 1.1, removed version
+  1.1 that was in slot 1.0 and added information about reslotting to 1.0.2
+  ebuild
 
 *maven-bin-3.0.2 (15 Jan 2011)
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 43f0285439f1..847adc1bd851 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -5,13 +5,15 @@ DIST apache-maven-2.1.0-bin.tar.bz2 2903842 RMD160 fde285896606d8a380ad07656a640
 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 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.1.ebuild 933 RMD160 7aa07ac949296267824e2b97de36bc154208f3b8 SHA1 10d0eb40df023f9f31be38997175c2a5bb896125 SHA256 054db0a8d1f6f70de954543b7c8ef070ed34d47edd4b3d848274dfebe54aa74b
+EBUILD maven-bin-1.0.2.ebuild 1211 RMD160 237191b2e53b7504a5c4e027c5cb52d8fb16c8cb SHA1 07ecbf7f3c9068119eef9a96320a0a3ef71edef7 SHA256 30f1acd7bda9675959d93fd6de47753e8a151897b8087a108ae3c02df6cdaad7
+EBUILD maven-bin-1.1-r1.ebuild 942 RMD160 d6f1458b6db4887c45548952a27e82af687e94f6 SHA1 4b3a072b18876be3b29158941110a2fee506820b SHA256 00263e8a05e229739a223bac0d3def471a1b3da61116602c1046559840843fd8
 EBUILD maven-bin-2.0.10.ebuild 1024 RMD160 7b8518567ccbfdaf02aef7b7584c53ccb6978932 SHA1 5a9a2d53d4f079dac99ed32479b2de86ff87cdef SHA256 f098e7e9d89172982fa19d299231d148e1686a32830ad25c178de9fae7e4292f
 EBUILD maven-bin-2.0.11.ebuild 1172 RMD160 50877e555188f1628b73636c22b9ee2b88cd60bc SHA1 4eb01ab352b95b50de6c2e7ee6fa6b74b8dd5760 SHA256 fabef1df63a2cd6f6acf54869f200828f22a838a08dce28bfca8c246b3cc8fc6
 EBUILD maven-bin-2.1.0.ebuild 1173 RMD160 fca35a6d7fafc9eae8b9188465431af2804c4bfe SHA1 b49e18d8e30cb3968de634990f274c8040166ea4 SHA256 00c62bfde23094bbb7772a4510c5152d28e8c55880dc2f715344ced57a799569
 EBUILD maven-bin-2.2.1.ebuild 1173 RMD160 dc2ed400ff796730a4600bf515fcbfee583afcc3 SHA1 b77258af091158b7c856e32335abfd949be66fe8 SHA256 b5a3c83a3da46d4474cf6063d1473a7c1494cf2d63726d777b7dd422615e66be
 EBUILD maven-bin-3.0.2.ebuild 1254 RMD160 ad6feea9826ec58c2deca437899caab482cdd580 SHA1 1a3d4f2ecffaf69a830770258397d9cbb37bbfa6 SHA256 c70e594f7bc803fcbfd4256cfe1cfe189e568c42752305e22ff3af0f79d67792
 EBUILD maven-bin-3.0.ebuild 1250 RMD160 3e12e3e5c4a438abc4fcb0890fe86393d973c36e SHA1 b12f37583cf094cf69a9755ea85bc22a2840da4b SHA256 b592154a1908fd1c85c9f3b034cb32b28cb987352eb3df215018d9eba204656d
-MISC ChangeLog 11247 RMD160 7a5b850b3427fbecefe81ba0479464408e3f49f0 SHA1 b4086e0a817a7d3e9393a13399ddce84d5e810d6 SHA256 da8e460c4302987dd8b336890ba70d21fa6b346de5fcd88109fe53bc66b57f82
+MISC ChangeLog 11573 RMD160 032fb5da794a0c3921fb44008531e4528b87fdcc SHA1 eafe7bdfac321fe33c1da300bb11ab61c6bcad47 SHA256 ac692d4b4ae9ec5134e33b6844cd1bca20c22d30532e033aa74c49cd2d5fc5ab
 MISC metadata.xml 532 RMD160 23fa79fc26d775ecf394078ea2b437c13fcb1c1c SHA1 9788d76408e6137cfac15b1cbe453f1f29835b9a SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f
diff --git a/dev-java/maven-bin/maven-bin-1.0.2.ebuild b/dev-java/maven-bin/maven-bin-1.0.2.ebuild
new file mode 100644
index 000000000000..9ee3e20440f9
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-1.0.2.ebuild
@@ -0,0 +1,43 @@
+# 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.ebuild,v 1.7 2011/01/19 01:58:27 fordfrog Exp $
+
+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=""
+
+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}
+	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/${MY_PN} || die "dosym failed"
+}
+
+pkg_postinst() {
+	elog "If you had maven-bin-1.1 installed and it was downgraded to this"
+	elog "version, it is because maven-bin-1.1 has been reslotted to slot 1.1."
+	elog "If you want to install maven-bin-1.1 back, just issue:"
+	elog "  emerge =maven-bin-1.1*"
+}
diff --git a/dev-java/maven-bin/maven-bin-1.1.ebuild b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
index 8cf4623e568f..6747e4e2b1b0 100644
--- a/dev-java/maven-bin/maven-bin-1.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.5 2008/03/08 20:41:07 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.1-r1.ebuild,v 1.1 2011/01/19 01:58:27 fordfrog Exp $
 
 MY_PN=${PN/-bin}
 MY_PV=${PV/_/-}
@@ -9,10 +9,10 @@ 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.4"
-RDEPEND=">=virtual/jdk-1.4"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jdk-1.5"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"