gentoo resync : 25.09.2019

3 files changed, 95 insertions, 4 deletions

diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index d2af8e48c44d..262b90d09c6f 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,5 +1,6 @@
 AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
 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
+EBUILD surfraw-2.3.0-r2.ebuild 2487 BLAKE2B 74962abe199afc9a3005ab13d0024441cf8b2ec70c7b01688077046d4090392c37f7791427eb771db66d6c8e8fefd9d6971be90bdaf225068a2c12f4e96bad92 SHA512 53d3d1e2881608342955b9a5417d80915998244acee7a1e0a6cfec2628e63e68654199942b2b4bd85a1ba20fccc1006fa7fe1d7cdfceb328b64b4db85f013204
+EBUILD surfraw-99999.ebuild 796 BLAKE2B bdaaf4148ad6fc7063d06725745dc539e011234ecd9c7501bd434d129c7137b16d7ccd1c196f001b32151e92e8d878ec6a3b6b2576d810e9bf36ed69da677f70 SHA512 617102f4f7a748a7869e7f4393312b838570e9a9cf9e8d00b5f4ac333ad4134db154adf3d86eacbaced57251eae673e81659bb020f4240b9d586a741912fba4f
 MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/surfraw-2.3.0-r2.ebuild b/www-client/surfraw/surfraw-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..3e1421615970
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.3.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 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="${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"
+
+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-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
index cf8930db4683..6c4ea3c98769 100644
--- a/www-client/surfraw/surfraw-99999.ebuild
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -41,7 +41,5 @@ src_install() {
 	bashcomp_alias ${PN} sr
 
 	docinto examples
-	dodoc examples/README
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/uzbl_load_url_from_surfraw
+	dodoc examples/README examples/uzbl_load_url_from_surfraw
 }