Version bump thanks to James Rowe in bug #150945

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 127 insertions, 5 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 86744058e7bf..8b54ada2268f 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/surfraw
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.7 2006/06/06 21:02:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.8 2006/10/20 11:18:14 seemant Exp $
+
+*surfraw-2.1.5 (20 Oct 2006)
+
+  20 Oct 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/surfraw-2.1.5-gentoo_pkg_tools.patch, +surfraw-2.1.5.ebuild:
+  Version bump thanks to James Rowe in bug #150945
 
   06 Jun 2006; Seemant Kulleen <seemant@gentoo.org> metadata.xml:
   Added long description, thanks to James in bug #135489
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 77cd0500034d..a23138a20809 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,3 +1,7 @@
+AUX surfraw-2.1.5-gentoo_pkg_tools.patch 1325 RMD160 23849fc22e013ef6f2cf96eb6e597865831789c7 SHA1 3ca68bed138b19db29f7234bd75903b9d9909ab8 SHA256 ea3b27ce0712d14d0c08aa3800e95eb3bbe689e64df55dffcbecb31f896f6c65
+MD5 bfa8d9697b7653cd7a334be33587afe3 files/surfraw-2.1.5-gentoo_pkg_tools.patch 1325
+RMD160 23849fc22e013ef6f2cf96eb6e597865831789c7 files/surfraw-2.1.5-gentoo_pkg_tools.patch 1325
+SHA256 ea3b27ce0712d14d0c08aa3800e95eb3bbe689e64df55dffcbecb31f896f6c65 files/surfraw-2.1.5-gentoo_pkg_tools.patch 1325
 AUX surfraw-gentoo_pkg_tools.patch 1300 RMD160 5fef2cf5d6dbfb68d0c5451bd27b2dbfc1171ec1 SHA1 f46969cd03e6df8fe7b3ae1c01b27204caf8ef05 SHA256 0d1b6eee03d282af679a7f0d3e05af7d5dfdc7ef10c44952ff0518da1880f0f9
 MD5 b1fc3c42cb779c006b6a2147ea51ba70 files/surfraw-gentoo_pkg_tools.patch 1300
 RMD160 5fef2cf5d6dbfb68d0c5451bd27b2dbfc1171ec1 files/surfraw-gentoo_pkg_tools.patch 1300
@@ -5,6 +9,7 @@ SHA256 0d1b6eee03d282af679a7f0d3e05af7d5dfdc7ef10c44952ff0518da1880f0f9 files/su
 DIST surfraw-1.0.7.tar.gz 63596
 DIST surfraw_2.1.1.tar.gz 135949
 DIST surfraw_2.1.4.tar.gz 139981 RMD160 7d21a8a09daec059ff7ef1c375effe11610df779 SHA1 7b1e8be5451a4c82370ebcb01a7064631de3cd94 SHA256 8e34927c00059c01a106bdf800ab07c9a11f3f81e5ce6994331ef0d67d962ecf
+DIST surfraw_2.1.5.tar.gz 119824 RMD160 8821676df2e426375ae7117f4a550b9005f39152 SHA1 384f530afb72afb5a3b1e6d2cf83d0ba4a74c3f4 SHA256 39b330fcb8522d3f97ebb79e741508308d03afb8127de54e75514c8f2f8da722
 EBUILD surfraw-1.0.7.ebuild 1312 RMD160 e2a4d417badcb8ab44d35d41bcff36e50ce0a27c SHA1 f1b635d92fc495a7b5474ba3e5a5614a987658fe SHA256 c5980a7ab4ada467961161b285ca76c4dfb0214c287f0d09d6d5ce8740ee923f
 MD5 eb652b61aaebddc598fb5fe81d66c529 surfraw-1.0.7.ebuild 1312
 RMD160 e2a4d417badcb8ab44d35d41bcff36e50ce0a27c surfraw-1.0.7.ebuild 1312
@@ -17,10 +22,14 @@ EBUILD surfraw-2.1.4.ebuild 1991 RMD160 8da5d2edd902a96aff2740a756c07b9485892f4f
 MD5 dea92fb60b45e100c21ffef9536d3435 surfraw-2.1.4.ebuild 1991
 RMD160 8da5d2edd902a96aff2740a756c07b9485892f4f surfraw-2.1.4.ebuild 1991
 SHA256 a66d1a2d526507cd3319c52d73217d2ef54b16b252930edf03950119a54b00a9 surfraw-2.1.4.ebuild 1991
-MISC ChangeLog 1909 RMD160 7d2ca853d4ab64eb9279cee51299df7abbe998b3 SHA1 202aacad9f52d22f3c539355f944de6aef14193d SHA256 7dac88d1e7a9227f7e273d10ae7d04f5aab85895cf675c75681b96647a168171
-MD5 73ae079a8f486d32f7b5555ac312578b ChangeLog 1909
-RMD160 7d2ca853d4ab64eb9279cee51299df7abbe998b3 ChangeLog 1909
-SHA256 7dac88d1e7a9227f7e273d10ae7d04f5aab85895cf675c75681b96647a168171 ChangeLog 1909
+EBUILD surfraw-2.1.5.ebuild 2054 RMD160 fa8196c7c82ce327bb77f957cd2cc9f68e09caa6 SHA1 016ecfd2237e3bd385d89e776435e73a7ae23b0b SHA256 b60040d9d01735003ba9c004a6e96cb677dc7452c5c3e2495ce68e4794ba3ee6
+MD5 d279562b1b17e5b2fb7939d365015238 surfraw-2.1.5.ebuild 2054
+RMD160 fa8196c7c82ce327bb77f957cd2cc9f68e09caa6 surfraw-2.1.5.ebuild 2054
+SHA256 b60040d9d01735003ba9c004a6e96cb677dc7452c5c3e2495ce68e4794ba3ee6 surfraw-2.1.5.ebuild 2054
+MISC ChangeLog 2113 RMD160 e268a2ac321bb377bb245ef07b9ac1d6f360e2a3 SHA1 2260389a13f0af19821619072a4147db5baa5a0d SHA256 c5deae5bea55565f71425bc1c6f1ed747847800057fa84c3fa248f172344caf8
+MD5 fd134d51f4043a48933e504ba9d5f380 ChangeLog 2113
+RMD160 e268a2ac321bb377bb245ef07b9ac1d6f360e2a3 ChangeLog 2113
+SHA256 c5deae5bea55565f71425bc1c6f1ed747847800057fa84c3fa248f172344caf8 ChangeLog 2113
 MISC metadata.xml 1340 RMD160 65917290554190087390ad14ec64af31b2c2219d SHA1 e7a35abb95b0bb02da8a1b293f3a98f29777b083 SHA256 011349e3ae2e0c00dfeea9d30793189426931653e2cbcbdd2410c227db331f85
 MD5 b1b323079e17f66aaf725f1a5bbff628 metadata.xml 1340
 RMD160 65917290554190087390ad14ec64af31b2c2219d metadata.xml 1340
@@ -34,3 +43,6 @@ SHA256 f043c965a436ee4e88deff90b214156fbcedab312cbbec1b6b919db404fe9a1d files/di
 MD5 27dc37401a2df23c9d78a948683460a8 files/digest-surfraw-2.1.4 241
 RMD160 08ee20a63ddc852ac2930fde49788c608b825c84 files/digest-surfraw-2.1.4 241
 SHA256 0c9384a569b08a6832078679234b6f85973accc3d569ca15aa347ec39cc4b67e files/digest-surfraw-2.1.4 241
+MD5 7032ac8fba0fb8331a99bce671a96d86 files/digest-surfraw-2.1.5 241
+RMD160 4447d46b64727521bb3a7b01e5c8aec1e67e7b86 files/digest-surfraw-2.1.5 241
+SHA256 322f727c692b8a2e11698bbfa2614cfcc8de5e2f0dc57e8290b6b2588c309117 files/digest-surfraw-2.1.5 241
diff --git a/www-client/surfraw/files/digest-surfraw-2.1.5 b/www-client/surfraw/files/digest-surfraw-2.1.5
new file mode 100644
index 000000000000..c83e10df13bd
--- /dev/null
+++ b/www-client/surfraw/files/digest-surfraw-2.1.5
@@ -0,0 +1,3 @@
+MD5 74d4b307745e3eeeeae1e26cb5762420 surfraw_2.1.5.tar.gz 119824
+RMD160 8821676df2e426375ae7117f4a550b9005f39152 surfraw_2.1.5.tar.gz 119824
+SHA256 39b330fcb8522d3f97ebb79e741508308d03afb8127de54e75514c8f2f8da722 surfraw_2.1.5.tar.gz 119824
diff --git a/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch
new file mode 100644
index 000000000000..4e17de986a73
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch
@@ -0,0 +1,37 @@
+  Needs a little more thought, or some method which would allow for an upstream
+push without affecting the non-Gentoo users.
+
+Index: surfraw-2.1.5/surfraw-bash-completion.IN
+===================================================================
+--- surfraw-2.1.5/surfraw-bash-completion.IN	{cset 8f95d483-869f-47ba-aba2-f0a12bb9dd07}
++++ surfraw-2.1.5/surfraw-bash-completion.IN	{local clone}
+@@ -1,4 +1,20 @@
+ # -*- sh -*- bash programmable completion for Surfraw, v2.2
++_srpkgname()
++{
++	local pd
++	local dir=$(sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \
++		/etc/make.{conf,globals})/*
++	local cur="$1"
++
++	COMPREPLY=($(compgen -W "$(
++	    for pd in $dir
++		do
++			[ ! -d ${pd} ] && continue
++			builtin cd ${pd}
++			echo *
++		done)" -- ${cur})
++	)
++}
+ _surfraw() 
+ {       COMPREPLY=()
+ 	local cur=${COMP_WORDS[COMP_CWORD]}
+@@ -14,7 +30,7 @@ _surfraw() 
+ 	then    COMPREPLY=( $( compgen -W "$elvi" -- $cur ) )
+ 		# "sr go<tab>" for google
+ 	elif    [[ $prev == @(alioth|deb@(bugs|contents|packages|pts|sec)|freshmeat|fsfdir|sourceforge) ]]
+-	then    COMPREPLY=( $(apt-cache --generate pkgnames $cur) )
++	then    _srpkgname ${cur}
+ 		# "sr debbugs 4<tab>" to check 44bsd-rdist bugs...
+ 	elif    [[ -x /usr/bin/look ]] # in bsdmainutils, "important"
+ 	then	COMPREPLY=( $(/usr/bin/look ${cur:-''}) )
diff --git a/www-client/surfraw/surfraw-2.1.5.ebuild b/www-client/surfraw/surfraw-2.1.5.ebuild
new file mode 100644
index 000000000000..376d9b09344f
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.1.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.1.5.ebuild,v 1.1 2006/10/20 11:18:14 seemant Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="http://alioth.debian.org/projects/surfraw/"
+SRC_URI="mirror://debian/pool/main/s/surfraw/${PN}_${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/${PN}-2.1.5-gentoo_pkg_tools.patch
+}
+
+src_compile() {
+	econf \
+		--with-elvidir='$(datadir)'/surfraw || die "./configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc debian/changelog AUTHORS HACKING NEWS README TODO
+
+	dobashcompletion surfraw-bash-completion
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+	einfo
+	einfo "You can get a list of installed elvi by just typing 'surfraw' or"
+	einfo "the abbreviated 'sr'."
+	einfo
+	einfo "You can try some searches, for example:"
+	einfo "$ sr ask why is jeeves gay? "
+	einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
+	einfo "$ sr rhyme -method=perfect Julian"
+	einfo
+	einfo "The system configuration file is /etc/surfraw.conf"
+	einfo
+	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
+	einfo "SURFRAW_graphical_browser=mozilla"
+	einfo "SURFRAW_text_browser=w3m"
+	einfo "SURFRAW_graphical=no"
+	einfo
+	einfo "surfraw works with any graphical and/or text WWW browser"
+	einfo
+	if has_version '=www-client/surfraw-1.0.7'; then
+		ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
+		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
+		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
+	fi
+	# This file was always autogenerated, and is no longer needed.
+	if [ -f ${ROOT}/etc/surfraw_elvi.list ]; then
+		rm -f ${ROOT}/etc/surfraw_elvi.list
+	fi
+}