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

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

3 files changed, 101 insertions, 2 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 850fb5b8b53e..cdfbe811dda7 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/surfraw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.52 2010/01/12 04:04:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.53 2010/05/08 16:33:22 jer Exp $
+
+*surfraw-2.2.7 (08 May 2010)
+
+  08 May 2010; Jeroen Roovers <jer@gentoo.org> +surfraw-2.2.7.ebuild:
+  Version bump thanks to James Rowe (bug #318947).
 
   12 Jan 2010; Jeroen Roovers <jer@gentoo.org>
   -files/surfraw-2.1.5-gentoo_pkg_tools.patch, -surfraw-2.2.5.ebuild:
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 4a7817f54049..b7dfcb314057 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,5 +1,7 @@
 AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1254 RMD160 a4be36b8b8cbee8213d9508e5918fa213eb0e8ca SHA1 ebd44cc7886228f98216b748a083cc0574ac64db SHA256 85ef8e10b319ab7f19333a226fbb1edf3604d48de74a77a12ffab430c1f22079
 DIST surfraw-2.2.6.tar.gz 165105 RMD160 fa046e26057fdacbac7d1f1502bef9cafed030c4 SHA1 d6326e3092bc11506987ae29db344fbd27502b84 SHA256 950b6bde88ed770eb9914cdd6b8197d106dc6feffc851c55df7d4d7cb3a25050
+DIST surfraw-2.2.7.tar.gz 169771 RMD160 aaab07dd942ad7fa0885d362132bc7db6d87b59c SHA1 18f7db3b85f6c8af784338b9af66bf84d9d33443 SHA256 1f23e08210ba04d874e825e6bbbdb23e669cf9c0804388ba0fdd0fd535995fcb
 EBUILD surfraw-2.2.6.ebuild 2753 RMD160 9767f3cd019a16de7d0a2f6304cbd32888fc1c22 SHA1 9be1d04eb4db6bd48f4cc5ddedded76cd43048b9 SHA256 a6ce874a5516fd923d87a89fc4510710522e3fbc5dbffcd2f8976ae6482353b5
-MISC ChangeLog 7119 RMD160 55cf3f91fcaefd074ca1f0b70b8e1676b70f4dce SHA1 a4607245f8cc6e6bb50a71d9ac99a5679b8ede90 SHA256 042c5a7f1839c6b7f84e9d88f63365178ff76f6687a04c514d7aa9e22d7befd3
+EBUILD surfraw-2.2.7.ebuild 2722 RMD160 cebc5e4dddb0fb330a1f1261e39a2c42e926da9c SHA1 866ab549e50eb782919b2595d0b22d417bab674d SHA256 a308db84de14f4e4508668b9cf9c403e96363d3ce9fb192e1b78d42500d322db
+MISC ChangeLog 7271 RMD160 0f47e4f82435cad29e99514e61436cd1b5912249 SHA1 fff7d7af05d57a795711c8c460647ce4aa8c951e SHA256 700a83d5c8f4dca825ecff0623cc1c79e0d4b3ddf2e6dc13ec22d0814bd07d8d
 MISC metadata.xml 1316 RMD160 f70a1705c3cc6a47d59b897962af89a4e33deaa2 SHA1 3e080a500f355319d9ec624c9b7c446dfa71fff3 SHA256 91f4b6e59cf528ffec4b55dea2ba072278274f207b92f9ce6b45c5104da8bf8e
diff --git a/www-client/surfraw/surfraw-2.2.7.ebuild b/www-client/surfraw/surfraw-2.2.7.ebuild
new file mode 100644
index 000000000000..62f3159a0d37
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.7.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.7.ebuild,v 1.1 2010/05/08 16:33:22 jer Exp $
+
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch
+	# Man page symlinks shouldn't link to compressed files
+	sed -i 's,\.gz,,g' links.IN
+}
+
+src_configure() {
+	econf \
+		--with-elvidir='$(datadir)'/surfraw \
+		--disable-opensearch \
+		|| die "./configure 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
+}