From 62cda0b3eb49518ce9281fa5248e293877cf0436 Mon Sep 17 00:00:00 2001 From: Paul Varner Date: Mon, 12 Dec 2011 18:44:29 +0000 Subject: [PATCH] Revison bump to remove hardcoded /usr/lib/portage/pym path. Bug #394209 Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- app-portage/esearch/ChangeLog | 8 ++- app-portage/esearch/Manifest | 10 +-- app-portage/esearch/esearch-1.0-r1.ebuild | 61 +++++++++++++++++++ .../files/1.0-fix-EPREFIX-capability.patch | 25 ++++++++ 4 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 app-portage/esearch/esearch-1.0-r1.ebuild create mode 100644 app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog index 10c596103e6e..faaf812feb3f 100644 --- a/app-portage/esearch/ChangeLog +++ b/app-portage/esearch/ChangeLog @@ -1,6 +1,12 @@ # 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.73 2011/11/30 21:03:32 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.74 2011/12/12 18:44:28 fuzzyray Exp $ + +*esearch-1.0-r1 (12 Dec 2011) + + 12 Dec 2011; Paul Varner + +files/1.0-fix-EPREFIX-capability.patch, +esearch-1.0-r1.ebuild: + Revison bump to remove hardcoded /usr/lib/portage/pym path. Bug #394209 *esearch-1.0 (30 Nov 2011) diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest index 35a35716d21b..c236f19e9d39 100644 --- a/app-portage/esearch/Manifest +++ b/app-portage/esearch/Manifest @@ -4,18 +4,20 @@ 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 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 1991 RMD160 405edd76803f5bea59d09f31a3e048889de83148 SHA1 9931068dfeb89121494e1fbc00c41884dffe2e3e SHA256 9fbb31ce74d3034ce861c05c2df5c756e45939523292176daa700ec3baff4f56 +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-9999.ebuild 1355 RMD160 9b87c96f57c3e96f2ffaf6f0fa70442d5c3c5fb1 SHA1 38afab700ab2a815e697f2437243afa913ece24f SHA256 3a5b8b9487bf1a2ec9bdd921434a7eb1d67b23f1666444ff0a9cd11d92065d30 -MISC ChangeLog 11477 RMD160 c52d7cb4110e8b932447b59bf20b869d6bb68b24 SHA1 92b6111cd8c7159f1e308e705c750c4bd25ebfb0 SHA256 1fbdf82bdf1bea9cc769c50f2a096bc3ffbf37c8ddf44246a1f35e90a5a7a155 +MISC ChangeLog 11699 RMD160 193965216c355d8d99307ae00ffa804e4bcd5323 SHA1 a80268298098a16d84fba2fbb033b57f5218b304 SHA256 dff80ac006ecfb65ff649b1eb11c0de83151326c57f3e209d5ff8856f2a36edd MISC metadata.xml 166 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 SHA1 ad2b30d8643bb8c9dc8042a399b172878b7021d7 SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7WmhcACgkQk7WB/7ncNME1VAEAxhUVvb1iVJE2WgFByT13uhgo -Nl4q1/MzDp4k8PiHTRUA/3SUKekc/d9QOa9jNm8dTVnLoFEIzAugxwrAzE7QPeiv -=mf89 +iF4EAREIAAYFAk7mS6MACgkQk7WB/7ncNMEWLAEAidPpxTXDJ2ycTJ7SE0SJPD8Y +UIVyZBkdzF9cHaLML7MBAM8CvWHp3XKX7KftrkwYj8zRnQfs/umSbgWubkkjj5MF +=/j/j -----END PGP SIGNATURE----- diff --git a/app-portage/esearch/esearch-1.0-r1.ebuild b/app-portage/esearch/esearch-1.0-r1.ebuild new file mode 100644 index 000000000000..4bd018d522cd --- /dev/null +++ b/app-portage/esearch/esearch-1.0-r1.ebuild @@ -0,0 +1,61 @@ +# 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 $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.[45]" +PYTHON_USE_WITH="readline" +PYTHON_NONVERSIONED_EXECUTABLES=(".*") + +inherit base 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}" + +PATCHES=( "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch ) + +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() { + base_src_prepare + distutils_src_prepare +} + +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-EPREFIX-capability.patch b/app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch new file mode 100644 index 000000000000..edf9a600a2e2 --- /dev/null +++ b/app-portage/esearch/files/1.0-fix-EPREFIX-capability.patch @@ -0,0 +1,25 @@ +From 8399831cd2f5968fc45d0f1dc4e131368161e39a Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Fri, 9 Dec 2011 23:58:52 -0800 +Subject: [PATCH] apply zmedico's patch to fix EPREFIX capability. + +--- + esearch/search.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/esearch/search.py b/esearch/search.py +index 8498687..f296cb7 100755 +--- a/esearch/search.py ++++ b/esearch/search.py +@@ -15,7 +15,7 @@ from os import listdir, getenv, system + from os.path import isdir, exists + import re + +-sys.path.insert(0, "/usr/lib/portage/pym") ++#sys.path.insert(0, "/usr/lib/portage/pym") + # commented out so it can run from the git checkout + #sys.path.insert(0, "/usr/lib/esearch") + +-- +1.7.8 + -- 2.26.2