summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-11-19 16:50:20 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-11-19 16:50:20 +0000
commit131320a1d0f16a9cc8422bcf23daae16e250cf57 (patch)
treef59306855d9768dde7abe7f03f9122d1e8cc0d02 /app-portage
parentrequire rtmpdump 2.2f, bug #345609 by Thomas Raschbacher <lordvan@gentoo.org> (diff)
downloadgentoo-2-131320a1d0f16a9cc8422bcf23daae16e250cf57.tar.gz
gentoo-2-131320a1d0f16a9cc8422bcf23daae16e250cf57.tar.bz2
gentoo-2-131320a1d0f16a9cc8422bcf23daae16e250cf57.zip
Import Gentoo Prefix changes. Bump to EAPI3, add keywords, use EROOT. Approved by tools-portage team
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/gentoolkit/ChangeLog7
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild17
2 files changed, 17 insertions, 7 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index a1d76803962a..8a6c86681986 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-portage/gentoolkit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.197 2010/11/19 14:24:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.198 2010/11/19 16:50:20 darkside Exp $
+
+ 19 Nov 2010; Jeremy Olexa <darkside@gentoo.org>
+ gentoolkit-0.3.0_rc11-r1.ebuild:
+ Import Gentoo Prefix changes. Bump to EAPI3, add keywords, use EROOT.
+ Approved by tools-portage team
*gentoolkit-0.3.0_rc11-r1 (19 Nov 2010)
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
index 0dc63da8819a..4033b9f75952 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.1 2010/11/19 14:24:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.2 2010/11/19 16:50:20 darkside Exp $
-EAPI="2"
+EAPI="3"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS="1"
RESTRICT_PYTHON_ABIS="2.[45]"
@@ -21,7 +21,7 @@ IUSE=""
# Drop "~m68k ~s390 ~sh ~sparc-fbsd ~x86-fbsd" due to dev-python/argparse dependency
# Note: argparse is provided in python 2.7 and 3.2
# KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}
@@ -48,9 +48,14 @@ src_install() {
# Create cache directory for revdep-rebuild
dodir /var/cache/revdep-rebuild
keepdir /var/cache/revdep-rebuild
- fowners root:root /var/cache/revdep-rebuild
+ use prefix || fowners root:root /var/cache/revdep-rebuild
fperms 0700 /var/cache/revdep-rebuild
+ # remove on Gentoo Prefix platforms where it's broken anyway
+ if use prefix; then
+ [[ ${CHOST} != *-aix* ]] && rm "${ED}"/usr/bin/revdep-rebuild
+ fi
+
# Can distutils handle this?
dosym eclean /usr/bin/eclean-dist
dosym eclean /usr/bin/eclean-pkg
@@ -60,8 +65,8 @@ pkg_postinst() {
distutils_pkg_postinst
# Make sure that our ownership and permissions stuck
- chown root:root "${ROOT}/var/cache/revdep-rebuild"
- chmod 0700 "${ROOT}/var/cache/revdep-rebuild"
+ use prefix || chown root:root "${EROOT}/var/cache/revdep-rebuild"
+ chmod 0700 "${EROOT}/var/cache/revdep-rebuild"
einfo
einfo "For further information on gentoolkit, please read the gentoolkit"