Add blockers for upcoming packages related to java-config-2.2, so that they are mutual. Remove old.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4E61DE84

6 files changed, 23 insertions, 253 deletions

diff --git a/app-admin/eselect-maven/ChangeLog b/app-admin/eselect-maven/ChangeLog
index 8865d8762432..e71a1ba864e5 100644
--- a/app-admin/eselect-maven/ChangeLog
+++ b/app-admin/eselect-maven/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-maven
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/ChangeLog,v 1.15 2012/03/06 21:09:42 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/ChangeLog,v 1.16 2013/04/06 10:25:13 caster Exp $
+
+  06 Apr 2013; Vlastimil Babka <caster@gentoo.org> -eselect-maven-0.1.ebuild,
+  -eselect-maven-0.2.ebuild, eselect-maven-0.2-r1.ebuild, -files/maven.eselect:
+  Add blockers for upcoming packages related to java-config-2.2, so that they
+  are mutual. Remove old.
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> eselect-maven-0.2-r1.ebuild:
   Marking eselect-maven-0.2-r1 ppc for bug 387691
diff --git a/app-admin/eselect-maven/Manifest b/app-admin/eselect-maven/Manifest
index 9403cadae98c..70c1fb30500b 100644
--- a/app-admin/eselect-maven/Manifest
+++ b/app-admin/eselect-maven/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX maven-0.2.eselect 3756 SHA256 4bb50475a8582ca7aacfc98c6a41731ccf3693e39044a90a9fb4926cf1425e50 SHA512 71f2bc48befe4d29a1a450aae3be845e62433e7aad0493bb49e97f77f58ffb7ac59232bab3194d098d6eb0b4372bbf3e9d10356fb483f6ab2fd73daf05f506c6 WHIRLPOOL 029bca9a5495ca3008c7997c50e50c2ae641c667fb0fe731ce534e7a4e5a0c4dfa173d42dd216f08115c23466b686af743fa08e0369fc381e909be386cc33c7a
-AUX maven.eselect 3973 SHA256 936763f3e8c3eb051414185cd0d54dd86059f2d176eb1078a8856d4bca6b0944 SHA512 1fcc03d77fe8904c7cede87e95b4f2b555a8c1056cb444677598148182267ddfa192d0e6ea08efd1d93d8e9704bdec2a056c88a6dac051cd2153d18f008845dc WHIRLPOOL 80eda1614790fc62340f92ca510d1b1e17c537594a3f10098799a7dd3023b8505cce8db6aead915e9b06ab7800fd8258550cf86e673d94c6c309bad5cb548120
-EBUILD eselect-maven-0.1.ebuild 714 SHA256 642012becdb40b08102f4a79c78a08104ca3472b7e259aa957d8917ec0f95c0d SHA512 a0db22a3185f60b0a6721af7bd3dabb1fc14d75e5fa7fb047e9f7bd126a8508cf2dea6bd18eac47ae38e249ea988f42625b8ff6db8c79f0390b2b6c88bff43df WHIRLPOOL 62536b985026bd15d024b01d9baf48d52bcc78a8212f68dd504a05f2c9474f9384a0cbe6d80c7b06aa577e41f0e8532c988242bd280d7a1e877385b072f1c638
-EBUILD eselect-maven-0.2-r1.ebuild 765 SHA256 f5f56da04806947b8f4babddc8acee84549b1897220251bb5c185090f43e1f38 SHA512 41594039e716a99e2e809fecd30eb9760088a5fda2a20bcc26d1bf891e0c48e4e7200fdf0a7936ec10e1adb241d9cf2809824ca07759d2e5955e99355cb1621c WHIRLPOOL d680288749778f311371f4ac7f5b169c37a7a28b7e5b7caec82a84f0b658e4b79ddb533f32b8fe2cbf1b1ef3e9ecd427bbb248633e666e4ce4ade667907de921
-EBUILD eselect-maven-0.2.ebuild 738 SHA256 ff30b40f4f81b7a8f6a70ad9a2fc6ac002301b30f3856c5e64ae6cc082c638c3 SHA512 882a6c9e04078ea99760c2c76284751e03c611dd3e81b2652fa80b153de6d667dcb7ac35b793ab8f0763ad4bae9f5b52195c244ffd57a9da0a148d009c73e0ab WHIRLPOOL 24aa9a8b924b1802d377dc4ca744c0f8ee741c7253d0f0b4348196f12e827219020def15eb2f47628e3a64adb79495f1a5eb24b913cf1b648e4cc5cf83d2ac2e
-MISC ChangeLog 2526 SHA256 d578c01964ce55349fdf6fdb4b819e4c11573362beb3f004b0f717774f776708 SHA512 4bf0d9f23be533018a7acf7fd7fefdcd0ad52edc4cfd369022c65d5a10b6628126aef3120276d50ecb8d75273cc4a1927bf506ca1ace72ab3039751a2af6242e WHIRLPOOL 9b1d70458292941585abe19e92eda5a7f33804f94958a9d6daf119e75cc4a9b178cc62e8fe18c9c32cc349860e3480057d63a04856aa69f92142d1cfd24b2f77
+EBUILD eselect-maven-0.2-r1.ebuild 790 SHA256 aeb4c993c1073d304533d8f1e6f8efb645c8ec0d6376dc092277dbc4f4053453 SHA512 ed7f19fdf044ea29c2de08dd2193a9d0c7cf515ecddd09294c0a96e73d8ae54f81fbded7abec50f536d8cd24cdbf086d090fb234dd8a82cc0a8073ea1e0ec642 WHIRLPOOL 2a571b31be7139bd9ca10a54671141c4594ded5e8d268cba361246062ebc5021f56d40895a1a9d7f1718d783b92b58ab566878fb2291b5696bd077cb669497ac
+MISC ChangeLog 2789 SHA256 40ef26cd2c218c68da5c612d4c7be5a5a10a97c773e0b1a314f70efd376bd708 SHA512 d8bd6ae50004f532cdb868792efca431f53d773dfd1986768e6b2e11f24881f6a3781b115528f98d8f7fd2e4f2111a9b9fd8bd89b63d23bc2451666019a47150 WHIRLPOOL 87a8d8c305a367615658c6b6e8d4722e4432aeb4072d40ec938595046b5159091e2db013b465df9a7939f61fa308bf91304067ce4ecafc74b9e9b7475f97200d
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlFf+AoACgkQtbrAj05h3oRwagCgjhpvW3wS2vJCeDnikkoBnWbz
+dJcAn0iMHaND7/kXutbvovYvRLPzhnrd
+=Y8Yf
+-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-maven/eselect-maven-0.1.ebuild b/app-admin/eselect-maven/eselect-maven-0.1.ebuild
deleted file mode 100644
index 29aba99931e3..000000000000
--- a/app-admin/eselect-maven/eselect-maven-0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.1.ebuild,v 1.6 2010/01/01 19:21:01 fauli Exp $
-
-EAPI=1
-
-DESCRIPTION="Manages Maven symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.10
-	!<dev-java/maven-bin-2.0.10-r1:2.1"
-PDEPEND="
-|| (
-	dev-java/maven-bin:2.2
-	dev-java/maven-bin:2.1
-	dev-java/maven-bin:2.0
-)"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}/maven.eselect" || die "doins failed"
-}
diff --git a/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild b/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild
index 4b8d31a9f968..58e867c810b9 100644
--- a/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild
+++ b/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild,v 1.4 2012/03/06 21:09:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild,v 1.5 2013/04/06 10:25:13 caster Exp $
 
 EAPI=3
 
@@ -14,7 +14,8 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.8
-	!<dev-java/maven-bin-2.0.10-r1:2.1"
+	!<dev-java/maven-bin-2.0.10-r1:2.1
+	!app-admin/eselect-java"
 PDEPEND="
 || (
 	dev-java/maven-bin:3.0
diff --git a/app-admin/eselect-maven/eselect-maven-0.2.ebuild b/app-admin/eselect-maven/eselect-maven-0.2.ebuild
deleted file mode 100644
index 1030bf179694..000000000000
--- a/app-admin/eselect-maven/eselect-maven-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.2.ebuild,v 1.4 2010/06/01 13:14:47 josejx Exp $
-
-EAPI=3
-
-DESCRIPTION="Manages Maven symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.8
-	!<dev-java/maven-bin-2.0.10-r1:2.1"
-PDEPEND="
-|| (
-	dev-java/maven-bin:2.2
-	dev-java/maven-bin:2.1
-	dev-java/maven-bin:2.0
-)"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
-		|| die "newins failed"
-}
diff --git a/app-admin/eselect-maven/files/maven.eselect b/app-admin/eselect-maven/files/maven.eselect
deleted file mode 100644
index 15f84f3a0279..000000000000
--- a/app-admin/eselect-maven/files/maven.eselect
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: maven.eselect,v 1.1 2009/05/12 19:08:17 ali_bush Exp $
-
-DESCRIPTION="Manage Maven targets"
-MAINTAINER="jieryn@gmail.com"
-VERSION="0.1"
-
-MVN="${ROOT}/usr/bin/mvn"
-
-# find a list of mvn symlink targets, best first.
-find_targets() {
-	for f in $(ls -r "${MVN}"-[0-9]* 2> /dev/null) ; do
-		if [[ -f "${f}" ]] ; then
-			echo $(basename "${f}")
-		fi
-	done
-}
-
-# get a named or numbered target.
-find_target() {
-	local target=${1}
-
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		[[ -z "${targets}" ]] && die -q "No targets found!"
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	if [[ "${target}" = mvn-[0-9]* ]] && [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
-		echo ${target}
-	else
-		die -q "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-# try to remove the mvn symlink.
-remove_symlink() {
-	rm "${MVN}" &>/dev/null
-}
-
-# determine the current target.
-get_target() {
-	local canonicalised=$(canonicalise "${MVN}")
-	echo $(basename "${canonicalised}")
-}
-
-# set the Maven symlink.
-set_symlink() {
-	local target=$(find_target "${1}")
-	remove_symlink
-	ln -s "${ROOT}/usr/bin/${target}" "${MVN}" || \
-		die "Couldn't set ${target} symlink."
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show current Maven target"
-}
-
-do_show() {
-	if [[ ${#} -gt 0 ]]; then
-		die -q "No parameters allowed."
-	fi
-
-	if [[ -L "${MVN}" ]] ; then
-		get_target
-		return 0
-	elif [[ -e "${MVN}" ]] ; then
-		echo "(not a symlink)" >&2
-		return 1
-	else
-		echo "(unset)" >&2
-		return 1
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available Maven targets"
-}
-
-do_list() {
-	if [[ ${#} -gt 0 ]]; then
-		die -q "Usage error: no parameters allowed."
-	fi
-
-	local i targets
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]] ; then
-		local canonicalised basename
-
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			canonicalised=$(canonicalise "${MVN}")
-			basename=$(basename "${canonicalised}")
-
-			if [[ "${targets[${i}]}" = "${basename}" ]] ; then
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-			fi
-		done
-
-		write_list_start "Available Maven targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new Maven target"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ $# -gt 1 ]]; then
-		die -q "Too many parameters. Expected only one."
-	fi
-
-	local target=${1}
-
-	if [[ -z "${target}" ]] ; then
-		die -q "You didn't give me a target name or number."
-	elif [[ -L "${MVN}" ]] ; then
-		if ! remove_symlink ; then
-			die -q "Can't remove existing Maven provider."
-		elif ! set_symlink "${1}" ; then
-			die -q "Can't set new Maven provider."
-		fi
-	elif [[ -e "${MVN}" ]] ; then
-		write_warning_msg "Can't set a new Maven provider. There's a file in the way at ${MVN}. You can try removing it manually, and then re-running this command."
-	else
-		set_symlink "${target}" || die -q "Wasn't able to set a new provider."
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Set the Maven target to the latest if the current target is invalid or if the given target is the latest"
-}
-
-describe_update_options() {
-	echo "target (optional) : Target name (from 'list' action)"
-}
-
-describe_update_parameters() {
-	echo "<target>"
-}
-
-do_update() {
-	if [[ $# -gt 1 ]] ; then
-		die -q "Too many parameters. Expected only one."
-	fi
-
-	# For pkg_postrm
-	if [[ ! $(find_targets) ]]; then
-		remove_symlink
-		return
-	fi
-
-	local canonicalised=$(canonicalise "${MVN}")
-
-	if [[ ! -L "${MVN}" ]] || [[ ! -f "${canonicalised}" ]] ; then
-		do_set 1
-	elif [[ -n "${1}" ]] ; then
-		# Check whether target name is valid.
-		find_target "${1}" > /dev/null
-
-		if [[ "${1}" == "$(find_target 1)" ]] ; then
-			do_set 1
-		fi
-	fi
-}
-
-# vim: set ft=eselect :