gentoo resync : 19.07.2019

6 files changed, 19 insertions, 153 deletions

diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 5c2833726c9e..d2af8e48c44d 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,9 +1,5 @@
-AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1155 BLAKE2B f550606027a74cc8ca3c8d30329f2023943b7377bbab7693ae1531a6944417a4e6f22d0c7eb45af9764f52f24fff66aa3d5e269fa5d4e269c51e53f277da6cdd SHA512 98733be556508761d27543f5af751333d5aced7371cc6510607e4b7d88e546dcbc8420ae5620b9a8d195f2601cb053352f3bee9b9c513bc51ea5bc0c6c3a1cab
-AUX surfraw-2.2.9-completion.patch 249 BLAKE2B a4418c17c2e57481674f63df74efc5bed828900eed629b24d93582a112eb9b062e2384ba02a7fe7c5ee0aadbd338699d0f97f4e71b9ed9d5427b68ac84bffe98 SHA512 058c7e4d1ece46e2b0c7da85aaab47d1908a9c5cdd13bff406d62c22f92ff438f51155097ef90304f6108c1138d015a59b77e969b6070cb3cd79c455728b8d83
 AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
-DIST surfraw-2.2.9.tar.gz 200042 BLAKE2B c360da9826b6473a1159e67a19e9e12eaf4697b5be4373088169eb6ee1b85f126854f8594c5de8fd0517b7020947be42a5678d1ed7bd798f0925c53a68728c15 SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016
-DIST surfraw-2.3.0.tar.gz 205557 BLAKE2B 35ca2b46f14fc123fd014682a413c6f22e8c9f05d85e8e76660e099536fda8648446757d467afbe8807c91ec1628c568854ebfda48953e9499a018c30f2bc5ee SHA512 51cdfb68bab701bce635a64ab3d5af669b2330c895180d01cca1c6f3c4005972ba4c573b693df59a2cc4fdb97d4fd11224bae500bbd4a17c3ab446de5241c9a0
-EBUILD surfraw-2.2.9-r1.ebuild 2529 BLAKE2B 3b8f3e2755c46a9eb37ff02d604caa7cd8d793b4dbdb14da582f461fcf8726a73f48c8f07eb46d7f92802678eb4f8b07d57a3ad208769b8b2f2d9040ae0ede07 SHA512 ef98382894301ad2e08b31a35008d7f0541cd716f5d95bd1586fb27235e6dc6011623464cebb2101508a34ae5e197eff935107fe52796e657706903fa4331236
-EBUILD surfraw-2.3.0.ebuild 2494 BLAKE2B e261dfe5ac8a97a3c4df141b255835704c9710cf33c7b9c1b655cfb1c01ce68bd59b248f04d0e611da3593f207bc441a2cbfeea03fb61a7591b561cf106d2086 SHA512 ede74be53b6850cb50fe17f10e2aede8103b5f2fb181571691c12800f3a024ed6c4cf7343a6872c1a336c4adbd1a6566c76a08a23f210b61e216e0aa257bd532
-EBUILD surfraw-99999.ebuild 877 BLAKE2B 4450d8b751175863616bffa1ca43250b8e829057946482415a33ad84550199c0a308d0a00225df33f9ef32115673484b206a1b2f519135c1fad6b43e08e93b51 SHA512 d456bc85322ff632f7209e669cfd8f80a8320ea6af0fd09b377cbbb36d27de2dbcbe3605c8d1de6b9ba4f8d84b24eb5d99490328f24da21ebee84815e9c3d891
+DIST Surfraw-surfraw-2.3.0.tar.bz2 114065 BLAKE2B 91105b225737fe8f3a016e8c723421a2386c48f0c245b6ed119e4cc0f1032c9362e83a062134d0fef8b1cb14f58af07d3d9abe72c4efef9e79c6eb4c93bab25c SHA512 43f0dd2b48a045a47e73e8ef8058e0590a0409367e8378a086497ef912c58317614ba318b006913803529a51a641858a58c1f9f6a2f93dcdea9a45a26484af02
+EBUILD surfraw-2.3.0-r1.ebuild 2528 BLAKE2B 86101bcae555b1af60eb47c35cca6bcb3127216e4a299f9d6136a456db05ae459ae5895fa7cdb6586095a797a792c37f462a3deefccf6c4d320311b15f0e740e SHA512 5fcc5890834eb9bd80661fd1c93c2e8c4346ba2946a0012445d35307ac01b4badfffcb259a4445e37b579d320ba3f99662fecb0de61d066ab98c30c5cac40676
+EBUILD surfraw-99999.ebuild 842 BLAKE2B 4c7f490d4c461d5c6058585932ba7ebe500ed99d097500a55f7c5008887bed95494de8f2a0c184a4e8d8de243901b80b380aa52ee275abd342e3617efae2db8e SHA512 c05afd36948bb4f713623fb737b6d1357d0c5045b23035c421b3f690652eb9c5492e0ae3fcf645ef7b03601588a1657941a12669af45e384d0e9eb37970c59be
 MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
deleted file mode 100644
index e43b24e46710..000000000000
--- a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-  Needs a little more thought, or some method which would allow for an upstream
-push without affecting the non-Gentoo users.
-
---- i/surfraw-bash-completion.IN
-+++ w/surfraw-bash-completion.IN
-@@ -4,6 +4,22 @@
- # installing the bash-completion package which sets this explicitly.
- 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]}
-@@ -20,7 +36,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/files/surfraw-2.2.9-completion.patch b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
deleted file mode 100644
index 0fb759f864b5..000000000000
--- a/www-client/surfraw/files/surfraw-2.2.9-completion.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 35112168912b..000000000000
--- a/www-client/surfraw/surfraw-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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
-}
diff --git a/www-client/surfraw/surfraw-2.3.0.ebuild b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
index 040d94a4264c..019e41cc99b6 100644
--- a/www-client/surfraw/surfraw-2.3.0.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
@@ -1,25 +1,32 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit bash-completion-r1 eutils
+EAPI=7
+inherit autotools bash-completion-r1
 
 DESCRIPTION="A fast unix command line interface to WWW"
-HOMEPAGE="http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw"
-SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
-
+HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
+SRC_URI="${HOMEPAGE}/-/archive/${P}/${PN^}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-RESTRICT="test"
+KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
 RDEPEND="
 	dev-lang/perl
 "
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+RESTRICT="test"
+DOCS=(
+	AUTHORS ChangeLog HACKING NEWS README TODO
+)
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-completion.patch
 )
+S=${WORKDIR}/${PN^}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf --with-elvidir='$(datadir)'/surfraw
diff --git a/www-client/surfraw/surfraw-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
index bc760e5d6112..cf8930db4683 100644
--- a/www-client/surfraw/surfraw-99999.ebuild
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -7,7 +7,6 @@ inherit autotools bash-completion-r1 git-r3
 DESCRIPTION="A fast unix command line interface to WWW"
 LICENSE="public-domain"
 HOMEPAGE="
-	http://surfraw.alioth.debian.org/
 	https://gitlab.com/surfraw/Surfraw
 "
 EGIT_REPO_URI="https://gitlab.com/surfraw/Surfraw.git"