diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-04-21 23:25:34 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-04-21 23:25:34 +0000 |
| commit | c8b9ae4c3acb3c64e8266320ac9718d9c4e96183 (patch) | |
| tree | ca98e18005a4717c3de5e49d4da36f428bad5e16 /eclass | |
| parent | Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794). (diff) | |
| download | gentoo-2-c8b9ae4c3acb3c64e8266320ac9718d9c4e96183.tar.gz gentoo-2-c8b9ae4c3acb3c64e8266320ac9718d9c4e96183.tar.bz2 gentoo-2-c8b9ae4c3acb3c64e8266320ac9718d9c4e96183.zip | |
Remove pre-EAPI 2 code blocks (patch by mgorny, bug #458794).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/vim.eclass | 23 |
2 files changed, 10 insertions, 18 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d318e348febb..1319cff1f85a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.797 2013/04/21 23:24:24 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.798 2013/04/21 23:25:34 radhermit Exp $ + + 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass: + Remove pre-EAPI 2 code blocks (patch by mgorny, bug #458794). 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass: Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794). diff --git a/eclass/vim.eclass b/eclass/vim.eclass index d5e734855828..d419fea1feba 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.208 2013/04/21 23:24:24 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.209 2013/04/21 23:25:34 radhermit Exp $ # Authors: # Jim Ramsay <lack@gentoo.org> @@ -28,8 +28,6 @@ case "${EAPI:-0}" in die "vim.eclass no longer supports EAPI 0 or 1" ;; 2|3) - HAS_SRC_PREPARE=1 - HAS_USE_DEP=1 ;; *) die "Unknown EAPI ${EAPI}" @@ -58,13 +56,8 @@ fi IUSE="nls acl" -TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm" -if [[ $HAS_SRC_PREPARE ]]; then - TO_EXPORT="${TO_EXPORT} src_prepare src_configure" -else - TO_EXPORT="${TO_EXPORT} src_unpack" -fi -EXPORT_FUNCTIONS ${TO_EXPORT} +EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_configure \ + src_install src_test pkg_postinst pkg_postrm DEPEND="${DEPEND} >=app-admin/eselect-vi-1.1 @@ -243,13 +236,9 @@ vim_pkg_setup() { if [[ ${MY_PN} != "vim-core" ]] && use python; then # vim supports python-2 only python_set_active_version 2 - if [[ $HAS_USE_DEP ]]; then - # python.eclass only defines python_pkg_setup for EAPIs that support - # USE dependencies - python_pkg_setup - elif ! has_version "=dev-lang/python-2*[threads]"; then - die "You must build dev-lang/python with USE=threads" - fi + # python.eclass only defines python_pkg_setup for EAPIs that support + # USE dependencies + python_pkg_setup fi } |