# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1430433440 -7200
# Node ID 5c7895abbaa6c2a540f0f2bfc94bebf806231629
# Parent  4c7b804e2d374dc9d74790dcc5f1a27f4851e745# Parent  33c1ff0ce3ae01a50d4d2257d3fa43fee2b10332
Automated merge with https://xanthippe/hg/portage

diff -r 4c7b804e2d37 -r 5c7895abbaa6 dev-java/maven/Manifest
--- a/dev-java/maven/Manifest	Fri Apr 24 15:25:49 2015 +0200
+++ b/dev-java/maven/Manifest	Fri May 01 00:37:20 2015 +0200
@@ -1,5 +1,7 @@
 AUX maven 5108 SHA256 ddce53375271fd6e9515350083fd4c97ae86213e5bdb9984faf770ccdac1ff10 SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b WHIRLPOOL 6f281693bcf3201e9aa245494dd4dec6b623adf19bf89a44461eadb27e6747c590cebe7c73b5f16b77f5eaa04991236ce6820cd0e5980d7e109f110338c6045c
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
 DIST apache-maven-3.3.1-bin.tar.gz 8059952 SHA256 153564900617218a126f78d2603d060d0a15f19f3ec1689fc2b7692a3c15b9aa SHA512 b5f601c6a321d2aecebd3582a40ab46943d07b4a690bbe9cbc084369fa1728556fb9758fa885665863f6ab9dd296c8efa4a50902684a9dd8b66ab1e79ea3d8ac WHIRLPOOL bea3d1c3bdb997aa702b47da1797070ad79ed3e76cbbd530a75e67f0262d20579b98c1d72a2554a02e268ecb9eedce18daa2bfbb0ef231540075348e58a8da97
+DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
 EBUILD maven-3.2.5.ebuild 1198 SHA256 56ea6f674eda20ec75de1d50258353091edeff10addde343305ee8fabdd5f816 SHA512 027c5a7e10da7d39d308afa1f65fb55aff03fd2a4a24f4cff951f7c568c641edbbb45af56d9088ed01e1f74c5f2f4357801a7235543554818facad52dd30102e WHIRLPOOL f01297d6df6e2d566ebf90f28fd93d9a016e9f29ea94019601e581d6979a7a700e5e499e7274dc6bedb0db829c1814259d89183cc2b7ff47aadb4a4d4e83a6d2
 EBUILD maven-3.3.1.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
+EBUILD maven-3.3.3.ebuild 1220 SHA256 58f3f6637a427d35ae09541d4ce6e899be102132682b80ebe84246c8391007c4 SHA512 086c7f0f6170a33c8655265106f36ed844059c33f77becba65db3428f4f2a335eb1b6cdcc460a5ec83594890c79516392a54c1464602df4f12e48fc51659a034 WHIRLPOOL 0262778af51326666228410356f4185354b683260baa34fbec1d691ebf1af55abc5ac90efc7f2bd851ca88860da61df0c2a44465274ed72de02520be720c4ed5
diff -r 4c7b804e2d37 -r 5c7895abbaa6 dev-java/maven/maven-3.3.3.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev-java/maven/maven-3.3.3.ebuild	Fri May 01 00:37:20 2015 +0200
@@ -0,0 +1,58 @@
+
+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.3"
+KEYWORDS="amd64 x86"
+
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )"
+
+RDEPEND=">=virtual/jdk-1.7
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -fv "${S}"/bin/*.bat "${S}"/bin/*.cmd || die
+	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
+}
+
+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 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
+}