Remove old.

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

4 files changed, 6 insertions, 132 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 444115965a96..850fb5b8b53e 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,10 @@
 # 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.51 2010/01/10 20:25:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.52 2010/01/12 04:04:30 jer Exp $
+
+  12 Jan 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/surfraw-2.1.5-gentoo_pkg_tools.patch, -surfraw-2.2.5.ebuild:
+  Remove old.
 
   10 Jan 2010; Markus Meier <maekke@gentoo.org> surfraw-2.2.6.ebuild:
   x86 stable, bug #298240
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index ee4044ad4db1..4a7817f54049 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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
 EBUILD surfraw-2.2.6.ebuild 2753 RMD160 9767f3cd019a16de7d0a2f6304cbd32888fc1c22 SHA1 9be1d04eb4db6bd48f4cc5ddedded76cd43048b9 SHA256 a6ce874a5516fd923d87a89fc4510710522e3fbc5dbffcd2f8976ae6482353b5
-MISC ChangeLog 6990 RMD160 d8bbeb2add5d9e5b83e79192e69fbb6f4572976e SHA1 821a504cfc38915d6249c6972b4d3bd18532b49b SHA256 2a2a2914fbd7a61b372db560731e5bd4ea348696716ec2cc196ba6ee598e207d
+MISC ChangeLog 7119 RMD160 55cf3f91fcaefd074ca1f0b70b8e1676b70f4dce SHA1 a4607245f8cc6e6bb50a71d9ac99a5679b8ede90 SHA256 042c5a7f1839c6b7f84e9d88f63365178ff76f6687a04c514d7aa9e22d7befd3
 MISC metadata.xml 1316 RMD160 f70a1705c3cc6a47d59b897962af89a4e33deaa2 SHA1 3e080a500f355319d9ec624c9b7c446dfa71fff3 SHA256 91f4b6e59cf528ffec4b55dea2ba072278274f207b92f9ce6b45c5104da8bf8e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktKN4YACgkQkKaRLQcq0GLwVQCgseppON9Ld5DnIoRne/BIdU81
-ZpoAnikg3vCHM66eVsRP0KLHp1fUF4FH
-=mwUm
------END PGP SIGNATURE-----
diff --git a/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch
deleted file mode 100644
index 548a51dc353a..000000000000
--- a/www-client/surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-  Needs a little more thought, or some method which would allow for an upstream
-push without affecting the non-Gentoo users.
-
-Index: surfraw-2.1.5/surfraw-bash-completion.IN
-===================================================================
---- surfraw-2.1.5/surfraw-bash-completion.IN	{cset 8f95d483-869f-47ba-aba2-f0a12bb9dd07}
-+++ surfraw-2.1.5/surfraw-bash-completion.IN	{local clone}
-@@ -1,4 +1,25 @@
- # -*- sh -*- bash programmable completion for Surfraw, v2.2
-+
-+# This is for people who wish to use surfraw completion, without
-+# installing the bash-completion package.
-+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]}
-@@ -14,7 +35,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.5.ebuild b/www-client/surfraw/surfraw-2.2.5.ebuild
deleted file mode 100644
index 0f66a80a937f..000000000000
--- a/www-client/surfraw/surfraw-2.2.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.5.ebuild,v 1.6 2009/07/19 14:27:32 nixnut 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 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
-}