Add the configuration to CONFIG_PROTECT, bug #342901.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

8 files changed, 25 insertions, 143 deletions

diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 24b8e7314d6b..8a665542979b 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.63 2010/10/29 18:41:24 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.64 2010/10/29 18:47:08 caster Exp $
+
+  29 Oct 2010; Vlastimil Babka <caster@gentoo.org> -maven-bin-2.0.8.ebuild,
+  -maven-bin-2.0.9.ebuild, -maven-bin-2.0.10-r1.ebuild,
+  maven-bin-2.0.11.ebuild, maven-bin-2.1.0.ebuild, maven-bin-2.2.1.ebuild:
+  Add the configuration to CONFIG_PROTECT, bug #342901.
 
 *maven-bin-3.0 (29 Oct 2010)
 
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 229bac2c87e6..9fa9b9f5e8bc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,20 +1,15 @@
 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.0.8-bin.tar.bz2 1360480 RMD160 dc490a17da6b0639762122554df66fbd48e4b2ad SHA1 7e9cc2778246103f09d9930c263e57b73d60f44c SHA256 5169a5de37d96a300e7a0b9141a678edd2bc3e49586f342401b31f4e2fde5af1
-DIST apache-maven-2.0.9-bin.tar.bz2 2018028 RMD160 5687ddb796c17533e42c08ef5ac53a3fa4fa26c2 SHA1 1890a33aac8f23c2a97f4858a1eb0edc13b898e9 SHA256 65b5b30b03606ae0651269f663bffc660e5227a8df85f9cf48b7058e38b2e6a9
 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 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-2.0.10-r1.ebuild 1064 RMD160 c32c350051a9ad337c994f5fcce36376450644ed SHA1 7d92d5f974c1362df160698519061a75c6712722 SHA256 648283e29efc08aa1c5abf51df848f2c392235ac92fb1b76634624305000a88b
 EBUILD maven-bin-2.0.10.ebuild 1024 RMD160 7b8518567ccbfdaf02aef7b7584c53ccb6978932 SHA1 5a9a2d53d4f079dac99ed32479b2de86ff87cdef SHA256 f098e7e9d89172982fa19d299231d148e1686a32830ad25c178de9fae7e4292f
-EBUILD maven-bin-2.0.11.ebuild 1057 RMD160 cc58e4c852d92cb9391a0f0e63d17cab834ff916 SHA1 82bccadc5c9d0db416f9500b0cbea07a4a3fe430 SHA256 6a873a750e9e03937e4e8a607e255b6a31929a6a69a332b8be88eab4b0edc2bc
-EBUILD maven-bin-2.0.8.ebuild 1023 RMD160 6a39033fb69aee73b228ff2074a8f69fb22a91c0 SHA1 056f6a6f9c51168507dfa21216bccbd688a88a1d SHA256 23d27e448c6136c193a53013aac13e1f5cc1a909f38a4ef2d6e1a9b31d1734a2
-EBUILD maven-bin-2.0.9.ebuild 1023 RMD160 27e16dfb903239ee9275b4315325cdaadb0c68ff SHA1 a1ec8ab661878bf8b523482975c41591b3fd5b9c SHA256 33ea6853513ad4b128d4083bef7c8f4dfe85611fd64fc6e5f344f9b76081a8c2
-EBUILD maven-bin-2.1.0.ebuild 1058 RMD160 03dafefd97d5b9cc4e0d31ed51a65522ffe5da8d SHA1 b0cc7c5a1a51e21534650e5b3a8b08ec10682e12 SHA256 1609904d436813719aad71cc7ee38d175162bd3aa8de99869f77bfcd53967a0d
-EBUILD maven-bin-2.2.1.ebuild 1058 RMD160 96f96bed5f1c6b83239b4c084a7bd7f5382fdd3f SHA1 ae94cadb621707c72ee990b49a6410f213483b9f SHA256 4c5a0262c81898126ae1e31c7e168f0169ea3723e887e8259a99c1e9c77fa604
+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.ebuild 1250 RMD160 3e12e3e5c4a438abc4fcb0890fe86393d973c36e SHA1 b12f37583cf094cf69a9755ea85bc22a2840da4b SHA256 b592154a1908fd1c85c9f3b034cb32b28cb987352eb3df215018d9eba204656d
-MISC ChangeLog 10856 RMD160 4850167ccac05212dd2ee413c76d73ea04719314 SHA1 0856e00600eeacafc687a64f1aa6e3b5801c127f SHA256 53d71fbb37c5d68c052854d0690c1f5b08bd6525c3b86cb604a8c35db8a268f1
+MISC ChangeLog 11120 RMD160 380beceb619bd9fb2beec994ac4f9cbf3497049e SHA1 93fbe2232954e723c2a0e2a01b59f1d1742c487e SHA256 84c533f8022da3a5db1e661cf16a00efa11fda0c4d6cce4ed98a41f3de16d330
 MISC metadata.xml 532 RMD160 23fa79fc26d775ecf394078ea2b437c13fcb1c1c SHA1 9788d76408e6137cfac15b1cbe453f1f29835b9a SHA256 737cab248d8870cc15bf2526d49b4e1a92ad53078f466210337075c1c57e138f
diff --git a/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild b/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild
deleted file mode 100644
index 45bad150fc5c..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,44 +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-r1.ebuild,v 1.2 2009/10/26 08:01:29 volkmar 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
-	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}
-}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11.ebuild b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
index 45736157f2a1..72596935801e 100644
--- a/dev-java/maven-bin/maven-bin-2.0.11.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # 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-2.0.11.ebuild,v 1.3 2010/06/25 11:25:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.0.11.ebuild,v 1.4 2010/10/29 18:47:08 caster Exp $
 
 EAPI="2"
 
@@ -41,4 +41,8 @@ src_install() {
 
 	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.0.8.ebuild b/dev-java/maven-bin/maven-bin-2.0.8.ebuild
deleted file mode 100644
index d940e1bb114a..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 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.8.ebuild,v 1.6 2008/03/28 22:56:12 maekke 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.9.ebuild b/dev-java/maven-bin/maven-bin-2.0.9.ebuild
deleted file mode 100644
index 32300e9ca14a..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 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.9.ebuild,v 1.3 2008/10/25 16:59:57 nixnut 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.1.0.ebuild b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
index 6e88ce1bebea..4350183f4103 100644
--- a/dev-java/maven-bin/maven-bin-2.1.0.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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-2.1.0.ebuild,v 1.4 2010/06/25 11:25:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.1.0.ebuild,v 1.5 2010/10/29 18:47:08 caster Exp $
 
 inherit java-pkg-2
 
@@ -41,4 +41,8 @@ src_install() {
 
 	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.ebuild b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
index edcc2b616864..9260023edee0 100644
--- a/dev-java/maven-bin/maven-bin-2.2.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.2.1.ebuild,v 1.4 2010/06/25 11:25:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.5 2010/10/29 18:47:08 caster Exp $
 
 inherit java-pkg-2
 
@@ -41,4 +41,8 @@ src_install() {
 
 	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}"
 }