gentoo resync : 14.07.2018

7 files changed, 219 insertions, 0 deletions

diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
new file mode 100644
index 000000000000..b4e69d2707f7
--- /dev/null
+++ b/app-portage/esearch/Manifest
@@ -0,0 +1,7 @@
+AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f93190586d9bfc4c84f451605d073372b8db528c6680616c2be3038e8fc58c26d134300862db17088591043eac55aa89eda6cabf20b SHA512 b136b610a87e61e2ca01956fc2ba444b25e26333ed973c0c779279203ddb1ab100ec7ca35c50f4aeaa950829438c7e7729aa95fa43efbd0b5eb3b6f31fce529a
+AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
+AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
+DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
+EBUILD esearch-1.3-r2.ebuild 1576 BLAKE2B 98fe51c640d6830e8bfbad7c8fb45110a4642418def3facf8d7dd7b73c5106a90cce51aa037755946c18cf3ba3979a2ab365c13b1de328ae7c3b95895d9ceec3 SHA512 33db3a09d49e7a2de817797d35f0316a033bd6c6fb70af57321e0a0bf2372e1448de4abf29d78a5bdbbccde8518814756ac9ac8297aaa4a49a1c14f8998da70b
+EBUILD esearch-9999.ebuild 1145 BLAKE2B 6cdb90bf72eb3f638fd11eab43bcd9b5f1d408b60d86397b4d47163fef0dd4dd0a641d38d2df762db04ef7a3c9d4b3bd5791de16fdeeb9e2d163adee2a8f66bd SHA512 af36069c02638fb83cdb9e5cdda3c76e3719526085449d823e17042da88b8414fbf285d0ffe9ba0458cf5e7ec170b20699c6391667b3b4287c5d2ee730a961f1
+MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
new file mode 100644
index 000000000000..3c8b1eac66e5
--- /dev/null
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_REQ_USE="readline(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Replacement for 'emerge --search' with search-index"
+HOMEPAGE="https://github.com/fuzzyray/esearch"
+SRC_URI="mirror://github/fuzzyray/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="l10n_fr l10n_it"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+
+DEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
+RDEPEND="${DEPEND}"
+
+# Populate the patches array for any patches for -rX releases
+# It is an array of patch file names of the form:
+# "${FILESDIR}"/${PV}-fix-EPREFIX-capability.patch
+PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-setup.py.patch
+	"${FILESDIR}"/${PV}-Fix-python-3-compatability.patch
+)
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version \
+		|| die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc eupdatedb.cron || die "dodoc failed"
+
+	# Remove unused man pages according to the l10n flags
+	if ! use l10n_fr ; then
+		rm -rf "${ED}"/usr/share/man/fr \
+			|| die "rm failed to remove ${ED}/usr/share/man/fr"
+	fi
+
+	if ! use l10n_it ; then
+		rm -rf "${ED}"/usr/share/man/it \
+			|| die "rm failed to remove ${ED}/usr/share/man/it"
+	fi
+}
diff --git a/app-portage/esearch/esearch-9999.ebuild b/app-portage/esearch/esearch-9999.ebuild
new file mode 100644
index 000000000000..ae29c8dc76a8
--- /dev/null
+++ b/app-portage/esearch/esearch-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_REQ_USE="readline(+)"
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Replacement for 'emerge --search' with search-index"
+HOMEPAGE="https://github.com/fuzzyray/esearch"
+EGIT_REPO_URI="https://github.com/fuzzyray/esearch.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="l10n_fr l10n_it"
+
+KEYWORDS=""
+
+DEPEND="
+	|| (
+		sys-apps/portage
+		sys-apps/portage-mgorny
+	)"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	python_export_best
+	echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc eupdatedb.cron || die "dodoc failed"
+
+	# Remove unused man pages according to the l10n flags
+	if ! use l10n_fr ; then
+		rm -rf "${ED}"/usr/share/man/fr \
+			|| die "rm failed to remove ${ED}/usr/share/man/fr"
+	fi
+
+	if ! use l10n_it ; then
+		rm -rf "${ED}"/usr/share/man/it \
+			|| die "rm failed to remove ${ED}/usr/share/man/it"
+	fi
+}
diff --git a/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
new file mode 100644
index 000000000000..36c9d2255b8c
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-python-3-compatability.patch
@@ -0,0 +1,34 @@
+From 3978f923ac814aef014cf412b63d11fd94f60692 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Wed, 8 May 2013 14:26:48 -0500
+Subject: [PATCH 1/2] Fix python 3 compatability with 'esearch -e' (Bug 469076)
+
+Thanks to zmedico for the patch.
+---
+ esearch/search.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/esearch/search.py b/esearch/search.py
+index f91f5b1..696a0f0 100755
+--- a/esearch/search.py
++++ b/esearch/search.py
+@@ -22,6 +22,7 @@ import re
+ try:
+     from portage.output import bold, red, green, darkgreen, turquoise, blue, nocolor
+     from portage import settings, pkgcmp, pkgsplit, portdb, best
++    from portage.util import cmp_sort_key
+ except ImportError:
+     print("Critical: portage imports failed!")
+     sys.exit(1)
+@@ -107,7 +108,7 @@ def searchEbuilds(path, portdir=True, searchdef="", repo_num="",
+                     data['defebuild'] = (searchdef, pkgs[-1][3])
+         if not portdir:
+             config['found_in_overlay'] = True
+-        pkgs.sort(mypkgcmp)
++        pkgs.sort(key=cmp_sort_key(mypkgcmp))
+         for pkg in pkgs:
+             rev = ""
+             if pkg[2] != "r0":
+-- 
+1.8.5.4
+
diff --git a/app-portage/esearch/files/1.3-Fix-setup.py.patch b/app-portage/esearch/files/1.3-Fix-setup.py.patch
new file mode 100644
index 000000000000..aad5d49f2f56
--- /dev/null
+++ b/app-portage/esearch/files/1.3-Fix-setup.py.patch
@@ -0,0 +1,28 @@
+From 94e77b115f5b14b7dfea50e4a7b77047e4b47263 Mon Sep 17 00:00:00 2001
+From: Paul Varner <fuzzyray@gentoo.org>
+Date: Tue, 18 Dec 2012 04:33:27 -0600
+Subject: [PATCH 1/3] Fix setup.py so that either VERSION or PVR will set the
+ version.
+
+This fixes the issue with egg-info always having a version number of
+9999.  Fix is from Brian Dolbec courtesy of mirrorselect.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9d2addd..45a4c06 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,7 +14,7 @@ import io
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
+ 
+-__version__ = os.getenv('VERSION', default='9999')
++__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
+ 
+ cwd = os.getcwd()
+ 
+-- 
+1.8.5.4
+
diff --git a/app-portage/esearch/files/eupdatedb.cron b/app-portage/esearch/files/eupdatedb.cron
new file mode 100644
index 000000000000..1cf802f7b05f
--- /dev/null
+++ b/app-portage/esearch/files/eupdatedb.cron
@@ -0,0 +1,32 @@
+#! /bin/bash
+
+# The eupdatedb script _needs_ to be installed with the filename 'eupdatedb'
+# because it does things based on basename $0.
+
+# Run some script
+
+SCRIPT="/usr/sbin/eupdatedb"
+SCRIPTPREOPTS="nice -n 19"
+SCRIPTOPTS="--quiet"
+PRECOMMAND=""
+POSTCOMMAND=""
+DATE="`date +%Y%m%d`"
+LOG="/var/log/`basename ${SCRIPT}`"
+
+${PRECOMMAND}
+
+# Start logging
+echo "--- Starting ${SCRIPT} for ${DATE} ---" >> ${LOG}
+
+if [ "`${SCRIPTPREOPTS} ${SCRIPT} ${SCRIPTOPTS}`" ]
+then
+	 echo "${SCRIPT}: success." >> ${LOG}
+else
+	echo "ERROR: ${SCRIPT} failed." >> ${LOG}
+fi
+
+# Cleanup tasks
+${POSTCOMMAND}
+
+# End logging
+echo "--- Ending ${SCRIPT} for ${DATE} ---" >> ${LOG}
diff --git a/app-portage/esearch/metadata.xml b/app-portage/esearch/metadata.xml
new file mode 100644
index 000000000000..540aa0188fe8
--- /dev/null
+++ b/app-portage/esearch/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>tools-portage@gentoo.org</email>
+    <name>Gentoo Portage tools team</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">fuzzyray/esearch</remote-id>
+  </upstream>
+</pkgmetadata>