Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

4 files changed, 86 insertions, 0 deletions

diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 13bd9f58b956..24f3dc20b435 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,4 +1,9 @@
+AUX lwp-2.0-amd64.patch 866 BLAKE2B 231e806f36c17ec0501e0ec646f16093408ecd25bf612a29a0cd34550c966f53b891d1f2522cb810a2fec9661cef2be9747537a17e06f6e8f6e257dc7694eb50 SHA512 f66c3d7111673ddf503a8ebd82fe22db9bf92dcc4bb7d9ce8fbfd3c65fb699a4f240c04700fcdb08c582a4f2be8da7ed870ba07cbc3d81110b2fc29f69028dd0
 AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
+DIST lwp-2.2.tar.gz 376136 BLAKE2B 2f80ccab5cdc7e910a0ae41416a24a8fd2a6da86799f1393b23fb570d61e6973aa4ebc70fec8d3343465bbc5eea1280fa70d14ca2678d2b2d490333b5cef2f2a SHA512 a5fa52c0483e04fdbface5f0e9cc85bab5db59c4d730a3cb3c538ccaa3a88aaa916b37478e4c5450e77bcc45638987610ba619995a75541d728f138f103c5d7e
+DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47a1e58375775a80c96b739cc17acf6aacf3b161e53445d947af341a555edbd2cb8783741075bfacaea43 SHA512 ad8374ddf55ef9fddf9ce0b8d7c2ae0dc206e5108a01f278a37486070ab70e5bd7312f057863254b4fc430cfbed2c36f589807813e6a99067933142d5225395b
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
+EBUILD lwp-2.2.ebuild 743 BLAKE2B 9769b2d8bef4dbac08721740c7a06c0546f2db5d54e6c8277bfa4505b331910cf04a72af56b01af88fd5ce21268865ab4cdb048e95e2e1502efef3add1199e93 SHA512 a0f6b1911cf58893fcf81753e43f41c25d8e9151ad15189cb3e99fd432fbd2d6761002887a2df52e3479a70e1f292486ee61835d9802bdb686ece8228a052c16
+EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
 EBUILD lwp-2.8.ebuild 522 BLAKE2B fb5f3ed46c3f5b025604f6e64d43fbad5d173c9319cfbe2792bdbf452a2525f71a4501ccccf3d89edd84ba7fb6f148faecfa00f6f3a2c95c48f69c17801ea38e SHA512 7f57ee9faeef1bfc493c1c6c7ab6b7aa5a6131d7861b0fa5aae82231103bc727a6d60e43206eacd22b029750460a4b8b71526ab32a567807ff1b24b85979ee58
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/files/lwp-2.0-amd64.patch b/sys-libs/lwp/files/lwp-2.0-amd64.patch
new file mode 100644
index 000000000000..64a1576f0894
--- /dev/null
+++ b/sys-libs/lwp/files/lwp-2.0-amd64.patch
@@ -0,0 +1,28 @@
+diff -ruN lwp-2.0/src/lwp.c lwp-2.0-fixed/src/lwp.c
+--- lwp-2.0/src/lwp.c	2005-03-25 17:50:56.000000000 +0100
++++ lwp-2.0-fixed/src/lwp.c	2005-05-05 14:32:56.580753096 +0200
+@@ -463,6 +463,16 @@
+ #ifndef MMAP_LWP_STACKS
+     stackptr = (char *) malloc(stacksize);
+ #else
++    pagesize = getpagesize();
++
++#if defined(__x86_64__)
++    /* [gb] Ensure minimal stack size. Heuristically determined
++       through tdb test that 2048 is too small when printf() et al. come
++       into action.  */
++    if (stacksize < pagesize)
++	stacksize = pagesize;
++#endif
++
+ #ifdef MAP_ANON
+     stackptr = mmap(lwp_stackbase, stacksize, PROT_READ | PROT_WRITE,
+ 		    MAP_PRIVATE | MAP_ANON, -1, 0);
+@@ -483,7 +493,6 @@
+ 	perror("stack: ");
+ 	assert(0);
+     }
+-    pagesize = getpagesize();
+     lwp_stackbase += ((stacksize/pagesize) + 2) * pagesize;
+ #endif
+     if (!stackptr)
diff --git a/sys-libs/lwp/lwp-2.2.ebuild b/sys-libs/lwp/lwp-2.2.ebuild
new file mode 100644
index 000000000000..85cd229c0241
--- /dev/null
+++ b/sys-libs/lwp/lwp-2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="Light weight process library (used by Coda).  This is NOT libwww-perl"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/grep
+	sys-apps/sed
+	sys-devel/libtool
+	sys-devel/gcc"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Was introduced for bug #34542, not sure if still needed
+	use amd64 && epatch "${FILESDIR}"/lwp-2.0-amd64.patch
+}
+
+src_install() {
+	einstall || die "einstall failed."
+	dodoc AUTHORS NEWS PORTING README
+}
diff --git a/sys-libs/lwp/lwp-2.6-r1.ebuild b/sys-libs/lwp/lwp-2.6-r1.ebuild
new file mode 100644
index 000000000000..f4206728130a
--- /dev/null
+++ b/sys-libs/lwp/lwp-2.6-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Light-weight process library (used by Coda)"
+HOMEPAGE="http://www.coda.cs.cmu.edu/"
+SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	eapply_user
+	# Was introduced for bug #34542, not sure if still needed
+	use amd64 && eapply "${FILESDIR}"/lwp-2.0-amd64.patch
+}