gentoo resync : 16.09.2020

3 files changed, 87 insertions, 0 deletions

diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index aa9576d9bd7e..9ea431acc408 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,7 @@
 AUX moreutils-0.63-respect-env.patch 657 BLAKE2B 2f33bb68f3d23f0fa45849fd5d5fb63f8cdbb27b3c28eb92e132d632aa0b9487ecf85c9b9cdfa2bcebc009be4a5ce5da2407742b02f52352dd00a88f84ba1eff SHA512 e9cffcba65d224daa5bba7f15d9e8b39cd18ac2f0e25b91aae6e49017b8c6edb4eff1458c68832e207ec5ed4bca193df3f01ddf4851639509c70cdc967befa8a
+AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
+DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
+EBUILD moreutils-0.64.ebuild 1675 BLAKE2B 46a101760eef9ec2e51907f10c4665fc1ebd3505ccdd84693b3eac869e395b8c0fd325ff9d58664ab41c5e62ab51df9205220d56de8d52fc5ca93464e65d3c86 SHA512 1a31463fe27cd40da4b222ec02586c24e72f35c7278e1e1b71b7bcfa50bca3875c506827addb0572f61eac873ac9d72407989ca55787e31542b775b79a293e3e
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch
new file mode 100644
index 000000000000..ea699d2c5e8d
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-0.64-respect-env.patch
@@ -0,0 +1,13 @@
+diff --git a/is_utf8/Makefile b/is_utf8/Makefile
+index 13b1021..f0a111e 100644
+--- a/is_utf8/Makefile
++++ b/is_utf8/Makefile
+@@ -37,7 +37,7 @@ LINKERNAME = lib$(NAME).so
+ SONAME = $(LINKERNAME).$(VERSION)
+ REALNAME = $(SONAME).$(MINOR).$(RELEASE)
+ 
+-CC = gcc
++CC ?= gcc
+ CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
+ 
+ $(NAME): $(OBJ)
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
new file mode 100644
index 000000000000..ad2f9c8167d9
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
+# Not available at time of release
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	app-admin/eselect
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.64-respect-env.patch"
+)
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+
+	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
+}
+
+pkg_postinst() {
+	# try to make sure $EDITOR is valid for vipe (bug #604630)
+	eselect editor update
+}