Fix setup.py to work with EPREFIX changes in Portage (Bug 394909).

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 9a1fd981e8f37f3c77039f50ebe22f1444aa2b41..4297293a713ea0035146e23e4138abfdb0dec791 100644 (file)
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.239 2011/12/04 20:21:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.240 2011/12/19 20:27:28 fuzzyray Exp $
+
+*gentoolkit-0.3.0.4-r5 (19 Dec 2011)
+
+  19 Dec 2011; Paul Varner <fuzzyray@gentoo.org> +gentoolkit-0.3.0.4-r5.ebuild,
+  +files/0.3.0.4-setup-394909.patch:
+  Fix setup.py to work with EPREFIX changes in Portage (Bug 394909).
 
   04 Dec 2011; Michał Górny <mgorny@gentoo.org> gentoolkit-9999.ebuild,
   metadata.xml:

diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 00efefb2fc3e02a7c958eeb579b29b032435728e..48639bb455c24ee05ed0f3e56e628ae11fe597f8 100644 (file)
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -7,6 +7,7 @@ AUX 0.3.0.4-euse-379599.patch 1091 RMD160 78579fce2806eed8217458689c7a7896f0a826
 AUX 0.3.0.4-euse-382219.patch 1281 RMD160 b46acd5a8a8aa1d909a8f416a2f1277efbed8086 SHA1 ec671550ee471d21be844881b07274c1cfdac7a1 SHA256 c7ab9a06925db24f4a928329cb4ad611c5ddb3347a048dcc23a4aecbceb8e7b3
 AUX 0.3.0.4-euse.patch 857 RMD160 980e8614def7fb25c0957ff55d067c3c39c24d9d SHA1 0a7518fbac7c96aca5f44fa9f98b0932d6f2a6fe SHA256 1c8a97107417bb87e455425cd92b3cf62e09c268e959dfabaee9b6d4b082059b
 AUX 0.3.0.4-gentoolkit-375293.patch 783 RMD160 8ed8290cf695952747af9cfd1b3232295c04a396 SHA1 c9e184b10e0b23baedd45e5e1858f409a896d5c4 SHA256 ab903ceb3afcaf0f893d1600339ed04800794af89c2a155de0593e3a60b9124b
+AUX 0.3.0.4-setup-394909.patch 1442 RMD160 ebef64e8e0ed028224e10011b5c91b05c267dfb6 SHA1 ef653c6f88c67d647550b77c9ec811c5be75c27c SHA256 71c8bf41502e1933e9df09f93a55e9579f5b25abd333ba7b836a603e1d21aad8
 DIST gentoolkit-0.2.4.6.1.tar.gz 90135 RMD160 7cfe8a8a6e697bbab0d93ec6d82f5b0aee8bcc03 SHA1 82e8a785a753a9e86063dd4fff2f4f864e4224bb SHA256 d057ce14e037e313ae085ac70871a56bbc147efe9beae8fcf8c818afcaa63896
 DIST gentoolkit-0.3.0.4.tar.gz 180411 RMD160 f61d5532a90269a34c26d2c1731d5ba31359048f SHA1 eb373ba5069da8f2858f8afa4e40fe158501e94c SHA256 cc1fc031bf69a095a5cd2aab433f06e8eb3b5af2fef743bce5958c7f7f38803c
 EBUILD gentoolkit-0.2.4.6.1-r1.ebuild 2068 RMD160 0d340f33a4b80ab28c851cdf380851a532283bba SHA1 a7d0c0d82414dc8c086059815393ebdc9aedb406 SHA256 2995cfcc97fa965c6dcab8eb9ebbdcaddf32c99e019545403a7f66b17d7685ad
@@ -14,16 +15,15 @@ EBUILD gentoolkit-0.3.0.4-r1.ebuild 2740 RMD160 39c25434d49da1d06798aa7555564cda
 EBUILD gentoolkit-0.3.0.4-r2.ebuild 2845 RMD160 ca5d6b52b85b990ccb52eb311acff7fff9576cb8 SHA1 e3a8eb335d1de7c19493324f8f73f49beb0a68cb SHA256 fde95d24d38fd73f330234e3a8b28379599b7fe26637e07d5a3c44e5b0e3935f
 EBUILD gentoolkit-0.3.0.4-r3.ebuild 2893 RMD160 b2e0742a62c9d4e3bcc5616d6918b1597dca824d SHA1 f9d44103a508fcd024e468a854cf1b1ad5418bf9 SHA256 bd8876fac46b87731ce04786a04554f286013553b861c05faddcd05e3b907a17
 EBUILD gentoolkit-0.3.0.4-r4.ebuild 2926 RMD160 dd3409d62f0221e28523acac474c1b868c841148 SHA1 2c95a0477b761114a2853c811f3d01f7678041b1 SHA256 34bd1bf4edd2e2bf8cf8d375cdfe9327f08c7fa1055568c3f210c371fa3378c9
+EBUILD gentoolkit-0.3.0.4-r5.ebuild 2901 RMD160 7e9efe0d541f23abf2097064d23a20e9d23c1bbc SHA1 13a537a26d62e434843ed9c07ccde1bbbeb76061 SHA256 2c763efc4c7215bbad97f0055b9814d96bf0ad43d57a4778ed7f2bec05f384de
 EBUILD gentoolkit-0.3.0.4.ebuild 2667 RMD160 821a8de610472379b7495ec535a9806dc10a0481 SHA1 a19140ff5aca6f86a582b5be9aeef6fe55661830 SHA256 277430a4a0c299c9c0aca4c347038414b96c3dd60a987fc66b268a4145716ae1
 EBUILD gentoolkit-9999.ebuild 2292 RMD160 1993f955f6fdb753d5e49741ed13755b45e1b944 SHA1 9c74993040e3055bc57bcedf4191b8dd3a036712 SHA256 146e17f8f7c8ffd5eb1acdc6b14e7b24899baa43cb6a1982cbaf338bc746d4cd
-MISC ChangeLog 66104 RMD160 376db0cf261e6189788cd60a813190067bbefe5b SHA1 ec4b58e54a6f4109aabc325587a2904c637b66da SHA256 a677c5d8f2cfabe609e1b3d91c089b9bfbcc2d9e76a224cb8eacd6b52b8a29a5
+MISC ChangeLog 66331 RMD160 b941f37b07953e5b0a53dd3bea06629bb975fdf8 SHA1 b721a729661319dd72a3f23ac443dee3363fc26b SHA256 4edfeed4b2a657d77010fafe5e8a5b78bbadc701c45bc42fe6c85142e0d343ca
 MISC metadata.xml 533 RMD160 0152de4470e5d50e163742c83c85c33df6eac744 SHA1 09277159f109ebebfcab698232412d6423ac8e67 SHA256 c2897414e23eb46bb32560c236199e3cc94abfcb91b0e6b1f60177d8401879fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk7b1pgACgkQfXuS5UK5QB2VTwP+LSbRkAOKI8ZBtScECi4NzinV
-pvkKsyb671i+35ptkS6gCHt4Xl3EPGeC9uUbZSPQ2nD1v08ERwQ/JuNeqj07epUN
-qs9KkPuKqPU4RMXbYNXFb+/FDG28oIk+9vU+UPOYlOHsumKiAZw7Mi4HKB/b2Phq
-cP8JMSPOxIb1F0LfQnI=
-=GnN3
+iF4EAREIAAYFAk7vnj8ACgkQk7WB/7ncNMGnXwEAhSZ0Lj/tWS1ILreow5wYIUOi
+mse+WXdERk0YZJDqmoYA/0qJKoPJy9eA7QiKPJz5gkQ/W9SHwpkPOWo+feqMEAiC
+=xR48
 -----END PGP SIGNATURE-----

diff --git a/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch b/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
new file mode 100644 (file)
index 0000000..93bd626
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0.4-setup-394909.patch
@@ -0,0 +1,41 @@
+From 10aaed2b07c11065418d0e9e2c7aa52ae0837300 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Mon, 19 Dec 2011 13:38:40 -0600
+Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage (Bug
+ 394909).
+
+---
+ setup.py |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f65a933..1efba94 100755
+--- a/setup.py
++++ b/setup.py
+@@ -22,7 +22,7 @@ cwd = os.getcwd()
+ try: 
+       from portage.const import EPREFIX 
+ except ImportError: 
+-      EPREFIX='/' 
++      EPREFIX='' 
+ 
+ 
+ # Bash files that need `VERSION=""` subbed, relative to this dir:
+@@ -127,10 +127,10 @@ core.setup(
+       package_data = test_data,
+       scripts=(glob('bin/*')),
+       data_files=(
+-              (os.path.join(EPREFIX, 'etc/env.d'), ['data/99gentoolkit-env']),
+-              (os.path.join(EPREFIX, 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
+-              (os.path.join(EPREFIX, 'etc/eclean'), glob('data/eclean/*')),
+-              (os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/*')),
++              (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/env.d'), ['data/99gentoolkit-env']),
++              (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/revdep-rebuild'), ['data/revdep-rebuild/99revdep-rebuild']),
++              (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/eclean'), glob('data/eclean/*')),
++              (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/*')),
+       ),
+       cmdclass={
+               'test': load_test(),
+-- 
+1.7.8
+

diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
new file mode 100644 (file)
index 0000000..da7ed4b
--- /dev/null
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.4-r5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 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.4-r5.ebuild,v 1.1 2011/12/19 20:27:28 fuzzyray Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45]"
+PYTHON_USE_WITH="xml"
+PYTHON_NONVERSIONED_EXECUTABLES=(".*")
+
+inherit distutils python eutils
+
+DESCRIPTION="Collection of administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Note: argparse is provided in python 2.7 and 3.2 (Bug 346005)
+DEPEND="sys-apps/portage"
+RDEPEND="${DEPEND}
+       !<=app-portage/gentoolkit-dev-0.2.7
+       dev-python/argparse
+       || ( app-misc/realpath sys-freebsd/freebsd-bin )
+       sys-apps/gawk
+       sys-apps/grep"
+
+distutils_src_compile_pre_hook() {
+       echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version
+       VERSION="${PVR}" "$(PYTHON)" setup.py set_version \
+               || die "setup.py set_version failed"
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PV}-euse-376393.patch"
+       epatch "${FILESDIR}/${PV}-euse-379599.patch"
+       epatch "${FILESDIR}/${PV}-gentoolkit-375293.patch"
+       epatch "${FILESDIR}/${PV}-equery-380573.patch"
+       epatch "${FILESDIR}/${PV}-euse-382219.patch"
+       epatch "${FILESDIR}/${PV}-setup-394909.patch"
+}
+
+src_install() {
+       python_convert_shebangs -r "" build-*/scripts-*
+       distutils_src_install
+
+       # Create cache directory for revdep-rebuild
+       dodir /var/cache/revdep-rebuild
+       keepdir /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
+               elog "The revdep-rebuild command is removed, the preserve-libs"
+               elog "feature of portage will handle issues."
+               rm "${ED}"/usr/bin/revdep-rebuild
+               rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
+               rm -rf "${ED}"/etc/revdep-rebuild
+               rm -rf "${ED}"/var
+       fi
+
+       # Can distutils handle this?
+       dosym eclean /usr/bin/eclean-dist
+       dosym eclean /usr/bin/eclean-pkg
+}
+
+pkg_postinst() {
+       distutils_pkg_postinst
+
+       einfo
+       einfo "For further information on gentoolkit, please read the gentoolkit"
+       einfo "guide: http://www.gentoo.org/doc/en/gentoolkit.xml"
+       einfo
+       einfo "Another alternative to equery is app-portage/portage-utils"
+       ewarn
+       ewarn "glsa-check since gentoolkit 0.3 has modified some output,"
+       ewarn "options and default behavior. The list of injected GLSAs"
+       ewarn "has moved to /var/lib/portage/glsa_injected, please"
+       ewarn "run 'glsa-check -p affected' before copying the existing checkfile."
+}