gentoo resync : 29.05.2018

4 files changed, 33 insertions, 70 deletions

diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 7ef5c2531a94..fc6b9b8a33a0 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,4 +1,4 @@
+AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c77314975ba202bcd79f88fa02ee820be4b94896c2217f7eee22b36d6a196b63183d2ad80994c9f3095da9fdc917f2dece2ca9a7e2430cba SHA512 7dfcad992f97c3923402dde1c55c8249c5fd4c88b3291fff15d41010036eec83656b009968f0af67daa94de43d4ef4f0f476ba42dd41a17217edd5f9f4f576cc
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
-EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1578 BLAKE2B 98afe30dfd64a7adbeddd1236eac393e50f0be6a621208dd1f7988dcebc282fc7cbbf29fd624cb69739365b621a466d2a7677e39cf7ff8a4c3995c02752e6441 SHA512 5f7a30d563188980e751d78afc7aced3f157f6de4889f2aa46b9f0b48756da8182d73b3a6a2bde48d6701cb19032dd1c0e32c154438973d703400c38abd7e452
-EBUILD dietlibc-0.34_pre20140729.ebuild 1577 BLAKE2B f4aa508e7c55a86917295819b54f963c5e19117801bde8dba4d0463430f751e749bf72f241b0302ea9ff4ebe42f9ca50d7f2947f06e76ce8bcd47cc9f74009d6 SHA512 fb72a140962341c26031080959a5da32f156e92e97b53c72e46256d86c9c325577ea868643d4474dd15e93c279fc6ec636493ce0c4e0f83d32a3cd966c140143
+EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1696 BLAKE2B 27b3d38a08153c4fe971f1b5a7c0f5d6efa0b375d70d091495b15d03f9b3339b23367b62260b2fd64108ab44ce349ecb6411d48663483473cddf6f75889130b2 SHA512 b1f73f641a5972b96b4a527247715aa608485f3fb05613b92e70eb1e5f5f7de9b64a91fcaeebc74625f33a56294335c79240d48f65287986dcc96ebb203812bd
 MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
index ab312bfd8734..ac5939a008db 100644
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=6
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A libc optimized for small size"
 HOMEPAGE="http://www.fefe.de/dietlibc/"
@@ -16,11 +16,16 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
-DIETHOME=/usr/diet
+DIETHOME="/usr/diet"
 
-S=${WORKDIR}/dietlibc
+S="${WORKDIR}/dietlibc"
 
 src_prepare() {
+	default
+
+	# use __DYN_LIB instead of __PIC__ in i386 socketcalls, bug #644116
+	eapply "${FILESDIR}"/${P}-dyn-lib.patch
+
 	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
 	use sparc && replace-sparc64-flags
 
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
deleted file mode 100644
index c35bb403afe4..000000000000
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A libc optimized for small size"
-HOMEPAGE="http://www.fefe.de/dietlibc/"
-SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DIETHOME=/usr/diet
-
-S=${WORKDIR}/dietlibc
-
-src_prepare() {
-	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
-	use sparc && replace-sparc64-flags
-
-	# gcc-hppa suffers support for SSP, compilation will fail
-	use hppa && strip-unsupported-flags
-
-	# Makefile does not append CFLAGS
-	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
-		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
-		-Wno-unused -Wredundant-decls -fno-strict-aliasing
-
-	# Disable ssp for we default to it on >=gcc-4.8.3
-	append-flags $(test-flags -fno-stack-protector)
-
-	# only use -nopie on archs that support it
-	tc-enables-pie && append-flags -nopie
-
-	sed -i -e 's:strip::' Makefile || die
-	append-flags -Wa,--noexecstack
-}
-
-src_compile() {
-	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		STRIP=":"
-}
-
-src_install() {
-	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
-		DESTDIR="${D}" \
-		install-bin \
-		install-headers \
-		install-profiling
-
-	dobin "${ED}"${DIETHOME}/bin/*
-	doman "${ED}"${DIETHOME}/man/*/*
-	rm -r "${ED}"${DIETHOME}/{man,bin} || die
-
-	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
-}
diff --git a/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch b/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch
new file mode 100644
index 000000000000..fe3fcb072f63
--- /dev/null
+++ b/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch
@@ -0,0 +1,22 @@
+From 843c667c1b516c0764840c6e4d41188f9c96a415 Mon Sep 17 00:00:00 2001
+From: leitner <leitner>
+Date: Mon, 4 Sep 2017 21:59:50 +0000
+Subject: [PATCH] use __DYN_LIB instead of __PIC__ in i386 socketcalls
+
+---
+ i386/syscalls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/i386/syscalls.h b/i386/syscalls.h
+index 11d6f1d5..14ac517b 100644
+--- a/i386/syscalls.h
++++ b/i386/syscalls.h
+@@ -416,7 +416,7 @@ sym: \
+ .Lend##sym: ; \
+ .size sym,.Lend##sym-sym
+ 
+-#ifndef __PIC__
++#ifndef __DYN_LIB
+ #define __socketcall(name,NAME) \
+ .text; \
+ .type name,@function; \