Revision bump to make esearch-0.7.2 prefix aware.

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

diff --git a/app-portage/esearch/ChangeLog b/app-portage/esearch/ChangeLog
index 98905ff33543dc06a259b471d64d1c00f71d740e..953ede34d60eeee95b85a6051da2fd849f490e2d 100644 (file)
--- 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.65 2011/08/24 21:17:48 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/ChangeLog,v 1.66 2011/08/24 23:40:53 fuzzyray Exp $
+
+*esearch-0.7.2-r2 (24 Aug 2011)
+
+  24 Aug 2011; Paul Varner <fuzzyray@gentoo.org>
+  +files/0.7.2-make-prefix-aware.patch,
+  +files/0.7.2-update-shebang-lines.patch, +esearch-0.7.2-r2.ebuild:
+  Revision bump to make esearch-0.7.2 prefix aware.
 
 *esearch-9999 (24 Aug 2011)
 

diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index 409133ad8f657064d7ec2bad9169ad343fafdc80..a7a3eb7ae558459a312579ee19735c3cb1a36c3b 100644 (file)
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -1,4 +1,6 @@
 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 772 RMD160 bab881b2604c0e85cf7f988f0fee6e4755dc3a44 SHA1 a6c51ba2299c960359a9725ce948996ac2eabfc4 SHA256 887c2726a30e44bff57b8c1fe59538bafca34be53e881676aac9db4c57141e0b
 AUX 120817-unset-emergedefaultopts.patch 823 RMD160 5078c7097eb3cd9c120cff008d1fbd6d3fde8d0e SHA1 f1eb1c43c8608aadb0c1eb7c36938740b0e440cb SHA256 f25baddac3c0b5ab2f5411501ac1e1e2337b4e9f9330727711f791dec7e81efb
 AUX 124601-remove-deprecated-syntax.patch 3481 RMD160 b8a4ce010ec3b2a1731dfbf2658533dba61c8884 SHA1 a71a7364d8bd69a92ecc951d21dafbb182842bca SHA256 b4966cc820272f81e3f5c4a05de3c42b434f31abc7d8a4d0c8154d468fe74bb1
 AUX 132548-multiple-overlay.patch 5002 RMD160 ba6aa899a16461b607f1abe6bbb50ff17bcf8baa SHA1 8e01acc15fde11a859a225d6a4c8b805bc254e53 SHA256 ac804f1f4851bc64a17dcc1b8d37df74ed104417597b95cc512f44e861dbcbcf
@@ -14,7 +16,8 @@ DIST esearch-0.7.2.tar.bz2 11747 RMD160 91daf94ed15ece77f0020b6269906b93a526af6a
 EBUILD esearch-0.7.1-r7.ebuild 1734 RMD160 080722c857180e3e5928e5c2ef8519b4679f7de4 SHA1 d295a5e633997702b6d1ed7c4aa93ce26da1f351 SHA256 ec3506b60e72170f5a5ace6dc3a364799fcd5aef243a5a9c2c6de921d2c114cc
 EBUILD esearch-0.7.1-r8.ebuild 2033 RMD160 7e698f8cae2d46ac6ceca8e202c2481454785642 SHA1 bf457c94db24d661a331338c5f370be9b7d5613e SHA256 5de12befe22057f985eb3516149b9741af798b3bb97d0300542827eec806864a
 EBUILD esearch-0.7.2-r1.ebuild 1819 RMD160 adc88f34b364a7d3199cb43c92fb72dc3e8b0671 SHA1 e98030bfb38562fa3ddbdf8c7d6b534f6913dc90 SHA256 243a32079c42f16fb69a17e1c6e8bd3ab9b6cae88295375b92a98e72841b82f7
+EBUILD esearch-0.7.2-r2.ebuild 1912 RMD160 09d765666cd90419acbe25c1ff0461b6ba2570ca SHA1 5fcf9ebad6eaff61489efd672343bd134f258143 SHA256 ff8df032dfc9f783912d1943fca9588b278561b085e5b049b96814a88661edeb
 EBUILD esearch-0.7.2.ebuild 1778 RMD160 3a4be34ad404533daa4c07bfba525d8db87a09d2 SHA1 e61ecdc0425e63689d742b232729a67945ce3d9b SHA256 c2ae044b01e8b55153251693a1526a2160621041b955b1a2cc52000852e6d52a
 EBUILD esearch-9999.ebuild 1265 RMD160 0f3c92a7ac15bc331cdd1e2dce9968b3c88c3c7d SHA1 6e8aa39b4f4d739c70a83aef51778ed937f2f53d SHA256 7d4f5e456629b4cf550fb64ac752d76adc96096f7fb0178ad1b3c7b77583d090
-MISC ChangeLog 9893 RMD160 9a541b5857ee8796f78f999edbaa1904d0446c46 SHA1 77134fdfcbec36b67cee519a2ee5438794ceaa5c SHA256 c6fa6e29403131acef623a6b287eed40f9d0406ba82fb5eab7cf2aced147e5dd
+MISC ChangeLog 10137 RMD160 4ef8faf5bfb6ebf72f75b5cfa94d6456a0902d83 SHA1 d45a0338ec4d4da6ca5b0918a20093489391e291 SHA256 2b701b401a0ee449a949d168c3d374749b57702c6a65f502b7a956ffc7c8e8cf
 MISC metadata.xml 166 RMD160 ca32b35979234f4c3cb4b824fb3c4b5c41bbb1b5 SHA1 ad2b30d8643bb8c9dc8042a399b172878b7021d7 SHA256 3837555db151fa9c3afbe9eb1edff296df030efb574605d6d2b5b37228c2a021

diff --git a/app-portage/esearch/esearch-0.7.2-r2.ebuild b/app-portage/esearch/esearch-0.7.2-r2.ebuild
new file mode 100644 (file)
index 0000000..66bd898
--- /dev/null
+++ b/app-portage/esearch/esearch-0.7.2-r2.ebuild
@@ -0,0 +1,66 @@
+# 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-0.7.2-r2.ebuild,v 1.1 2011/08/24 23:40:53 fuzzyray Exp $
+
+EAPI=3
+PYTHON_DEPEND=2:2.4
+PYTHON_USE_WITH=readline
+
+inherit base eutils multilib python
+
+DESCRIPTION="Replacement for 'emerge --search' with search-index"
+HOMEPAGE="http://david-peter.de/esearch.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="linguas_fr linguas_it"
+
+RDEPEND="sys-apps/portage"
+
+PATCHES=( "${FILESDIR}"/${PV}-esync-quiet.patch
+       "${FILESDIR}"/${PV}-make-prefix-aware.patch
+       "${FILESDIR}"/${PV}-update-shebang-lines.patch
+)
+
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
+src_compile() { :; }
+
+src_install() {
+       dodir /usr/bin/ /usr/sbin/ || die "dodir failed"
+
+       exeinto /usr/$(get_libdir)/esearch
+       doexe eupdatedb.py esearch.py esync.py common.py || die "doexe failed"
+
+       dosym /usr/$(get_libdir)/esearch/esearch.py /usr/bin/esearch || die "dosym failed"
+       dosym /usr/$(get_libdir)/esearch/eupdatedb.py /usr/sbin/eupdatedb || die "dosym failed"
+       dosym /usr/$(get_libdir)/esearch/esync.py /usr/sbin/esync || die "dosym failed"
+
+       doman en/{esearch,eupdatedb,esync}.1 || die "doman failed"
+       dodoc ChangeLog "${FILESDIR}/eupdatedb.cron" || die "dodoc failed"
+
+       if use linguas_it ; then
+               insinto /usr/share/man/it/man1
+               doins it/{esearch,eupdatedb,esync}.1 || die "doins failed"
+       fi
+
+       if use linguas_fr ; then
+               insinto /usr/share/man/fr/man1
+               doins fr/{esearch,eupdatedb,esync}.1 || die "doins failed"
+       fi
+
+       python_convert_shebangs -r 2 "${D}"
+}
+
+pkg_postinst() {
+       python_mod_optimize /usr/$(get_libdir)/esearch
+}
+
+pkg_postrm() {
+       python_mod_cleanup /usr/$(get_libdir)/esearch
+}

diff --git a/app-portage/esearch/files/0.7.2-make-prefix-aware.patch b/app-portage/esearch/files/0.7.2-make-prefix-aware.patch
new file mode 100644 (file)
index 0000000..fbe29b8
--- /dev/null
+++ b/app-portage/esearch/files/0.7.2-make-prefix-aware.patch
@@ -0,0 +1,152 @@
+From 8def0d5c01ba121c9952a987a721db59e2396261 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Wed, 24 Aug 2011 17:17:32 -0500
+Subject: [PATCH] Make prefix aware.
+
+---
+ esearch.py   |   12 +++++++++---
+ esync.py     |   27 ++++++++++++++++-----------
+ eupdatedb.py |   13 +++++++++----
+ 3 files changed, 34 insertions(+), 18 deletions(-)
+
+diff --git a/esearch.py b/esearch.py
+index 68c311d..1f15ee9 100755
+--- a/esearch.py
++++ b/esearch.py
+@@ -9,9 +9,15 @@
+ 
+ from getopt import *
+ import sys
++import os
+ 
+-sys.path.insert(0, "/usr/lib/portage/pym")
+-sys.path.insert(0, "/usr/lib/esearch")
++try:
++      from portage.const import EPREFIX
++except ImportError:
++      EPREFIX = ''
++
++sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
++sys.path.insert(0, EPREFIX + "/usr/lib/esearch")
+ 
+ try:
+     from portage.output import bold, red, green, darkgreen, turquoise, nocolor
+@@ -22,7 +28,7 @@ import re
+ 
+ from common import needdbversion
+ 
+-esearchdbdir =  "/var/cache/edb/"
++esearchdbdir =  EPREFIX + "/var/cache/edb/"
+ 
+ def usage():
+     print "esearch (0.7.1) - Replacement for 'emerge search' with search-index"
+diff --git a/esync.py b/esync.py
+index eda504f..2fcc6be 100755
+--- a/esync.py
++++ b/esync.py
+@@ -15,7 +15,12 @@ import os
+ import sys
+ from getopt import *
+ 
+-sys.path.insert(0, "/usr/lib/portage/pym")
++try:
++      from portage.const import EPREFIX
++except ImportError:
++      EPREFIX = ''
++
++sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
+ 
+ import portage
+ try:
+@@ -25,11 +30,11 @@ except ImportError:
+ 
+ from common import needdbversion
+ 
+-syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --sync"
+-logfile_sync =  "/var/log/emerge-sync.log"
+-tmp_prefix =    "/tmp/esync"
++syncprogram =   "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge --sync"
++logfile_sync =  EPREFIX + "/var/log/emerge-sync.log"
++tmp_prefix =    EPREFIX + "/tmp/esync"
+ 
+-sys.path.append("/tmp")
++sys.path.append(EPREFIX + "/tmp")
+ 
+ eoptions = ""
+ eupdatedb_extra_options = ""
+@@ -85,11 +90,11 @@ for a in opts[0]:
+     if arg in ("-h", "--help"):
+         usage()
+     elif arg in ("-w", "--webrsync"):
+-        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/sbin/emerge-webrsync"
++        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/sbin/emerge-webrsync"
+     elif arg in ("-d", "--delta-webrsync"):
+-        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge-delta-webrsync -u"
++        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge-delta-webrsync -u"
+     elif arg in ("-m", "--metadata"):
+-        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" /usr/bin/emerge --metadata"
++        syncprogram = "EMERGE_DEFAULT_OPTS=\"\" " + EPREFIX + "/usr/bin/emerge --metadata"
+     elif arg in ("-n", "--nocolor"):
+         eoptions = "-n"
+         nocolor()
+@@ -123,7 +128,7 @@ def gettree(tree):
+         target = tmp_prefix + tree + "tree.pyc"
+         if os.path.exists(target):
+             os.unlink(target)
+-        os.symlink("/var/cache/edb/esearchdb.pyc", target)
++        os.symlink(EPREFIX + "/var/cache/edb/esearchdb.pyc", target)
+     except OSError, e:
+         if e.errno != 17:
+             print e
+@@ -166,7 +171,7 @@ if not quiet:
+     emsg("Doing 'eupdatedb' now")
+     print ""
+ 
+-if os.system("/usr/sbin/eupdatedb " + eoptions + " " + eupdatedb_extra_options) != 0:
++if os.system(EPREFIX + "/usr/sbin/eupdatedb " + eoptions + " " + eupdatedb_extra_options) != 0:
+     print ""
+     print red(" * Error:"), "eupdatedb failed"
+     sys.exit(1)
+@@ -198,7 +203,7 @@ haspkg = False
+ 
+ for (pkg, version) in items:
+     if (pkg not in old_keys) or (old[pkg] != new[pkg]):
+-        os.system("/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
++        os.system(EPREFIX + "/usr/bin/esearch " + eoptions + " -Fc ^" + pkg + "$ | head -n1")
+         haspkg = True
+ 
+ if not haspkg:
+diff --git a/eupdatedb.py b/eupdatedb.py
+index 6619b92..e423ea0 100755
+--- a/eupdatedb.py
++++ b/eupdatedb.py
+@@ -17,8 +17,13 @@ from os.path import exists
+ from shutil import copyfile
+ from getopt import *
+ 
+-sys.path.insert(0, "/usr/lib/portage/pym")
+-sys.path.insert(0, "/usr/lib/esearch")
++try:
++      from portage.const import EPREFIX
++except ImportError:
++      EPREFIX = ''
++
++sys.path.insert(0, EPREFIX + "/usr/lib/portage/pym")
++sys.path.insert(0, EPREFIX + "/usr/lib/esearch")
+ 
+ import portage
+ try:
+@@ -32,8 +37,8 @@ except ImportError:
+ 
+ from common import needdbversion, version
+ 
+-esearchdbdir =  "/var/cache/edb/"
+-tmpfile =       "/tmp/esearchdb.py.tmp"
++esearchdbdir =  EPREFIX + "/var/cache/edb/"
++tmpfile =       EPREFIX + "/tmp/esearchdb.py.tmp"
+ 
+ vartree = portage.vartree()
+ 
+-- 
+1.7.6
+

diff --git a/app-portage/esearch/files/0.7.2-update-shebang-lines.patch b/app-portage/esearch/files/0.7.2-update-shebang-lines.patch
new file mode 100644 (file)
index 0000000..53bdd76
--- /dev/null
+++ b/app-portage/esearch/files/0.7.2-update-shebang-lines.patch
@@ -0,0 +1,33 @@
+From adb18c5758f533a56c228c2c772b4c34a6be2dc2 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Wed, 24 Aug 2011 18:27:11 -0500
+Subject: [PATCH] Update shebang lines to work with prefix
+
+---
+ common.py |    2 +-
+ esync.py  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common.py b/common.py
+index 197bd21..e121927 100755
+--- a/common.py
++++ b/common.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ #
+ # Some functions for esearch,
+ # eupdatedb and esync.
+diff --git a/esync.py b/esync.py
+index 2fcc6be..b9e77b6 100755
+--- a/esync.py
++++ b/esync.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -u
++#!/usr/bin/env python -u
+ #
+ # 'python -u' for unbuffered output, so you can call
+ #   $ esync | tee esync.log
+-- 
+1.7.6
+