gentoo resync : 23.09.2020

4 files changed, 113 insertions, 9 deletions

diff --git a/sci-mathematics/num-utils/Manifest b/sci-mathematics/num-utils/Manifest
index e0cc0bba8637..e1c92eddc9fd 100644
--- a/sci-mathematics/num-utils/Manifest
+++ b/sci-mathematics/num-utils/Manifest
@@ -1,4 +1,7 @@
+AUX num-utils-0.5-r2-Makefile.patch 1498 BLAKE2B dd113fae4449a4d40d5e2c4aba77e4442dd120b3ead0160963910f3b9c6ed9f14578e3795ea6ba5947bc591eeadf04154e5df2482dbae7c76dba0ec2e8699292 SHA512 a59169a419a8ee5529e28f67b67c231f27da10715ed5e876f2ed8c971e8b12870897c3759f12574f1de82e832947336f788e2b1a060cf594439722f98f43fbd5
 DIST num-utils-0.5.tar.gz 31845 BLAKE2B fe6620dd0cc7c0d0dc03447918b525f57e9360c5d2a44a32afe7879cf8000bbce646dc271fc821531642c209bf6b356783b09e969755eb7c7af785a8a07a2462 SHA512 6f5a2a8304a0ac3cdba342ecfd28ccd926778a5fde5eed4655f973a5c921e558f0986061ec11ba6146382f63a46b1503570576370a28a0f975e361d790f03561
 DIST num-utils_0.5-11.diff.gz 11702 BLAKE2B d0f81877b3dedbd98f89d0e7448739eb6c953cc966a2a49dfc598821802837b7ade4d6ee70586febd0e72218f042dead06bc3750616960862a63c9e8134f1bef SHA512 b461771ba1c8054d83f1aea06cd6beb92945ba929ff71df9e9c02b589c59dce2f2a19e7dab76120d48de7ae2f9e30f0271ae0b873d6e220ea195e160d4347bbf
-EBUILD num-utils-0.5-r1.ebuild 1098 BLAKE2B 9f998e7db707bf16c03f3fa48decc6b538b3991f3867475a43822d7f61a50fd78fdee0c0408ea2b9ea19e7212e2e7934688412d1fde9cc5deecdc8deea6163a8 SHA512 e1a444d6fc2d1764751ec93d07c132ba7e9b5f4ff390ccad12ae6dcc38d18506c045dcaec33ecfdadceec6a29b2146487c5e7e0246da7359cc957abd943fe56a
+DIST num-utils_0.5-15.debian.tar.xz 17436 BLAKE2B 099e22a67b359072789106581c6d3b4fe006eb0064ad70578c0cf07388d1b9a677eb418d8d79ae59d6a9e0f3bff93e3159448e36c965f314c6bc559f5af70921 SHA512 5cbcf0d984e2c87fc16932bbd3e952a2b38c1272e00b55839d42ffaf28e0a8b0f5e4340ae01124ef34507ec4a144df0a48fa2af087f876cef39fdc5ba20ce0d1
+EBUILD num-utils-0.5-r1.ebuild 1106 BLAKE2B 53c6ace76cfd06ec42dc9ef8ffc02c7f2711243f4fc5f2cea0297b974e0e7c68aa42d3dfa67914cbf4c93d96a947f80acf783e3cb49a00ee0f5e311147c43c9b SHA512 a9a7fd1f2d9567a588d0929ef16262c6a734a5380637f358ca737af7af4bd57b5338cb427c7e2db99ac66366cfd0e278de2b115413d0a71b36c7e317fec2800d
+EBUILD num-utils-0.5-r2.ebuild 1202 BLAKE2B 57737675f383834ff0e3c0e897f74c8a6d7ca5f710af62bbd53a5dee80908361289252fe43489b1917192b96370484aedf383971a626089297f3ec2b381f0667 SHA512 46042e90a8b587947b3722eba43284e4731947181389606e74ff529d4804ab38c1c5b33c6246d112f987f02af56673ea48f26e6b3d0cde8d4e0ac39633e62a87
 MISC metadata.xml 269 BLAKE2B 5511cf8f01948aaca0488a6ed41ed923b130bfea9ba90d49f39bff86cfbd1e956b662d07406c76ca8e7e1d2ceb54547740e9f61a0a16041e5fcf18d713f90f03 SHA512 ecf9121172cdf04793bdbf6684060c7f15fb2a25606e53d8fc7dbc78efe24e264affa600c1ee3106ce8216b7093dff66eced3f78dd6ca7bd6ee589d1c7912cd6
diff --git a/sci-mathematics/num-utils/files/num-utils-0.5-r2-Makefile.patch b/sci-mathematics/num-utils/files/num-utils-0.5-r2-Makefile.patch
new file mode 100644
index 000000000000..b0d331451aa3
--- /dev/null
+++ b/sci-mathematics/num-utils/files/num-utils-0.5-r2-Makefile.patch
@@ -0,0 +1,48 @@
+diff --git a/Makefile b/Makefile
+index 079b442..a6ade95 100644
+--- a/Makefile
++++ b/Makefile
+@@ -22,7 +22,7 @@ VERSION	= $(shell cat VERSION)
+ PROJECT	= num-utils
+ DIST	= $(PROJECT)-$(VERSION)
+ FILES	= $(shell cat MANIFEST)
+-UTILS	= average bound interval normalize numgrep numprocess numsum random range round
++UTILS	= numaverage numbound numinterval numnormalize numgrep numprocess numsum numrandom numrange numround
+ DOCS	= template README GOALS WARNING
+ TESTS	= file fractionalnums numbers numbers2 README zeros
+ # rpm --showrc is gettin to be hard to parse anymore.
+@@ -62,7 +62,7 @@ install:
+ 
+ 	install -m 0755 -o 0 -g 0 -d		$(DESTDIR)/$(MANDIR)
+ 	for man in $(UTILS) ; do \
+-		install -m 0644 -o 0 -g 0 $$man.1.gz $(DESTDIR)/$(MANDIR) ; done
++		install -m 0644 -o 0 -g 0 $$man.1 $(DESTDIR)/$(MANDIR) ; done
+ 
+ uninstall:
+ 	for util in $(UTILS) ; do \
+@@ -74,14 +74,12 @@ uninstall:
+ 	rmdir $(DESTDIR)/$(DOCDIR)
+ 
+ 	for man in $(UTILS) ; do \
+-		rm -f $(DESTDIR)/$(MANDIR)/$$man.1.gz ; done
++		rm -f $(DESTDIR)/$(MANDIR)/$$man.1 ; done
+ 	rmdir $(DESTDIR)/$(MANDIR)
+ 
+ manpages:
+ 	for doc in $(UTILS) ; do \
+-		pod2man $$doc > $$doc.1 ; \
+-		gzip -9 $$doc.1 ; chmod 644 $$doc.1.gz \
+-		; done
++		pod2man $$doc > $$doc.1 ; done
+ 
+ rpminstall:
+ 	install -m 0755 -d		$(BINDIR)
+@@ -94,7 +93,7 @@ rpminstall:
+ 
+ 	install -m 0755 -d		$(MANDIR)
+ 	for man in $(UTILS) ; do \
+-		install -m 0644 $$man.1.gz $(MANDIR) ; done
++		install -m 0644 $$man.1 $(MANDIR) ; done
+ 
+ clean:
+ 	rm -f $(PROJECT).spec
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
index 8d00e1555da9..cc567101a6ba 100644
--- a/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
+++ b/sci-mathematics/num-utils/num-utils-0.5-r1.ebuild
@@ -1,14 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DEB_PR=11
-
 DESCRIPTION="A set of programs for dealing with numbers from the command line"
-HOMEPAGE="http://suso.suso.org/programs/num-utils/"
+HOMEPAGE="https://suso.suso.org/programs/num-utils/index.phtml"
 SRC_URI="
 	http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
@@ -16,14 +13,19 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
+
+PATCHES=(
+	"${WORKDIR}/${PN}_${PV}-${DEB_PR}.diff"
+)
 
 src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff
+	default
+
 	sed \
 		-e 's:../orig/num-utils-0.5/::g' \
 		-i "${S}"/debian/patches/*.diff || die
-	epatch "${S}"/debian/patches/*.diff
+
+	eapply -p0 "${S}"/debian/patches/*.diff
 
 	local x
 	for x in average bound interval normalize random range round; do
diff --git a/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
new file mode 100644
index 000000000000..c8dc82f9031f
--- /dev/null
+++ b/sci-mathematics/num-utils/num-utils-0.5-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DEB_PR=15
+DESCRIPTION="A set of programs for dealing with numbers from the command line"
+HOMEPAGE="https://suso.suso.org/programs/num-utils/index.phtml"
+SRC_URI="
+	http://suso.suso.org/programs/num-utils/downloads/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+# pod2man
+BDEPEND="dev-lang/perl"
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:../orig/num-utils-0.5/::g' \
+		-i "${WORKDIR}"/debian/patches/*.diff || die
+
+	eapply "${WORKDIR}"/debian/patches/*.diff
+	eapply "${FILESDIR}"/${PN}-0.5-r2-Makefile.patch
+
+	local x
+	for x in average bound interval normalize random range round; do
+		mv $x num$x || die "renaming $x failed"
+	done
+
+	sed -i -e "s/\$(PROJECT)/${PF}/" Makefile || die
+
+	sed \
+		-e 's/^RPMDIR/#RPMDIR/' \
+		-e 's/COPYING//' \
+		-e 's/LICENSE//' \
+		-e '/^DOCS/s/MANIFEST//' \
+		-i Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	emake ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	elog "All ${PN} programs have been renamed with prefix 'num' to avoid collisions"
+}