Stable for SPARC (bug #323385).

(Portage version: 2.2_rc81/cvs/Linux i686)

3 files changed, 7 insertions, 97 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 12ba173d999d..908c314a2d4e 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.57 2010/07/18 21:52:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.58 2010/09/15 03:24:41 jer Exp $
+
+  15 Sep 2010; Jeroen Roovers <jer@gentoo.org> -surfraw-2.2.6.ebuild,
+  surfraw-2.2.7.ebuild:
+  Stable for SPARC (bug #323385).
 
   18 Jul 2010; Jeroen Roovers <jer@gentoo.org> surfraw-2.2.7.ebuild:
   Stable for PPC (bug #323385).
diff --git a/www-client/surfraw/surfraw-2.2.6.ebuild b/www-client/surfraw/surfraw-2.2.6.ebuild
deleted file mode 100644
index ec6c7e9dc32b..000000000000
--- a/www-client/surfraw/surfraw-2.2.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.6.ebuild,v 1.6 2010/01/10 20:25:08 maekke 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}"/${P}-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
-
-	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
-}
diff --git a/www-client/surfraw/surfraw-2.2.7.ebuild b/www-client/surfraw/surfraw-2.2.7.ebuild
index 98e3765e714f..afbc83672188 100644
--- a/www-client/surfraw/surfraw-2.2.7.ebuild
+++ b/www-client/surfraw/surfraw-2.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2010/07/18 21:52:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.7.ebuild,v 1.6 2010/09/15 03:24:41 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE=""
 RESTRICT="test"