version bump, thanks to James Rowe (the real maintainer) in bug #109330

(Portage version: 2.0.53_rc5)

7 files changed, 60 insertions, 20 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 7c613381711c..ee3d0ee04c5f 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/surfraw
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.4 2005/05/10 12:17:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.5 2005/10/19 18:31:39 seemant Exp $
+
+*surfraw-2.1.1 (19 Oct 2005)
+
+  19 Oct 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/surfraw-gentoo_pkg_tools.patch, -surfraw-2.0.2.1.ebuild,
+  surfraw-2.1.0.1.ebuild, +surfraw-2.1.1.ebuild:
+  version bump, thanks to James Rowe (the real maintainer) in bug #109330
 
 *surfraw-2.1.0.1 (10 May 2005)
 
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 83d252da0380..a9a45cacc758 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,8 +1,9 @@
-MD5 eb652b61aaebddc598fb5fe81d66c529 surfraw-1.0.7.ebuild 1312
 MD5 a80d37014817989de3976272b6b180bc ChangeLog 1335
-MD5 9160481967640bdac45691b98a05360c metadata.xml 406
-MD5 ced25b74a6dcebd159428b2586a0b8ef surfraw-2.1.0.1.ebuild 2094
-MD5 fd938a4533958066e79ed28c3b6abf07 surfraw-2.0.2.1.ebuild 2092
 MD5 0c4863c95791bde92743f7f48a1eaef8 files/digest-surfraw-1.0.7 64
-MD5 103c230476d60dd69e251265cb307a1e files/digest-surfraw-2.0.2.1 148
 MD5 40b592ed53c8b2e5844cf92e7d849d06 files/digest-surfraw-2.1.0.1 148
+MD5 42a15d217bacd22c06605623929e9806 files/digest-surfraw-2.1.1 65
+MD5 b1fc3c42cb779c006b6a2147ea51ba70 files/surfraw-gentoo_pkg_tools.patch 1300
+MD5 9160481967640bdac45691b98a05360c metadata.xml 406
+MD5 eb652b61aaebddc598fb5fe81d66c529 surfraw-1.0.7.ebuild 1312
+MD5 ced25b74a6dcebd159428b2586a0b8ef surfraw-2.1.0.1.ebuild 2094
+MD5 892abbdba56dbc739671de0eb2051eb7 surfraw-2.1.1.ebuild 1967
diff --git a/www-client/surfraw/files/digest-surfraw-2.0.2.1 b/www-client/surfraw/files/digest-surfraw-2.0.2.1
deleted file mode 100644
index 8b567dea68d4..000000000000
--- a/www-client/surfraw/files/digest-surfraw-2.0.2.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7ba8dde1714dd259ede735179d692753 surfraw_2.0.2-1.tar.gz 126408
-MD5 09292cc8354071e9b5ff55f3bc895701 surfraw-2.0.2.1-gentoo-patches.tar.bz2 1633
diff --git a/www-client/surfraw/files/digest-surfraw-2.1.1 b/www-client/surfraw/files/digest-surfraw-2.1.1
new file mode 100644
index 000000000000..5698c8d1a7fb
--- /dev/null
+++ b/www-client/surfraw/files/digest-surfraw-2.1.1
@@ -0,0 +1 @@
+MD5 3b23c6745fd9205eaee54239cbe3efae surfraw_2.1.1.tar.gz 135949
diff --git a/www-client/surfraw/files/surfraw-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-gentoo_pkg_tools.patch
new file mode 100644
index 000000000000..58e2dc49f269
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-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.0.2/surfraw-bash-completion
+===================================================================
+--- surfraw-2.0.2/surfraw-bash-completion	{cset 4e580034-b124-4c8c-a69c-350d291577a1}
++++ surfraw-2.0.2/surfraw-bash-completion	{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 g<tab>" for google
+ 	elif    [[ $prev == @(alioth|deb@(bug|content|package|pt)s|freshmeat|sourceforge) ]]
+-	then    COMPREPLY=( $(apt-cache --generate pkgnames $cur) )
++	then    _srpkgname ${cur}
+ 		# "sr debbugs 4<tab>" to check 44bsd-rdist bugs...
+ 	elif    test -x /usr/bin/look # in bsdmainutils, "important"
+ 	then	COMPREPLY=( $(/usr/bin/look ${cur:-''}) )
diff --git a/www-client/surfraw/surfraw-2.1.0.1.ebuild b/www-client/surfraw/surfraw-2.1.0.1.ebuild
index e8c23266d37b..ffeaf94ba18f 100644
--- a/www-client/surfraw/surfraw-2.1.0.1.ebuild
+++ b/www-client/surfraw/surfraw-2.1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.1.0.1.ebuild,v 1.1 2005/05/10 12:17:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.1.0.1.ebuild,v 1.2 2005/10/19 18:31:39 seemant Exp $
 
 inherit versionator bash-completion eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/s/surfraw/${MY_PF}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/www-client/surfraw/surfraw-2.0.2.1.ebuild b/www-client/surfraw/surfraw-2.1.1.ebuild
index ef636c9cc8f7..fc015bc2f837 100644
--- a/www-client/surfraw/surfraw-2.0.2.1.ebuild
+++ b/www-client/surfraw/surfraw-2.1.1.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.0.2.1.ebuild,v 1.1 2005/04/19 14:19:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.1.1.ebuild,v 1.1 2005/10/19 18:31:39 seemant Exp $
 
-inherit versionator bash-completion eutils
+inherit bash-completion eutils
 
-MY_PF=${PN}_$(replace_version_separator 3 '-')
-MY_P=${P%.*}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A fast unix command line interface to WWW"
 HOMEPAGE="http://alioth.debian.org/projects/surfraw/"
-SRC_URI="mirror://debian/pool/main/s/surfraw/${MY_PF}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches.tar.bz2"
+SRC_URI="mirror://debian/pool/main/s/surfraw/${PN}_${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 src_unpack() {
 	unpack ${A}; cd ${S}
 
 	sed -i 's,/lib/,/share/,g' surfraw-bash-completion surfraw.1.in elvi.1sr.in
-	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/gentoo-patches
+	epatch ${FILESDIR}/${PN}-gentoo_pkg_tools.patch
 }
 
 src_compile() {
@@ -32,7 +28,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS HACKING NEWS README TODO
+	dodoc debian/changelog AUTHORS HACKING NEWS README TODO
 
 	dobashcompletion surfraw-bash-completion
 }