gentoo resync : 01.12.2017

6 files changed, 153 insertions, 61 deletions

diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index 8a1af338ee55..443e421b3a9f 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,6 +1,7 @@
-DIST libaal-1.0.5.tar.gz 336052 SHA256 ff1adb7aa7b917010d827f2e451fad8cb65ce981877d762b48baf20e89212e81 SHA512 1e4076ce4228a7947074ce2764da63f48cbeb4086cf6ab75b882ecd4ff07d4de3a6f5411c5c0b9cdd1c279b3bb98f92f5da3892e5479b7112b67703fddc102be WHIRLPOOL 805ffefdf22b6df05e57d0f836940c4f5748dba8fa5d6933bf07f410ae85f3914353d0697eb33dbc7a927e6d367bd9ab1e85caa1c1be94f710d0395f52854432
-DIST libaal-1.0.6.tar.gz 345894 SHA256 b1a1547746438b156156f82332557b05442e6d6c39fa9fe0d8dd47a3ad16ce9c SHA512 9b13096abcb90e75fff607ffd7b11ed8b100f349800b726acb01aca12f54abe784adb9912916fe8ed0751ebf367ecced04ab058e1e8b947f4209a5e6c390f123 WHIRLPOOL 7d93c3dc6eb62712a460f37bc933588c0b71d17472c64104a5cba939324af801ca0ba37063cd020caf8aa0d352a21b5222f838b427fbba0c03144b89d64e98c6
-EBUILD libaal-1.0.5-r1.ebuild 768 BLAKE2B 0509ddd86031f1940287b6f2f0365b8d068997d4877b29f890784707bf8ca2c1fac54407b8078a8d8f553bf0f554492acba62b2ab3af2b957f58d3ffa9655cb8 SHA512 2f98016332c69a1f493d40bd5898dce9b934f18fa948e0a55333f46f9e1bf49fb857157574fa8f5e56931ba63ff22e7183ed789a687b96c01f937710fe603db2
-EBUILD libaal-1.0.5.ebuild 1053 BLAKE2B ee148ed765e9850d25686b325cc00d5029ed91ef0636853348116f44dd0d16bcde2601848b61c78fcfb90c5aec33f99b3b8de1b22cc5079668a7699cdcf6b831 SHA512 794c0a5e5d49f0abec65981e8a5b494cc1344ea370c5bc6f27a9d0f4b6964add4120751c7820575f9147a862f02169838d4b09770ff2344cd497f127b24c4cbb
-EBUILD libaal-1.0.6.ebuild 792 BLAKE2B ed24ad3ac8f4effd7f9e28ce850fb2caac13d28ccdf79e685d6d82b8753ea25165be6ec5bebe255d035312af7a2a8b5baadce19b2967b8ea80cf3346e2d3b964 SHA512 66013e3b2c5c0d13027dac0ffa0a02a6c59d10ee65531b95ee9627875bce0e5c3764244e88f8275f49e0d38843d5b40f265123e658ef8e33da8a3591b129e780
+AUX libaal-1.0.6-glibc26.patch 2471 BLAKE2B aac8ae431a32f5f9ee6a5d763b7aa1ab5e80c1531fee7cf75cb2aeb77dbaa66cf3cde5a55f3f5b824fec1e19c1133ff16ae22aedf5a4ec97842caf39a70ce3f0 SHA512 391741ed77da1c43d00df22dac8531fe3ee1f187fd449a82b6f6a9aa0f493ada19745c6ded76dcedae2a9d26df9da93dbb22c4737c0263d06983ebd0c6ac887d
+DIST libaal-1.0.6.tar.gz 345894 BLAKE2B 726eb26d80ce5cb198a059e74ded76d7ce97aabd2bd38209194462be9c6ffd5aafbfff3a35fddcae8b6b1c88ad8a378a6328217aed490f156bbb806d4ec687b9 SHA512 9b13096abcb90e75fff607ffd7b11ed8b100f349800b726acb01aca12f54abe784adb9912916fe8ed0751ebf367ecced04ab058e1e8b947f4209a5e6c390f123
+DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
+EBUILD libaal-1.0.6.ebuild 847 BLAKE2B 71a5618935ed8f307bc722d90004f77bc8d9a97dc4119467b0803db674c2b515d1b876d2d3c7829e98dd2b3babbbe87f7a07a539a2ddb762623ca14d53fc2d75 SHA512 140e9aa17bdd4fea3cbbf9a87cd14eeed7611744464e2796846e86ab12be1c530a07cc394b43b20218aca9d70ebc8f2d80157ed02cd72067f70332e53faa26da
+EBUILD libaal-1.0.7-r1.ebuild 848 BLAKE2B c3c63ac7020a7e96eccdece29f627f72eaed71b09fd5d94f5fa35855f557bd07054cb7fbf9f4f8541abb7e25308adf3adc94545aa425b4db9d761af6a5ca0214 SHA512 ed5aff2f56da630aaf052590f4c0e9905a2733172774d68b1c3ef3da88c97a02cbb078076331df949b32d87c139d16f2e3529cd7ea8d2bfd036a5c381b33300a
+EBUILD libaal-1.0.7.ebuild 844 BLAKE2B 783deefbb9d7b7a07ac0b688a08dc2361cda8a8621a35ef57a981ad08cdbb2a60107333d0f7aa94bec76b340515d58b96b70d9df8eecdc80b95a581abb53e956 SHA512 e9dec22f5b22f32f7653f5b902aa364e7d18611ba7325524e84e9a171f992584a91215c86ac551faf144c08911df9680bca2bed60a243de5cc55c30b6e5ea2fd
 MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df
diff --git a/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch b/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch
new file mode 100644
index 000000000000..298d75ae2d74
--- /dev/null
+++ b/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch
@@ -0,0 +1,89 @@
+Stop redefining libc definitions that cause build failures under glibc-2.26.
+
+[   46s] In file included from /usr/include/sys/types.h:156:0,
+[   46s]  from /usr/include/stdlib.h:279,
+[   46s]  from malloc.c:15:
+[   46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for 
+'int64_t'
+[   46s]  typedef __int64_t int64_t;
+[   46s]^~~
+[   46s] In file included from ../include/aal/libaal.h:17:0,
+[   46s]  from malloc.c:6:
+[   46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' 
+was here
+[   46s]  typedef long long int   int64_t;
+
+Author: Jan Engelhardt
+
+---
+ include/aal/types.h |   48 ++----------------------------------------------
+ 1 file changed, 2 insertions(+), 46 deletions(-)
+
+Index: libaal-1.0.6/include/aal/types.h
+===================================================================
+--- libaal-1.0.6.orig/include/aal/types.h
++++ libaal-1.0.6/include/aal/types.h
+@@ -26,24 +26,7 @@
+ #undef ESTRUCT
+ #define ESTRUCT                 50
+ 
+-#ifndef __int8_t_defined
+-#define __int8_t_defined
+-typedef signed char             int8_t;
+-typedef short int               int16_t;
+-typedef int                     int32_t;
+-__extension__
+-typedef long long int           int64_t;
+-#endif
+- 
+-typedef unsigned char           uint8_t;
+-typedef unsigned short int      uint16_t;
+-#ifndef __uint32_t_defined
+-#define __uint32_t_defined
+-typedef unsigned int            uint32_t;
+-__extension__
+-typedef unsigned long long int  uint64_t;
+-#endif
+-
++#include <stdint.h>
+ #define MAX_UINT8  ((uint8_t)~0)
+ #define MAX_UINT16 ((uint16_t)~0)
+ #define MAX_UINT32 ((uint32_t)~0)
+@@ -53,36 +36,9 @@ typedef unsigned long long int  uint64_t
+    because we don't want use gcc builtins in minimal mode for achive as small
+    binary size as possible. */
+ 
+-#ifndef ENABLE_MINIMAL
+ #  include <stdarg.h>
+-#else
+-#ifndef _VA_LIST_
+-#define _VA_LIST_
+-typedef char *va_list;
+-#endif
+-#undef va_arg
+-#undef va_end
+-#undef va_start
+-
+-#define va_end(ap)       \
+-        do {} while(0);
+-
+-#define va_start(ap, p)  \
+-        (ap = (char *)(&(p)+1))
+-
+-#define va_arg(ap, type) \
+-        ((type *)(ap += sizeof(type)))[-1]
+-#endif
+-
+-/* As libaal may be used without any standard headers, we need to declare NULL
+-   macro here in order to avoid compilation errors. */
+-#undef NULL
+ 
+-#if defined(__cplusplus)
+-#  define NULL 0
+-#else
+-#  define NULL ((void *)0)
+-#endif
++#include <stdio.h>
+ 
+ /* Simple type for direction denoting */
+ enum aal_dir {
diff --git a/sys-libs/libaal/libaal-1.0.5.ebuild b/sys-libs/libaal/libaal-1.0.5.ebuild
deleted file mode 100644
index 23f7867dfa69..000000000000
--- a/sys-libs/libaal/libaal-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="library required by reiser4progs"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/"
-SRC_URI="mirror://kernel/linux/utils/fs/reiser4/libaal/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# remove stupid CFLAG hardcodes
-	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	cat <<-EOF > run-ldconfig
-		#!/bin/sh
-		true
-	EOF
-}
-
-src_compile() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
-
-	# move shared libs to /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libaal.so libaal-minimal.so
-}
diff --git a/sys-libs/libaal/libaal-1.0.6.ebuild b/sys-libs/libaal/libaal-1.0.6.ebuild
index 91f3ab182e1e..21061c06745e 100644
--- a/sys-libs/libaal/libaal-1.0.6.ebuild
+++ b/sys-libs/libaal/libaal-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="library required by reiser4progs"
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
@@ -23,6 +23,7 @@ src_prepare() {
 		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
 		configure || die "sed"
 	printf '#!/bin/sh\n:\n' > run-ldconfig
+	epatch "${FILESDIR}"/${PN}-1.0.6-glibc26.patch
 }
 
 src_configure() {
diff --git a/sys-libs/libaal/libaal-1.0.7-r1.ebuild b/sys-libs/libaal/libaal-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..bd15352a4c18
--- /dev/null
+++ b/sys-libs/libaal/libaal-1.0.7-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="library required by reiser4progs"
+HOMEPAGE="https://sourceforge.net/projects/reiser4/"
+SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+
+	# remove stupid CFLAG hardcodes
+	sed -i \
+		-e "/GENERIC_CFLAGS/s:-O3::" \
+		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
+		configure || die
+	printf '#!/bin/sh\n:\n' > run-ldconfig || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-libminimal
+		--enable-memory-manager
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a aal{,-minimal}
+}
diff --git a/sys-libs/libaal/libaal-1.0.5-r1.ebuild b/sys-libs/libaal/libaal-1.0.7.ebuild
index ae2314925de7..78fb9df4d93b 100644
--- a/sys-libs/libaal/libaal-1.0.5-r1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -14,20 +14,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
 IUSE="static-libs"
 
+DEPEND="virtual/os-headers"
+
 src_prepare() {
+	default
+
 	# remove stupid CFLAG hardcodes
 	sed -i \
 		-e "/GENERIC_CFLAGS/s:-O3::" \
 		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
-		configure || die "sed"
-	printf '#!/bin/sh\n:\n' > run-ldconfig
+		configure || die
+	printf '#!/bin/sh\n:\n' > run-ldconfig || die
 }
 
 src_configure() {
-	econf \
-		--enable-libminimal \
-		--enable-memory-manager \
+	local myeconfargs=(
+		--enable-libminimal
+		--enable-memory-manager
 		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {