gentoo resync : 12.03.2021

4 files changed, 2 insertions, 190 deletions

diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 6a3dd2250c61..df5612267b98 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,8 +1,6 @@
 AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
 AUX surfraw-99999-sr-completion-path.patch 463 BLAKE2B f13c4436756532f6ea15718ae40f01dc257cd0ebcd17a890466d27027149de49da80872e9050440aeabaff7e3379136ae4747230ea5345584fb11c2485be466e SHA512 80d110e18c4e7d1b258b9bbb809973d0f83f20f137889593e1cc90bc192eb4d54c1a39eac3145610b184e7f40de6e0bd5c75a59fbb543f90f58ca3ff253dadd5
 DIST Surfraw-surfraw-2.3.0.tar.bz2 114065 BLAKE2B 91105b225737fe8f3a016e8c723421a2386c48f0c245b6ed119e4cc0f1032c9362e83a062134d0fef8b1cb14f58af07d3d9abe72c4efef9e79c6eb4c93bab25c SHA512 43f0dd2b48a045a47e73e8ef8058e0590a0409367e8378a086497ef912c58317614ba318b006913803529a51a641858a58c1f9f6a2f93dcdea9a45a26484af02
-EBUILD surfraw-2.3.0-r1.ebuild 2552 BLAKE2B c67934ca16a0444346e7634c36b42f17053f3d754ab37937a82324a79eb4b127fcec2e306c5c5ff086663684b95f4cc3584d8ad8c4004a99e8b68b93f6cb6f52 SHA512 e5027ff3f0330ff15841bd385d5c22f63971833f7621284c1b4b5b2e58bb80a5e6ae0d365c4c9a7125fd058fabb8be1ec5ed591e14ef7b1b3f0f88c161593d14
-EBUILD surfraw-2.3.0-r2.ebuild 2510 BLAKE2B db46028bea6faa656ff5b3c853c0d8827b20b7e3288da1a873222e73d8588af72f6fee01e3b7f7f1903b8cc11ab8de04a650a7cafca7823c48fc97a52573c48b SHA512 49155576c86f0887eb78ec467c4e797029a765563913518e39ffc42e9fe6444fe626ee0e4799d33d789f6e4ae54bb71f9b003662198655e3603ef2bb994fc73a
-EBUILD surfraw-2.3.0-r3.ebuild 2934 BLAKE2B 7a58369d63f26a2fd54edcd6b7e12e77c3ee483f6b6345df76a2563b86dedcb929cb14240bd15f2cedd6dce6bfa01bb073c4dd253dda9b7fdc824fa89b3fdd6f SHA512 9f4b9722b3e7f3a44a0dc0dd7599ad4dc854c83ee9ad9d1926a0d4c8d135737ae534d1062cf30cf1f8fddb17ae1ad57a7bb9d215e3b74af69997f113a67e7695
+EBUILD surfraw-2.3.0-r3.ebuild 2932 BLAKE2B 3694687de79f6ebb72bd940c85b7b77fa0fc5d516b69a3b8aa9a6443a04a0b04f4e1f0d05a0f9a2a7eb8b21c78f5b31a0b6633c3e079ef65b2b3d645886110cd SHA512 63de6aa40dcbe0558330ca0a2db424bd01afad07d28b2eaa2d17d5dcc18ac572c5c5ed2d788bbbf951f291164fa0ec3f2134f445b2182a9b9415223f8cd01117
 EBUILD surfraw-99999.ebuild 1274 BLAKE2B 30a2f4f4a90ddfa92bccef0f47e75af6bbdc8535644ec378b68bd7bee11581886ee80d11e105ef92b87af148a28a75e384bdd46a1d4b64d9012cc4b1a4fa671b SHA512 ba478cafb5c958adabe27bba76da46a1c4a08bc5bbdd7a2f7132d43687b7a42fb68f981147793dd49d1e3775083a16fe476aeb2c153959744bf62363542580f6
 MISC metadata.xml 1142 BLAKE2B c6baed37a426be4c0e4f5f23913c0b57f50414e2c14c09db9338bf3669784d5d6f11b32e9dd1c7c460d8759f1b85bad0ddcd078de90cfc34c540bfe60f83627b SHA512 6c7abfd37e1785d57c353224c030e45116db623adb01eac159ebd9b9ec282f2d7a9ba75dfd0e8fb6afc7dba350307651b526104fa8215caa210d3782a37e5094
diff --git a/www-client/surfraw/surfraw-2.3.0-r1.ebuild b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
deleted file mode 100644
index 451419a8fe8c..000000000000
--- a/www-client/surfraw/surfraw-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A fast unix command line interface to WWW"
-HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
-SRC_URI="https://gitlab.com/surfraw/Surfraw/-/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"
-
-RDEPEND="
-	dev-lang/perl
-"
-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
-}
-
-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-r2.ebuild b/www-client/surfraw/surfraw-2.3.0-r2.ebuild
deleted file mode 100644
index 1f4577690fc4..000000000000
--- a/www-client/surfraw/surfraw-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A fast unix command line interface to WWW"
-HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
-SRC_URI="https://gitlab.com/surfraw/Surfraw/-/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"
-
-RDEPEND="
-	dev-lang/perl
-"
-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
-}
-
-src_install() {
-	default
-
-	newbashcomp surfraw-bash-completion ${PN}
-	bashcomp_alias ${PN} sr
-
-	docinto examples
-	dodoc examples/README 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-r3.ebuild b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
index 34027c7748d7..ea45f0272ea7 100644
--- a/www-client/surfraw/surfraw-2.3.0-r3.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
 SRC_URI="https://gitlab.com/surfraw/Surfraw/-/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"
+KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	dev-lang/perl