Update dependency after package move of eselect modules to app-eselect.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 675a7ebbb85b97c173be6496225a78bed27c744f..56eef1c1194ea43add47107514e0808d03d379a2 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1579 2015/03/29 17:13:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1580 2015/03/31 18:43:33 ulm Exp $
+
+  31 Mar 2015; Ulrich Müller <ulm@gentoo.org> java-vm-2.eclass,
+  vdr-plugin-2.eclass, gnat.eclass, gnatbuild.eclass, myspell.eclass,
+  python.eclass:
+  Update dependency after package move of eselect modules to app-eselect.
 
   29 Mar 2015; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
   Drop dev-qt/designer[-phonon] dep now that blockers are resolved (bug

diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass
index a22c9ad8bcb586dca551fc1f308993780f6a6abd..79686b0503a7845abb81e2cfd8e3b85a0a6a227e 100644 (file)
--- a/eclass/gnat.eclass
+++ b/eclass/gnat.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.42 2012/06/02 19:16:31 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.43 2015/03/31 18:43:33 ulm Exp $
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
@@ -40,7 +40,7 @@ DESCRIPTION="Common procedures for building Ada libs using split gnat compilers"
 
 # make sure we have an appropriately recent eselect-gnat installed, as we are
 # using some common code here.
-DEPEND=">=app-admin/eselect-gnat-1.3"
+DEPEND=">=app-eselect/eselect-gnat-1.3"
 
 
 # ----------------------------------

diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index fa5f7c34883db761700441b64c1b2c816204fd76..8fa875565a74caa4d0a2b2ead31647a757a6bb01 100644 (file)
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.63 2014/10/17 13:17:30 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.64 2015/03/31 18:43:33 ulm Exp $
 #
 # Authors: George Shapovalov <george@gentoo.org>
 #          Steve Arnold <nerdboy@gentoo.org>
@@ -27,11 +27,11 @@ EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_postrm src_unpack src_compile src_in
 IUSE="nls"
 # multilib is supported via profiles now, multilib usevar is deprecated
 
-DEPEND=">=app-admin/eselect-gnat-1.3
-          sys-devel/bc
+DEPEND=">=app-eselect/eselect-gnat-1.3
+       sys-devel/bc
 "
 
-RDEPEND="app-admin/eselect-gnat"
+RDEPEND="app-eselect/eselect-gnat"
 
 # Note!
 # It may not be safe to source this at top level. Only source inside local

diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index fcaf14e7361bf506f0733a0a7f6510acc30eaedf..5f69833defd6d14d39af541a5eb2526bf5709399 100644 (file)
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.47 2014/07/22 06:38:56 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.48 2015/03/31 18:43:33 ulm Exp $
 
 # @ECLASS: java-vm-2.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm
 
 RDEPEND="
        =dev-java/java-config-2*
-       || ( app-admin/eselect-java <dev-java/java-config-2.2 )"
+       || ( app-eselect/eselect-java <dev-java/java-config-2.2 )"
 DEPEND="${RDEPEND}"
 has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
 
@@ -50,7 +50,7 @@ JAVA_VM_BUILD_ONLY="${JAVA_VM_BUILD_ONLY:-FALSE}"
 # @FUNCTION: java-vm-2_pkg_setup
 # @DESCRIPTION:
 # default pkg_setup
-# 
+#
 # Initialize vm handle.
 
 java-vm-2_pkg_setup() {
@@ -254,7 +254,7 @@ set_java_env() {
 # @DESCRIPTION:
 # Set PaX markings on all JDK/JRE executables to allow code-generation on
 # the heap by the JIT compiler.
-# 
+#
 # The markings need to be set prior to the first invocation of the the freshly
 # built / installed VM. Be it before creating the Class Data Sharing archive or
 # generating cacerts. Otherwise a PaX enabled kernel will kill the VM.

diff --git a/eclass/myspell.eclass b/eclass/myspell.eclass
index 95c0661bead722b100202bc9873587d3797772a7..ada213f1a410c63d14e494d4a6a0551d7f2b4737 100644 (file)
--- a/eclass/myspell.eclass
+++ b/eclass/myspell.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/myspell.eclass,v 1.9 2014/01/05 11:39:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/myspell.eclass,v 1.10 2015/03/31 18:43:33 ulm Exp $
 
 # Author: Kevin F. Quinn <kevquinn@gentoo.org>
 # Packages: app-dicts/myspell-*
@@ -26,7 +26,7 @@ MYSPELL_DICTBASE="/usr/share/myspell"
 
 # Legacy variable for dictionaries installed before eselect-oodict existed
 # so has to remain for binpkg support.  This variable is unmaintained -
-# if you have a problem with it, emerge app-admin/eselect-oodict.
+# if you have a problem with it, emerge app-eselect/eselect-oodict.
 # The location for openoffice softlinks
 MYSPELL_OOOBASE="/usr/lib/openoffice/share/dict/ooo"
 
@@ -156,7 +156,7 @@ myspell_src_install() {
 # and create softlinks indicated by dictionary.lst.<lang>
 myspell_pkg_postinst() {
        # Update for known applications
-       if has_version ">=app-admin/eselect-oodict-20060706"; then
+       if has_version ">=app-eselect/eselect-oodict-20060706"; then
                if has_version app-office/openoffice; then
                        eselect oodict set myspell-$(get_myspell_lang)
                fi
@@ -167,14 +167,14 @@ myspell_pkg_postinst() {
                fi
                return
        fi
-       if has_version app-admin/eselect-oodict; then
+       if has_version app-eselect/eselect-oodict; then
                eselect oodict set myspell-$(get_myspell_lang)
                return
        fi
 
        # Legacy code for dictionaries installed before eselect-oodict existed
        # so has to remain for binpkg support.  This code is unmaintained -
-       # if you have a problem with it, emerge app-admin/eselect-oodict.
+       # if you have a problem with it, emerge app-eselect/eselect-oodict.
        [[ -d ${MYSPELL_OOOBASE} ]] || return
        # This stuff is here, not in src_install, as the softlinks are
        # deliberately _not_ listed in the package database.
@@ -208,7 +208,7 @@ myspell_pkg_postinst() {
 # the dictionary.<lang>.lst file)
 myspell_pkg_preinst() {
        # Update for known applications
-       if has_version ">=app-admin/eselect-oodict-20060706"; then
+       if has_version ">=app-eselect/eselect-oodict-20060706"; then
                if has_version app-office/openoffice; then
                        # When building from source, the default library path is correct
                        eselect oodict unset myspell-$(get_myspell_lang)
@@ -222,7 +222,7 @@ myspell_pkg_preinst() {
                return
        fi
        # Previous versions of eselect-oodict didn't cater for -bin on amd64
-       if has_version app-admin/eselect-oodict; then
+       if has_version app-eselect/eselect-oodict; then
                eselect oodict unset myspell-$(get_myspell_lang)
                return
        fi
@@ -230,7 +230,7 @@ myspell_pkg_preinst() {
        # Legacy code for dictionaries installed before eselect-oodict existed
        # Don't delete this; needed for uninstalls and binpkg support.
        # This code is unmaintained - if you have a problem with it,
-       # emerge app-admin/eselect-oodict.
+       # emerge app-eselect/eselect-oodict.
        local filen dictlst entry fields removeentry suffix
        dictlst="dictionary.lst.$(get_myspell_lang)"
        [[ -d ${MYSPELL_OOOBASE} ]] || return

diff --git a/eclass/python.eclass b/eclass/python.eclass
index 3164704812d2acf6a8219d643a861f354d88929f..d89ee23119e12c04fce1a7c661097af71baca204 100644 (file)
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.170 2014/11/20 15:32:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.171 2015/03/31 18:43:33 ulm Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -260,7 +260,7 @@ _python_parse_PYTHON_DEPEND() {
 }
 
 if _python_implementation; then
-       DEPEND=">=app-admin/eselect-python-20091230"
+       DEPEND=">=app-eselect/eselect-python-20091230"
        RDEPEND="${DEPEND}"
        PDEPEND="app-admin/python-updater"
 fi

diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index 9a20bb43e99091cb73d516f1608074eb614ad47d..1aa107757d937538d3fdae900d06b128ee717487 100644 (file)
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.31 2015/01/05 18:15:06 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.32 2015/03/31 18:43:33 ulm Exp $
 
 # @ECLASS: vdr-plugin-2.eclass
 # @MAINTAINER:
@@ -101,8 +101,8 @@
 inherit eutils flag-o-matic multilib toolchain-funcs unpacker
 
 case ${EAPI:-0} in
-    4|5) ;;
-    *) die "EAPI ${EAPI} unsupported."
+       4|5) ;;
+       *) die "EAPI ${EAPI} unsupported."
 esac
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
@@ -125,7 +125,7 @@ COMMON_DEPEND=">=media-tv/gentoo-vdr-scripts-0.4.2"
 DEPEND="${COMMON_DEPEND}
        virtual/linuxtv-dvb-headers"
 RDEPEND="${COMMON_DEPEND}
-       >=app-admin/eselect-vdr-0.0.2"
+       >=app-eselect/eselect-vdr-0.0.2"
 
 if [[ "${GENTOO_VDR_CONDITIONAL:-no}" = "yes" ]]; then
        IUSE="${IUSE} vdr"