Fix bash-completion (bug #526342).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 114 insertions, 6 deletions

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 9b0b10c58d89..a4627b99e4b0 100644
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/surfraw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.78 2014/03/12 15:39:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.79 2014/10/21 20:10:21 jer Exp $
+
+*surfraw-2.2.9-r1 (21 Oct 2014)
+
+  21 Oct 2014; Jeroen Roovers <jer@gentoo.org> +surfraw-2.2.9-r1.ebuild,
+  +files/surfraw-2.2.9-completion.patch:
+  Fix bash-completion (bug #526342).
 
   12 Mar 2014; Jeroen Roovers <jer@gentoo.org> -surfraw-2.2.8.ebuild:
   Old.
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 8a34322375a0..e6e8da4b0484 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1155 SHA256 e69f2b9f61eb6078a67e38cfb7351c2e86f6bdd521afaf06c50a520389491e0e SHA512 98733be556508761d27543f5af751333d5aced7371cc6510607e4b7d88e546dcbc8420ae5620b9a8d195f2601cb053352f3bee9b9c513bc51ea5bc0c6c3a1cab WHIRLPOOL 3630a9f13dda1cb4a9e3401683b104f227ed564c9f4a24edee1df1adb5788bf048e7ac98572190b78f0802dbd9d9600c5dbc39079ae0dc09b9a892d0abf58f7e
+AUX surfraw-2.2.9-completion.patch 249 SHA256 3075f8339a3b793f52cdda42365a33a43d4ee1304a90ec5e2dd17bed96ea1755 SHA512 058c7e4d1ece46e2b0c7da85aaab47d1908a9c5cdd13bff406d62c22f92ff438f51155097ef90304f6108c1138d015a59b77e969b6070cb3cd79c455728b8d83 WHIRLPOOL 0ae4d366fa90e1744cd863931e9aa9e3303813164fb9f6ab672cc7c77582080df39aa62d22e2420326329eb6b72965eb4cb1eb2841affc29956908544804732d
 DIST surfraw-2.2.9.tar.gz 200042 SHA256 aa97d9ac24ca4299be39fcde562b98ed556b3bf5ee9a1ae497e0ce040bbcc4bb SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016 WHIRLPOOL 80b149ddb7f37a0c000bba6dcbd1d4eff124581ba3266fb0cdf87467759856fc933067d45a4af30687564fa29f2b9756c6b393378420b0661e5d7c90cc8d30d6
+EBUILD surfraw-2.2.9-r1.ebuild 2661 SHA256 ccb3fa3ad0e9e66ce94692ecec6fff77a89ee57e20548fc474a88d0fb85db013 SHA512 b826bb6d95e8359b56a22ea8fdea51e2ddb8cbdba0a615dc8b8ba9c193e234378464773dde02000c5aa9b32497ea48181a86b5b12761b9474a8ce2798b004cff WHIRLPOOL 1794671af1a54fc53b20e1c4e2fbf3d878a6f2b5e325cf3772f84fffa60804830d087ebe09c9957bbd48bb222ac8bfacb152c5919d231ebd685b3c5478cdf16d
 EBUILD surfraw-2.2.9.ebuild 2587 SHA256 3644d7d7ec81063fbf8fd905223ac493d9277c5bf92c140917b2b2af052f3ef2 SHA512 96280c7aeb3475ec5dbc16e8be3107f1cae948fe0108ceac79983cbf7eb1d65e9fbbc76049fa036d739ab01158b163ec4f7945e9a435da3d575b53885a3155df WHIRLPOOL 16c7d39c1394c1896a6b97d1b66cb5801bc0c5aa5607fa061ce0806ecf852c1a40f41c7d6330810f28f56ce05ec52507b49324b1b9380ae6b3d560d48a02532a
-MISC ChangeLog 10106 SHA256 a44628b8bc009154686fdaa583de00dbbd2f0a079d974bfa26ab533b67b833b5 SHA512 6f5d531a5047e7ca810bf246728afe9117928aa0aded613bbfcbd689bc8ef23e33d28e9e8bc677de52cff0e14575a956f5363f523928b14e1012dc3bc6cf4804 WHIRLPOOL b0c118d5620cf37af7f1ab84302b777fc760495fd5df0b8128b73aa17ec40d7f28c28dbb1f27a728d8dc226a389303bf52524dfaf04c522f3b89e8b352afc1d1
+MISC ChangeLog 10291 SHA256 f4de207aa56d51fe5b2b133d6ec1c5d1d4a299995acf2ba4576559b24a1fb825 SHA512 44e592d3f46555e633f06c3772a8ccf18d61fba14669b388131e2adefd073ab83787b41a57cf774dddb9fc8d733ebf55b2005ce26ba3e57bcea246fc472b96c8 WHIRLPOOL c1ae384e474f08ccef9c672da1cee6d0c5b03e4fe22554c393b9262cdb7ed55f609c639daa741eea1c78688cb87d51817344aceea27d5312153a2f8a3818fb32
 MISC metadata.xml 1326 SHA256 cc11a4bc83bdc67a999eded2785e310d0e2a023eb59d1c1f978c7c54d4b0e8f3 SHA512 8c69a3b8c010ab63b26ed2e324f78521fcc4138e9aec728b945492d8febc8de21f2952b73724b8f358ff3a9df47345e1ecbc13e2e97203c613209e18b6f8677e WHIRLPOOL 07f513483d1e245a31ede40142dc956a562d4a4b9bd6015e98879f5bdc6e5bfbf25d676849eb5bc07b37d0989d903693d6016b4aeb64b5f9b288679fda3426ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMgf78ACgkQVWmRsqeSphOtqgCdFaJF9UXcCicFJRV+YU0IaYMQ
-sFMAn0eLhpmDq3rBOtySzRcNG98M7cLt
-=bZd7
+iEYEAREIAAYFAlRGva4ACgkQVWmRsqeSphORdACfaEzVtfIxVCKPlKBRldDpeq2T
+aBMAoID4QDVjIb+aBHXBYOSvl1NIvi6n
+=aVJ4
 -----END PGP SIGNATURE-----
diff --git a/www-client/surfraw/files/surfraw-2.2.9-completion.patch b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
new file mode 100644
index 000000000000..0fb759f864b5
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
@@ -0,0 +1,10 @@
+--- a/surfraw-bash-completion.IN
++++ b/surfraw-bash-completion.IN
+@@ -45,5 +45,5 @@
+ 	fi
+ 	return 0
+ }
+-# test first in case removed-but-unpurged
+-type -p surfraw >/dev/null 2>&1 && complete -F _surfraw surfraw sr
++
++complete -F _surfraw surfraw sr
diff --git a/www-client/surfraw/surfraw-2.2.9-r1.ebuild b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..a914384307e8
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.9-r1.ebuild,v 1.1 2014/10/21 20:10:21 jer Exp $
+
+EAPI=5
+
+inherit bash-completion-r1 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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+RESTRICT="test"
+RDEPEND="dev-lang/perl"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch \
+		"${FILESDIR}"/${PN}-2.2.9-completion.patch
+}
+
+src_configure() {
+	econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+	default
+
+	newbashcomp surfraw-bash-completion ${PN}
+	bashcomp_alias ${PN} sr
+
+	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
+
+	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 "${EROOT}"/etc/surfraw_elvi.list ]; then
+		rm -f "${EROOT}"/etc/surfraw_elvi.list
+	fi
+
+	# Config file location changes in v2.2.6
+	for f in /etc/surfraw.{bookmarks,conf}; do
+		if [ -f "${EROOT}"${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
+}