Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 2fbed5a768d2..52d502fdd088 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,5 +1,8 @@
+AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
+DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
 DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
+EBUILD makepp-1.18.ebuild 912 BLAKE2B f9d6509e66bc3e4a1acc4b701d789f7b69174362cdf1ab9076500913cc9098bedf741181ff5b9538ec6add4b6d941905a83d03f6d0e91f96b700c48389a44e1c SHA512 6705554e3809102e768fc571a7a6c14fc79236ae42ad7d470ade34be10f376ccd8936a222b8b4d076fe08ce3735eb6c71973de437daa0c59a2aa13e687178bbc
 EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
 EBUILD makepp-2.0.99.2.ebuild 1018 BLAKE2B 131975a8dcbe6b7ea2e514765c1d46ce61c58f70071aaa38d73bca6e3d8b23b4821a620be37dbb0a821fecc3ce8930453797476a225cb017ee2c8ffa010f9c9c SHA512 4d8c3b7f521fe3f0b0a2c8049852372545f4ff3f1413bab752ee974f43c0f6a0910a351ddb88a81a93b817c7fddc8161256d23bba635ecd370c9e5be017e982c
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/files/makepp-1.18-install.patch b/dev-util/makepp/files/makepp-1.18-install.patch
new file mode 100644
index 000000000000..7d90e2166223
--- /dev/null
+++ b/dev-util/makepp/files/makepp-1.18-install.patch
@@ -0,0 +1,69 @@
+--- install.pl.orig	2003-02-18 13:15:15.000000000 -0800
++++ install.pl	2003-02-18 13:49:10.000000000 -0800
+@@ -31,9 +31,24 @@
+ #
+ # Now figure out where everything goes:
+ #
+-$prefix = "/usr/local";
++$prefix = shift(@ARGV) ||
++	read_with_prompt( "
++You can specify a prefix directory that will simplify defaults for
++further questions.
++
++What should be the prefix directory [$prefix]? ") ||
++	"/usr/local";
++
++$inst_prefix = shift(@ARGV) ||
++	read_with_prompt( "
++You can specify an install prefix that is prefixed to the runtime
++prefix for the install phase only.  This is useful when installing
++into staging directories for packaging systems.
+ 
+-$bindir = shift(@_) ||
++What should the install prefix be []? ") ||
++	"";
++
++$bindir = shift(@ARGV) ||
+   read_with_prompt("
+ Makepp needs to know where you want to install it and its data files.
+ makepp is written in perl, but there is no particular reason to install
+@@ -43,10 +58,7 @@
+ Where should the makepp executable be installed [$prefix/bin]? ") ||
+   "$prefix/bin";
+ 
+-$bindir =~ m@(.*)/bin@ and $prefix = $1;
+-				# See if a prefix was specified.
+-
+-$datadir = shift @_ || read_with_prompt("
++$datadir = shift @ARGV || read_with_prompt("
+ Makepp has a number of library files that it needs to install somewhere.  Some
+ of these are perl modules, but they can't be used by other perl programs, so
+ there's no point in installing them in the perl modules hierarchy; they are
+@@ -55,14 +67,24 @@
+ Where should the library files be installed [$prefix/share/makepp]? ") ||
+   "$prefix/share/makepp";
+ 
+-$htmldir = shift @_ || read_with_prompt("
++$htmldir = shift @ARGV || read_with_prompt("
+ Where should the HTML documentation be installed?
+ Enter \"none\" if you do not want any documentation installed.
+ HTML documentation directory [$prefix/share/makepp/html]: ") ||
+   "$prefix/share/makepp/html";
+ 
+-substitute_file("makepp", $bindir, 0755);
+-substitute_file("recursive_makepp", $datadir, 0644);
++substitute_file("makepp", "$inst_prefix/$bindir", 0755);
++substitute_file("recursive_makepp", "$inst_prefix/$datadir", 0644);
++
++if( $inst_prefix ) {
++	$bindir = join( '/', $inst_prefix, $bindir );
++	$datadir = join( '/', $inst_prefix, $datadir );
++	$htmldir = join( '/', $inst_prefix, $htmldir );
++}
++
++print STDERR "bindir now $bindir\n";
++print STDERR "datadir now $datadir\n";
++print STDERR "htmldir now $htmldir\n";
+ 
+ make_dir("$datadir/Signature");
+ foreach $module (qw(FileInfo FileInfo_makepp MakeEvent Glob Makefile Makesubs Rule
diff --git a/dev-util/makepp/makepp-1.18.ebuild b/dev-util/makepp/makepp-1.18.ebuild
new file mode 100644
index 000000000000..a5cef1c94211
--- /dev/null
+++ b/dev-util/makepp/makepp-1.18.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND=">=dev-lang/perl-5.6.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install.patch
+	# There is a sandbox violation in this test.
+	# In future versions, this ebuild should try to find
+	# a better way of avoiding this, but the current version
+	# appears to have garbage NUL characters all over the test files,
+	# making them complicated to edit.
+	# Robert Coie <rac@gentoo.org> 2002.02.18
+	rm "${S}"/makepp_tests/include.test
+}
+
+src_compile() {
+	make test || die
+}
+
+src_install() {
+	perl install.pl /usr "${D}" /usr/bin /usr/share/makepp /usr/share/doc/makepp
+}