Version bump thanks to James Rowe (bug #293836).

Package-Manager: portage-2.2_rc50/cvs/Linux i686

4 files changed, 144 insertions, 2 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index aa34e10bb2e8..6ba23d0ded96 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/surfraw
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.45 2009/08/12 15:01:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.46 2009/11/20 14:36:44 jer Exp $
+
+*surfraw-2.2.6 (20 Nov 2009)
+
+  20 Nov 2009; Jeroen Roovers <jer@gentoo.org> +surfraw-2.2.6.ebuild,
+  +files/surfraw-2.2.6-gentoo_pkg_tools.patch:
+  Version bump thanks to James Rowe (bug #293836).
 
   12 Aug 2009; Jeroen Roovers <jer@gentoo.org> -surfraw-2.2.4.ebuild:
   Remove old.
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 3b50acaf0da3..dc25ac828c4d 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,5 +1,8 @@
 AUX surfraw-2.1.5-gentoo_pkg_tools.patch 1455 RMD160 a477cd3c4427fc3cc152a44d8a9885691aed2141 SHA1 01ae1c400de2737f6b5a40d785288bfafc48b0b1 SHA256 1a1f1cd6e5d0b75e5987059bd57fe9905ed5ee668e636a931b09428eafc2e11d
+AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1254 RMD160 a4be36b8b8cbee8213d9508e5918fa213eb0e8ca SHA1 ebd44cc7886228f98216b748a083cc0574ac64db SHA256 85ef8e10b319ab7f19333a226fbb1edf3604d48de74a77a12ffab430c1f22079
 DIST surfraw-2.2.5.tar.gz 148858 RMD160 ff7c0ee495374400d205f684c3cf7b78fdbfcc77 SHA1 3da861c0a98a9d197e84a8995bc286ca4b885d62 SHA256 d5e05b60fa20265e17330bd178a7d47c678a6d5e308dbcb584c2a618cee4afcb
+DIST surfraw-2.2.6.tar.gz 165105 RMD160 fa046e26057fdacbac7d1f1502bef9cafed030c4 SHA1 d6326e3092bc11506987ae29db344fbd27502b84 SHA256 950b6bde88ed770eb9914cdd6b8197d106dc6feffc851c55df7d4d7cb3a25050
 EBUILD surfraw-2.2.5.ebuild 2244 RMD160 7e87d709a4f36021bb46244af70fb47ac36a3a00 SHA1 a562d2dbd380c4aa00deb85eed425c555003f69e SHA256 7351dec35a0a218818aa8637b91d4a837ca234d28ffc9b607c0dc50d7920022d
-MISC ChangeLog 6309 RMD160 fd50b013a7d228a967880814894e4695082aa93e SHA1 84f147ca682e549a58d4cd63c37dbd28da92b353 SHA256 fe04b47a0458cf9f639c3541cf51c4807ad3fb00501c04d047e48cb2650ec8af
+EBUILD surfraw-2.2.6.ebuild 2755 RMD160 36247d1ab4dd7d0e25abf936efabd6b96302ed62 SHA1 a9059172c377f4dc4f19cdd715eef0f8e0ffb614 SHA256 a29ed3686a6f16e50be993fa22cd7d88abf2439b16a8439d8259ba1d7177bb3d
+MISC ChangeLog 6508 RMD160 2bcf7504e2dc13faa9dc8e1d8d103321de893f9c SHA1 2e3ac05c61d0b825e976ee20ab0fa3a035b1bbb4 SHA256 f02fe6c136cca1e9acefe725ca5e40b9dd497ebf9a3f12ae716dcb13d9ab427b
 MISC metadata.xml 1316 RMD160 f70a1705c3cc6a47d59b897962af89a4e33deaa2 SHA1 3e080a500f355319d9ec624c9b7c446dfa71fff3 SHA256 91f4b6e59cf528ffec4b55dea2ba072278274f207b92f9ce6b45c5104da8bf8e
diff --git a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
new file mode 100644
index 000000000000..fbd959af5422
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
@@ -0,0 +1,39 @@
+  Needs a little more thought, or some method which would allow for an upstream
+push without affecting the non-Gentoo users.
+
+diff --git i/surfraw-bash-completion.IN w/surfraw-bash-completion.IN
+index d5d1374..41a232e 100644
+--- i/surfraw-bash-completion.IN
++++ w/surfraw-bash-completion.IN
+@@ -4,6 +4,22 @@
+ # installing the bash-completion package which sets this explicitly.
+ shopt -s extglob
+ 
++_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]}
+@@ -20,7 +36,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.2.6.ebuild b/www-client/surfraw/surfraw-2.2.6.ebuild
new file mode 100644
index 000000000000..e66fc55ae7d5
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.6.ebuild,v 1.1 2009/11/20 14:36:44 jer Exp $
+
+inherit bash-completion eutils
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="http://surfraw.alioth.debian.org/"
+SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo_pkg_tools.patch
+	# Man page symlinks shouldn't link to compressed files
+	sed -i 's,\.gz,,g' links.IN
+}
+
+src_compile() {
+	econf \
+		--with-elvidir='$(datadir)'/surfraw \
+		--disable-opensearch \
+		|| die "./configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
+
+	dobashcompletion surfraw-bash-completion
+
+	docinto examples
+	dodoc examples/README
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/uzbl_load_url_from_surfraw
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.0.7"
+	upgrade_from_1_0_7=$?
+}
+
+pkg_postinst() {
+	local moves f
+
+	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 [[ $upgrade_from_1_0_7 = 0 ]] ; 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
+
+	# Config file location changes in v2.2.6
+	for f in /etc/surfraw.{bookmarks,conf}; do
+		if [ -f "${ROOT}"${f} ]; then
+			ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
+			moves=1
+		fi
+	done
+	if [ "${moves}" == 1 ]; then
+		ewarn "You must manually move, and update, the config files listed"
+		ewarn "above for surfraw v2.2.6 and above to use them."
+	fi
+}