[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-104-gcb81339

[Ian Beckwith]

The following commit has been merged in the master branch:
commit d1bc052474dbfd34b000b87d11ebd0706a0c8d7a
Author: James Rowe <jnrowe at gmail.com>
Date:   Mon Apr 19 22:37:37 2010 +0100

    genpkg: removed, use genportage.
    
    Signed-off-by: James Rowe <jnrowe at gmail.com>
    Signed-off-by: Ian Beckwith <ianb at erislabs.net>

diff --git a/AUTHORS b/AUTHORS
index b0219f1..405f9a7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,7 +43,6 @@ Ian Broadfoot <ibroadfo at cis.strath.ac.uk>
         elvi: yubnub
 
 James Rowe <jnrowe at ukfsn.org>
-        elvi: genpkg
         plus useful patches/maintenance.
 
 Aparna Jaitly <aparnajaitly at hotmail.com>
diff --git a/ChangeLog b/ChangeLog
index 4c1454d..5285ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  James Rowe  <jnrowe at gmail.com>
+
+	* genpkg: removed, use genportage.
+
 2010-04-16  Ian Beckwith  <ianb at erislabs.net>
 
 	* New elvi:
diff --git a/README b/README
index eeb78fa..580264a 100644
--- a/README
+++ b/README
@@ -204,7 +204,6 @@ freshmeat       -- Search Freshmeat (www.freshmeat.net)
 fsfdir          -- Search the FSF/UNESCO Free Software Directory (directory.fsf.org)
 gcache          -- Search the web using Google cache (www.google.com)
 genbugs         -- Search the Gentoo bug tracker (bugs.gentoo.org)
-genpkg          -- Search Gentoo packages (packages.gentoo.org)
 genportage      -- Search gentoo-portage.com for packages
 google          -- Search the web using Google (www.google.com)
 gutenberg       -- Search for books on Project Gutenberg (gutenberg.org)
diff --git a/elvi/Makefile.am b/elvi/Makefile.am
index 43efa99..fff711c 100644
--- a/elvi/Makefile.am
+++ b/elvi/Makefile.am
@@ -53,7 +53,6 @@ dist_elvi_SCRIPTS	= \
 		  fsfdir \
 		  gcache \
 		  genbugs \
-		  genpkg \
 		  genportage \
 		  gutenberg \
 		  google \
diff --git a/elvi/genpkg b/elvi/genpkg
deleted file mode 100755
index d63771c..0000000
--- a/elvi/genpkg
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# $Id$
-# elvis: genpkg		-- Search Gentoo packages (packages.gentoo.org)
-. surfraw || exit 1
-
-w3_usage_hook () {
-    cat <<EOF
-Usage: $w3_argv0 [options] [packagename]...
-Description:
-  Surfraw search Gentoo packages (packages.gentoo.org)
-EOF
-    w3_global_usage
-}
-
-w3_config
-w3_parse_args "$@"
-# w3_args now contains a list of arguments
-if test -z "$w3_args"; then
-    w3_browse_url "http://packages.gentoo.org"
-else
-    escaped_args=`w3_url_of_arg $w3_args`
-    w3_browse_url "http://packages.gentoo.org/package/${escaped_args}"
-fi
diff --git a/links.IN b/links.IN
index ba7f0ef..485e0c8 100644
--- a/links.IN
+++ b/links.IN
@@ -49,7 +49,6 @@ elvi.1sr.gz @mandir@/man1/freshmeat.1sr.gz
 elvi.1sr.gz @mandir@/man1/fsfdir.1sr.gz
 elvi.1sr.gz @mandir@/man1/gcache.1sr.gz
 elvi.1sr.gz @mandir@/man1/genbugs.1sr.gz
-elvi.1sr.gz @mandir@/man1/genpkg.1sr.gz
 elvi.1sr.gz @mandir@/man1/genportage.1sr.gz
 elvi.1sr.gz @mandir@/man1/google.1sr.gz
 elvi.1sr.gz @mandir@/man1/gutenberg.1sr.gz
diff --git a/test/Makefile.am b/test/Makefile.am
index 3cdebf6..4b30d11 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -10,18 +10,18 @@ EXTRA_DIST = runtests elviwithouttests README COOKIES W.test		\
 	ebay.test etym.test excite.test fast.test filesearching.test	\
 	finkpkg.test foldoc.test freebsd.test freedb.test		\
 	freshmeat.test fsfdir.test gcache.test genbugs.test		\
-	genpkg.test genportage.test google.test gutenberg.test		\
-	happypenguin.test imdb.test ixquick.test javasun.test		\
-	lastfm.test leodict.test l1sp.test lsm.test macports.test	\
-	mathworld.test mininova.test musicbrainz.test netbsd.test	\
-	ntrs.test openbsd.test opensearch.test piratebay.test		\
-	port.test pgpkeys.test pubmed.test rae.test rfc.test		\
-	rhyme.test rpmsearch.test scholar.test scicom.test scpan.test	\
-	scroogle.test slashdot.test slinuxdoc.test sourceforge.test	\
-	springer.test stockquote.test sunonesearch.test thesaurus.test	\
-	translate.test urban.test w3css.test w3html.test w3link.test	\
-	w3rdf.test wayback.test webster.test wetandwild.test		\
-	wikipedia.test woffle.test yahoo.test youtube.test yubnub.test
+	genportage.test google.test gutenberg.test happypenguin.test	\
+	imdb.test ixquick.test javasun.test lastfm.test leodict.test	\
+	l1sp.test lsm.test macports.test mathworld.test mininova.test	\
+	musicbrainz.test netbsd.test ntrs.test openbsd.test		\
+	opensearch.test piratebay.test port.test pgpkeys.tes		\
+	pubmed.test rae.test rfc.test rhyme.test rpmsearch.test		\
+	scholar.test scicom.test scpan.test scroogle.test slashdot.test	\
+	slinuxdoc.test sourceforge.test springer.test stockquote.test	\
+	sunonesearch.test thesaurus.test translate.test urban.test	\
+	w3css.test w3html.test w3link.test w3rdf.test wayback.test	\
+	webster.test wetandwild.test wikipedia.test woffle.test		\
+	yahoo.test youtube.test yubnub.test
 
 test:
 	./runtests
diff --git a/test/genpkg.test b/test/genpkg.test
deleted file mode 100644
index 7933dbb..0000000
--- a/test/genpkg.test
+++ /dev/null
@@ -1,2 +0,0 @@
-genpkg surfraw
-www-client/surfraw

-- 
surfraw -  a fast unix command line interface to WWW