gentoo resync : 30.09.2020

4 files changed, 134 insertions, 2 deletions

diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index f75e75388e12..85e9207524b5 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,6 +1,8 @@
 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 2551 BLAKE2B d133c24fc4124485752353e66db1cdefb5f90d0cb1bc2e98437de78f13ccb45ac5479dfd4c3c9237e4bc3264cd826983e32cfb024f8616beabd4c7c5e13e34ed SHA512 44d14989a604b2b9db566bfa5fc980e9de9f7b069d4c89922af2a9750b01ab7877c3cfeb80b6eb7b7a164d394ec641ce2f3af1118e6313cdcd41446ed733a700
 EBUILD surfraw-2.3.0-r2.ebuild 2510 BLAKE2B db46028bea6faa656ff5b3c853c0d8827b20b7e3288da1a873222e73d8588af72f6fee01e3b7f7f1903b8cc11ab8de04a650a7cafca7823c48fc97a52573c48b SHA512 49155576c86f0887eb78ec467c4e797029a765563913518e39ffc42e9fe6444fe626ee0e4799d33d789f6e4ae54bb71f9b003662198655e3603ef2bb994fc73a
-EBUILD surfraw-99999.ebuild 796 BLAKE2B bdaaf4148ad6fc7063d06725745dc539e011234ecd9c7501bd434d129c7137b16d7ccd1c196f001b32151e92e8d878ec6a3b6b2576d810e9bf36ed69da677f70 SHA512 617102f4f7a748a7869e7f4393312b838570e9a9cf9e8d00b5f4ac333ad4134db154adf3d86eacbaced57251eae673e81659bb020f4240b9d586a741912fba4f
+EBUILD surfraw-2.3.0-r3.ebuild 2936 BLAKE2B 38d52ffc6e80f4b51dab460779f2b062daf95855d11943e5fe010adf344a758cec2071a724f57ad573dd1fd79cad590381b276098514b5b012272336f637742b SHA512 e63247e30c605f047d9fc4c22fe638da71d327078aafc8bab9d98135a48f1493f8bbb97a3bf0a13b242234831642b73a37ad3f03cf2016dd54f656314b53184a
+EBUILD surfraw-99999.ebuild 1274 BLAKE2B 30a2f4f4a90ddfa92bccef0f47e75af6bbdc8535644ec378b68bd7bee11581886ee80d11e105ef92b87af148a28a75e384bdd46a1d4b64d9012cc4b1a4fa671b SHA512 ba478cafb5c958adabe27bba76da46a1c4a08bc5bbdd7a2f7132d43687b7a42fb68f981147793dd49d1e3775083a16fe476aeb2c153959744bf62363542580f6
 MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch b/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch
new file mode 100644
index 000000000000..273ffcb3ce55
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -112,7 +112,7 @@
+ 	mkdir -p $(DESTDIR)@datadir@/bash-completion/completions
+ 	@cp $(top_srcdir)/surfraw-bash-completion $(DESTDIR)@datadir@/bash-completion/completions/surfraw
+ if INSTALLSR
+-	@ln -sf $(DESTDIR)@datadir@/bash-completion/completions/surfraw $(DESTDIR)@datadir@/bash-completion/completions/sr
++	@ln -sf surfraw $(DESTDIR)@datadir@/bash-completion/completions/sr
+ endif  # INSTALLSR
+ endif  # BASHCOMPLETIONS
+ 
diff --git a/www-client/surfraw/surfraw-2.3.0-r3.ebuild b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
new file mode 100644
index 000000000000..afa5aad6b120
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
@@ -0,0 +1,105 @@
+# 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
+
+	local sr_man_page
+	for sr_man_page in $(find "${ED}" -lname surfraw.1.gz); do
+		ln -sf surfraw.1 "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find "${ED}" -lname elvi.1sr.gz); do
+		ln -sf elvi.1sr "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find -P "${ED}"/usr/share/man/man1/ -type f -name '*.gz'); do
+		gzip -d "${sr_man_page}" || die
+	done
+
+	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-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
index 6c4ea3c98769..83703adf77d3 100644
--- a/www-client/surfraw/surfraw-99999.ebuild
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ DOCS=(
 )
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-completion.patch
+	"${FILESDIR}"/${PN}-99999-sr-completion-path.patch
 )
 
 src_prepare() {
@@ -37,6 +38,19 @@ src_configure() {
 src_install() {
 	default
 
+	local sr_man_page
+	for sr_man_page in $(find "${ED}" -lname surfraw.1.gz); do
+		ln -sf surfraw.1 "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find "${ED}" -lname elvi.1sr.gz); do
+		ln -sf elvi.1sr "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find -P "${ED}"/usr/share/man/man1/ -type f -name '*.gz'); do
+		gzip -d "${sr_man_page}" || die
+	done
+
 	newbashcomp surfraw-bash-completion ${PN}
 	bashcomp_alias ${PN} sr