Version bump thanks to Simon Ernst and James Rowe (bug #191382). Remove oldest version. Do not quote A.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686

5 files changed, 90 insertions, 61 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 34d91b5a792b..f5987db223b6 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/surfraw
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.15 2008/06/15 11:15:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.16 2008/07/11 04:49:32 jer Exp $
+
+*surfraw-2.2.2 (11 Jul 2008)
+
+  11 Jul 2008; Jeroen Roovers <jer@gentoo.org> -surfraw-1.0.7.ebuild,
+  surfraw-2.1.5.ebuild, +surfraw-2.2.2.ebuild:
+  Version bump thanks to Simon Ernst and James Rowe (bug #191382). Remove
+  oldest version. Do not quote A.
 
   15 Jun 2008; Zac Medico <zmedico@gentoo.org> surfraw-2.1.5.ebuild:
   Bug #226505 - For compatibility with phase execution order in
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index c639b4856cd5..eb85962eec2e 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX surfraw-2.1.5-gentoo_pkg_tools.patch 1325 RMD160 23849fc22e013ef6f2cf96eb6e597865831789c7 SHA1 3ca68bed138b19db29f7234bd75903b9d9909ab8 SHA256 ea3b27ce0712d14d0c08aa3800e95eb3bbe689e64df55dffcbecb31f896f6c65
 AUX surfraw-gentoo_pkg_tools.patch 1300 RMD160 5fef2cf5d6dbfb68d0c5451bd27b2dbfc1171ec1 SHA1 f46969cd03e6df8fe7b3ae1c01b27204caf8ef05 SHA256 0d1b6eee03d282af679a7f0d3e05af7d5dfdc7ef10c44952ff0518da1880f0f9
-DIST surfraw-1.0.7.tar.gz 63596 RMD160 3203fa661ddfaa7456aa2efb236adc748f7ae341 SHA1 1b99367066b0b0f05c2f97bd1f21fca2aeede0b9 SHA256 2a784c28a20219e4a6de087f5b26ddeca4c7ea131968a52ba3a2f79b4c4097c8
+DIST surfraw-2.2.2.tar.gz 133596 RMD160 189fcc69c0a1938cfec48f6657da14828bbc168c SHA1 1f2786564fb0f6b4cc3bbe3d54e9a2af6ef6dec6 SHA256 6242d2e127ea3a5aa5baeb1739b2af387ca3647583141da52a67eada48557ee3
 DIST surfraw_2.1.5.tar.gz 119824 RMD160 8821676df2e426375ae7117f4a550b9005f39152 SHA1 384f530afb72afb5a3b1e6d2cf83d0ba4a74c3f4 SHA256 39b330fcb8522d3f97ebb79e741508308d03afb8127de54e75514c8f2f8da722
-EBUILD surfraw-1.0.7.ebuild 1313 RMD160 c479a458e6e703386dc3adfa51fcdbfdfb4f2fe4 SHA1 fd175ecf162d45f54d753592feee9667d630a997 SHA256 85e262007c2a3cbb6418187cb36177f827d7e594d8036d7cd2d4d57624b74878
-EBUILD surfraw-2.1.5.ebuild 2220 RMD160 a76509bdd3e6471670c1fc5ab2c03d7f29efef83 SHA1 f47aa71d4f85e16f5218564c3c2bb21c0bb659e4 SHA256 df83a39cb772ad664279f8afa64fc936423bf4feeb5c2f27f6c32aecbec848cf
-MISC ChangeLog 3115 RMD160 1aae61eed3b286c00d8235482bea5c40e105e9a3 SHA1 3d6cfd3209a9b6ec4eb843ab0ab10eba4289167e SHA256 13abb2a01cf261cfec7e34664e3eec641a1f6760f9fdb898ad92439af35485e6
+EBUILD surfraw-2.1.5.ebuild 2214 RMD160 cb4c4bf722e76785292bfc40a1ef5c0944032ca7 SHA1 e19fa6b93e63375c5961e533e4054da932823d44 SHA256 5e813e445469aa503877486dbfce9d9a5dbdcdf265cf947be12c050a13b04e31
+EBUILD surfraw-2.2.2.ebuild 2263 RMD160 c2381dc9ae54e128c4bad976f5c174e7779d5965 SHA1 055acced3f5ac2803ee406655a01898d4e289471 SHA256 301115b9862a0eb0dcf3786176d413dcf117f89afd99c3f21fcc16676f5d67e5
+MISC ChangeLog 3367 RMD160 5f5120d72c31fa132142591f51328a09cf9c610f SHA1 af8b64036df8ec93953f0dae23c51cc1dabc64dd SHA256 5af3d69f58705406444f5edf88a33c6924b79f5b80bfe0ad6894a38b71db82f2
 MISC metadata.xml 1300 RMD160 430faab4f79db5c9eb907b92eb0b3a1feb688c7d SHA1 ffa24e0f2b5ec191e7e3a5c5afa1ff84d031da79 SHA256 e8e0c133e53653dec38601ce9e29feb7f36626cc43eb3f8d04b2cf2a0ad1a27f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhU+c4ACgkQ/ejvha5XGaNHcwCfeHkMkkegDOwlw9Vlj8gZALQa
-QlIAoMJsoWAqsWwDMrsCPcJTabzM3uCd
-=84HB
------END PGP SIGNATURE-----
diff --git a/www-client/surfraw/surfraw-1.0.7.ebuild b/www-client/surfraw/surfraw-1.0.7.ebuild
deleted file mode 100644
index f6352370de39..000000000000
--- a/www-client/surfraw/surfraw-1.0.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-1.0.7.ebuild,v 1.2 2007/07/15 04:26:42 mr_bones_ Exp $
-
-DESCRIPTION="A fast unix command line interface to WWW"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/${P}.tar.gz"
-HOMEPAGE="http://surfraw.sourceforge.net/"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--host=${CHOST} || die "./configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	dodoc README HACKING COPYING
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You can get a list of installed elvi by just typing 'surfraw' "
-	einfo
-	einfo "You can try some searches, for example:"
-	einfo "$ ask why is jeeves gay? "
-	einfo "$ google -results=100 RMS, GNU, which is sinner, which is sin?"
-	einfo "$ 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_broswer=mozilla"
-	einfo "SURFRAW_text_browser=w3m"
-	einfo "SURFRAW_graphical=no"
-	einfo
-	einfo "surfraw works with any graphical and/or text WWW browser"
-	einfo
-}
diff --git a/www-client/surfraw/surfraw-2.1.5.ebuild b/www-client/surfraw/surfraw-2.1.5.ebuild
index 462ac792896e..dfe8b34c0ace 100644
--- a/www-client/surfraw/surfraw-2.1.5.ebuild
+++ b/www-client/surfraw/surfraw-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.8 2008/06/15 11:15:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.1.5.ebuild,v 1.9 2008/07/11 04:49:32 jer Exp $
 
 inherit bash-completion eutils
 
@@ -14,7 +14,8 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 src_unpack() {
-	unpack "${A}"; cd "${S}"
+	unpack ${A}
+	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-2.1.5-gentoo_pkg_tools.patch
 	# Man page symlinks shouldn't link to compressed files
diff --git a/www-client/surfraw/surfraw-2.2.2.ebuild b/www-client/surfraw/surfraw-2.2.2.ebuild
new file mode 100644
index 000000000000..d3031cbe782a
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.2.ebuild,v 1.1 2008/07/11 04:49:32 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}"/${PN}-2.1.5-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 debian/changelog AUTHORS ChangeLog HACKING NEWS README TODO
+
+	dobashcompletion surfraw-bash-completion
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.0.7"
+	upgrade_from_1_0_7=$?
+}
+
+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 [[ $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
+}