From 3467241df577bc26dd7f2270cf4a128e14bb9ead Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Mon, 19 Dec 2011 20:51:38 +0000 Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage. Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- app-portage/esearch/ChangeLog | 9 +++- app-portage/esearch/Manifest | 20 +++---- ...ch-1.0-r1.ebuild => esearch-1.0-r2.ebuild} | 5 +- app-portage/esearch/esearch-1.0.ebuild | 54 ------------------- ....0-fix-portage-eprefix-compatibility.patch | 38 +++++++++++++ 5 files changed, 57 insertions(+), 69 deletions(-) rename app-portage/esearch/{esearch-1.0-r1.ebuild => esearch-1.0-r2.ebuild} (89%) delete mode 100644 app-portage/esearch/esearch-1.0.ebuild create mode 100644 app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog index 9abf9aebeb64..b6476ef5449d 100644 --- a/app-portage/esearch/ChangeLog +++ b/app-portage/esearch/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/esearch # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.75 2011/12/16 22:09:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.76 2011/12/19 20:51:38 fuzzyray Exp $ + +*esearch-1.0-r2 (19 Dec 2011) + + 19 Dec 2011; Paul Varner + +files/1.0-fix-portage-eprefix-compatibility.patch, -esearch-1.0.ebuild, + -esearch-1.0-r1.ebuild, +esearch-1.0-r2.ebuild: + Fix setup.py to work with EPREFIX changes in Portage. 16 Dec 2011; Agostino Sarubbo esearch-0.7.2-r2.ebuild: Stable for AMD64, wrt bug #394999 diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest index 982f6edaa11f..aca34f422ecc 100644 --- a/app-portage/esearch/Manifest +++ b/app-portage/esearch/Manifest @@ -1,27 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX 0.7.2-esync-quiet.patch 749 RMD160 7ed475c2d31a7fee4f508b4b249a1eee97c0fcea SHA1 d51e20b847d746802f0bbaed6dba9314f56bf1e5 SHA256 f232bc286ac48462e975bea8e9950901b04a9e7c99a089f4d4883a8e86568b2c AUX 0.7.2-make-prefix-aware.patch 4654 RMD160 cccb2a5d2012e14605039ec87f1570366ecece84 SHA1 0d50f5d2756abc9527549411d04fced030d85efc SHA256 7e54585de4bfa204eb06ebc54550ae972b5ae56712dbde48f7e04efafe60d3fe AUX 0.7.2-update-shebang-lines.patch 769 RMD160 59cf1c177d4f4f9134546780acb7c844787b32e6 SHA1 d1f64b3a3a18c5273020c0202179b251d29c8f2c SHA256 a8380cbd924f2db0ae75e8edc238b329ee6b4448de51065774957a81614675e2 AUX 1.0-fix-EPREFIX-capability.patch 728 RMD160 2962cef8019cc5cbad54c831614d1c97346a60ac SHA1 2b7c6a0768d946c0110588e3ccc8039b346c3129 SHA256 ce28d23699d7ab0375a2b86a179475480621d67008960f0ff2264cbb3bc44a5b +AUX 1.0-fix-portage-eprefix-compatibility.patch 1302 RMD160 bd83253a26113bf259821c1a165bec8cb13dda32 SHA1 f1ca7de75b79cc5c83ba31bf1e94baaed2387a3a SHA256 73fe0f7bec6dbcb6c273eb23b2924089404755eb4a443c93c4160dcedbded7f5 AUX eupdatedb.cron 659 RMD160 b1ccd63e63bdad7640ad536d8427f825527627b6 SHA1 c3ee7bc0df9744f9fde1396e0d6ad21cecdf1e8f SHA256 f0092005752c82d62c1c5b8b3883329610be7a568569d5a375bfc780f3b3b3e0 DIST esearch-0.7.2.tar.bz2 11747 RMD160 91daf94ed15ece77f0020b6269906b93a526af6a SHA1 a973679704b036a2d15876694534541410d9c273 SHA256 7e47e8f180b1fe2a00468012b38d6f6d75a629b89294d52d08b97dbc1cc2e08e DIST esearch-1.0.tar.gz 18071 RMD160 6ffc724b3979cc322f73369331372eb8cd34002b SHA1 a25795d5b092b8eb9716135c4578994a2a2dc550 SHA256 456ece57d9b55e8d9c70920904770c858701d56b7fbb56af32536a5fdd3c8832 EBUILD esearch-0.7.2-r2.ebuild 1986 RMD160 3285fee25c58838ec1ce7fef0d400ad8c4d4ef0a SHA1 d54074e0e833c48ace81a43a795750dfe07fa830 SHA256 0858934fc456a9194fe6dfcefe9a71498ed28be10e9baa654d3da618e615f5c5 -EBUILD esearch-1.0-r1.ebuild 1643 RMD160 abfad0d93b5cbe5bfb082ef96b877d96f8db3560 SHA1 4807d4f90eb1563a40d868daa31a4f3e888e6979 SHA256 c0efe7e4ac95e1cbcc3b9d5bd6f8827df91d3a1428bc10932f306da7855e34e5 -EBUILD esearch-1.0.ebuild 1513 RMD160 02569314622e74e15f8a95362bc7006815e94a9d SHA1 e665d0e771fd7f853e9a8bb9133a455a482bcc36 SHA256 7ce3ee33e25f6233a91d8e81fc76dd7da2dec3d81cc59a64546471d0605e6f93 +EBUILD esearch-1.0-r2.ebuild 1703 RMD160 f960c185cec91869a86f39bbcbe3713f2c9d1e2f SHA1 cf9f4cc04896a557308ab5c2add166dffc11ce77 SHA256 a46223c24b72ecf434e82a46f4764d28a0667aa0b4011d156303fb657e881845 EBUILD esearch-9999.ebuild 1355 RMD160 9b87c96f57c3e96f2ffaf6f0fa70442d5c3c5fb1 SHA1 38afab700ab2a815e697f2437243afa913ece24f SHA256 3a5b8b9487bf1a2ec9bdd921434a7eb1d67b23f1666444ff0a9cd11d92065d30 -MISC ChangeLog 11805 RMD160 4ee0a8d1408c10e1a6cd443ea3b4d5301ffcea7a SHA1 2bd8706b6191003b9dc850a989d43017ff05b36a SHA256 249ba66a0e8cffe08133ccf41e4392fb864e3bcd76f847773efdf6a6747b1d45 +MISC ChangeLog 12072 RMD160 971bfda7582789e282db2cc43a427ca004122372 SHA1 52b0ad9396b1e70bc2eb238f1bf3488f59e736bf SHA256 79314cfc09b49f50fb74b67db15c48d5f07d084f3b97ed96cbf3e8c1224ec941 MISC metadata.xml 166 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 SHA1 ad2b30d8643bb8c9dc8042a399b172878b7021d7 SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJO68GxAAoJEOTDgjZ80txdD2IIALcNWZgBL86oseT3j5Kfpyvm -ffV/sERZdfKyYGuxG/OBhmkVRTIL9dlKZYrIyzWbMNOdkv7cY/WrqP6IdP29Vg+f -QA0vK0MVO+nitIBoyHYJcPvREnUQrKx+D/mcPUmFoGEUYB5SkHVDUmGZlm/EPnm6 -2cjTPyRY8zjj6aXxpidJLyp7/nYWsIQAhgRyYP/zlPiQMz836s0tY/nVh9ktPd1Q -U/Xdym7FaPSlxF8bQwf/7x+HPHo/D2K9sSjH8RpstanGzBniB7VI7t9+K4mplcro -rmlRdPFhVPL9KdKVsHNnu2fXEA1MhQArasuKBGDpzlxqZjf8U+r1EhzthXFyXpM= -=UxxX +iF4EAREIAAYFAk7vo+cACgkQk7WB/7ncNMEYkAEAzqigav/hDnUJU5S0NRMHNnqT +GxWPQFEjVWZ6i4SKPRUBAMywJM4wOk0ZCpXEj+GmcCVLf2MmleFt+vRna6rfFWkG +=IcTy -----END PGP SIGNATURE----- diff --git a/app-portage/esearch/esearch-1.0-r1.ebuild b/app-portage/esearch/esearch-1.0-r2.ebuild similarity index 89% rename from app-portage/esearch/esearch-1.0-r1.ebuild rename to app-portage/esearch/esearch-1.0-r2.ebuild index 4bd018d522cd..d966975e7a05 100644 --- a/app-portage/esearch/esearch-1.0-r1.ebuild +++ b/app-portage/esearch/esearch-1.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0-r1.ebuild,v 1.1 2011/12/12 18:44:28 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0-r2.ebuild,v 1.1 2011/12/19 20:51:38 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -23,7 +23,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 DEPEND="sys-apps/portage" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch ) +PATCHES=("${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch + "${FILESDIR}"/${PV}-fix-portage-eprefix-compatibility.patch ) distutils_src_compile_pre_hook() { echo VERSION="${PVR}" "$(PYTHON)" setup.py set_version diff --git a/app-portage/esearch/esearch-1.0.ebuild b/app-portage/esearch/esearch-1.0.ebuild deleted file mode 100644 index 9fc7100afe11..000000000000 --- a/app-portage/esearch/esearch-1.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.0.ebuild,v 1.1 2011/11/30 21:03:33 fuzzyray Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.[45]" -PYTHON_USE_WITH="readline" -PYTHON_NONVERSIONED_EXECUTABLES=(".*") - -inherit distutils python - -DESCRIPTION="Replacement for 'emerge --search' with search-index" -HOMEPAGE="http://david-peter.de/esearch.html" -SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="linguas_fr linguas_it" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" - -DEPEND="sys-apps/portage" -RDEPEND="${DEPEND}" - -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_compile() { - distutils_src_compile -} - -src_install() { - python_convert_shebangs -r "" build-*/scripts-* - distutils_src_install - dodoc eupdatedb.cron || die "dodoc failed" - - # Remove unused man pages according to the linguas flags - if ! use linguas_fr ; then - rm -rf "${ED}"/usr/share/man/fr - fi - - if ! use linguas_it ; then - rm -rf "${ED}"/usr/share/man/it - fi -} - -pkg_postinst() { - distutils_pkg_postinst - ewarn "Because file locations have changed, please run 'hash -r' in your active shells." -} diff --git a/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch b/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch new file mode 100644 index 000000000000..a4f9b1ba06ff --- /dev/null +++ b/app-portage/esearch/files/1.0-fix-portage-eprefix-compatibility.patch @@ -0,0 +1,38 @@ +From a160eedd0b176cfa3da755762a8e40a38b753114 Mon Sep 17 00:00:00 2001 +From: Paul Varner +Date: Mon, 19 Dec 2011 13:09:42 -0600 +Subject: [PATCH] Fix setup.py to work with EPREFIX changes in Portage. + +--- + setup.py | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 2990e33..b24cd8f 100755 +--- a/setup.py ++++ b/setup.py +@@ -22,7 +22,7 @@ cwd = os.getcwd() + try: + from portage.const import EPREFIX + except ImportError: +- EPREFIX='/' ++ EPREFIX='' + + # Python files that need `__version__ = ""` subbed, relative to this dir: + python_scripts = [os.path.join(cwd, path) for path in ( +@@ -80,9 +80,9 @@ core.setup( + packages=packages, + scripts=(glob('bin/*')), + data_files=( +- (os.path.join(EPREFIX, 'usr/share/man/man1'), glob('man/en/*')), +- (os.path.join(EPREFIX, 'usr/share/man/fr/man1'), glob('man/fr/*')), +- (os.path.join(EPREFIX, 'usr/share/man/it/man1'), glob('man/it/*')), ++ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('man/en/*')), ++ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/fr/man1'), glob('man/fr/*')), ++ (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/it/man1'), glob('man/it/*')), + ), + cmdclass={ + 'set_version': set_version, +-- +1.7.8 + -- 2.26.2