diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-02-24 16:31:35 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-02-24 16:31:35 +0000 |
| commit | 4e408ea552623c7b5a56885ea020336ae2b6b424 (patch) | |
| tree | dea93b7f4b74093431ae98de8cc190291224a822 /eclass | |
| parent | Version bump (diff) | |
| download | historical-4e408ea552623c7b5a56885ea020336ae2b6b424.tar.gz historical-4e408ea552623c7b5a56885ea020336ae2b6b424.tar.bz2 historical-4e408ea552623c7b5a56885ea020336ae2b6b424.zip | |
Drop versionator eclass as it's not needed for a long time, also fixes bug #458728 that was caused by quoting IUSE. Thanks a lot to mgorny for doing the work.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/emul-linux-x86.eclass | 41 |
2 files changed, 15 insertions, 33 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 91cfc541996c..f7cd6a6dcb55 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.680 2013/02/22 14:42:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.681 2013/02/24 16:31:35 pacho Exp $ + + 24 Feb 2013; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass: + Drop versionator eclass as it's not needed for a long time, also fixes bug + #458728 that was caused by quoting IUSE. Thanks a lot to mgorny for doing the + work. 22 Feb 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass: Fix passing arguments to phases. diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index e0130aa0f5da..2f0257da2c1c 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.eclass @@ -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/eclass/emul-linux-x86.eclass,v 1.16 2013/01/12 16:53:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.17 2013/02/24 16:31:35 pacho Exp $ # # Original Author: Mike Doty <kingtaco@gentoo.org> @@ -8,37 +8,21 @@ # Purpose: Providing a template for the app-emulation/emul-linux-* packages # -inherit multilib versionator - -if version_is_at_least 20110129; then - IUSE="development" -else - IUSE="" -fi +inherit multilib case "${EAPI:-0}" in - 0|1) - EXPORT_FUNCTIONS src_unpack src_install - ;; - 2|3|4|5) - EXPORT_FUNCTIONS src_unpack src_prepare src_install + 3|4|5) + EXPORT_FUNCTIONS src_prepare src_install ;; *) die "EAPI=${EAPI} is not supported" ;; esac -if version_is_at_least 20110722; then - SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.xz" -else - if version_is_at_least 20110129; then - SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.bz2" - else - SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2" - fi -fi - DESCRIPTION="Provides precompiled 32bit libraries" #HOMEPAGE="http://amd64.gentoo.org/emul/content.xml" HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html" +SRC_URI="http://dev.gentoo.org/~pacho/emul/${P}.tar.xz" + +IUSE="+development" RESTRICT="strip" S=${WORKDIR} @@ -50,20 +34,13 @@ SLOT="0" DEPEND=">=sys-apps/findutils-4.2.26" RDEPEND="" -emul-linux-x86_src_unpack() { - unpack ${A} - cd "${S}" - has ${EAPI:-0} 0 1 && emul-linux-x86_src_prepare -} - emul-linux-x86_src_prepare() { ALLOWED=${ALLOWED:-^${S}/etc/env.d} - has development "${IUSE//+}" && use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig" + use development && ALLOWED="${ALLOWED}|/usr/lib32/pkgconfig" find "${S}" ! -type d ! '(' -name '*.so' -o -name '*.so.[0-9]*' ')' | egrep -v "${ALLOWED}" | xargs -d $'\n' rm -f || die 'failed to remove everything but *.so*' } emul-linux-x86_src_install() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" for dir in etc/env.d etc/revdep-rebuild ; do if [[ -d "${S}"/${dir} ]] ; then for f in "${S}"/${dir}/* ; do |