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

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686)

4 files changed, 86 insertions, 47 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/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
+}