diff options
author | 2013-04-06 10:25:13 +0000 | |
---|---|---|
committer | 2013-04-06 10:25:13 +0000 | |
commit | ba3b9dfdf7d292c149171377316bca2378325cb4 (patch) | |
tree | 372334a4a985f4daf22a3d5d27d2e1a71d0720d4 /app-admin/eselect-maven | |
parent | Add blockers for upcoming packages related to java-config-2.2, so that they a... (diff) | |
download | gentoo-2-ba3b9dfdf7d292c149171377316bca2378325cb4.tar.gz gentoo-2-ba3b9dfdf7d292c149171377316bca2378325cb4.tar.bz2 gentoo-2-ba3b9dfdf7d292c149171377316bca2378325cb4.zip |
Add blockers for upcoming packages related to java-config-2.2, so that they are mutual. Remove old.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)
Diffstat (limited to 'app-admin/eselect-maven')
-rw-r--r-- | app-admin/eselect-maven/ChangeLog | 9 | ||||
-rw-r--r-- | app-admin/eselect-maven/eselect-maven-0.1.ebuild | 27 | ||||
-rw-r--r-- | app-admin/eselect-maven/eselect-maven-0.2-r1.ebuild | 7 | ||||
-rw-r--r-- | app-admin/eselect-maven/eselect-maven-0.2.ebuild | 29 | ||||
-rw-r--r-- | app-admin/eselect-maven/files/maven.eselect | 187 |
5 files changed, 11 insertions, 248 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/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 : |