gentoo resync : 02.04.2018

5 files changed, 96 insertions, 6 deletions

diff --git a/dev-perl/Ace/Ace-1.920.0-r3.ebuild b/dev-perl/Ace/Ace-1.920.0-r3.ebuild
index c8263c2086b5..e46cfba0c5e5 100644
--- a/dev-perl/Ace/Ace-1.920.0-r3.ebuild
+++ b/dev-perl/Ace/Ace-1.920.0-r3.ebuild
@@ -7,7 +7,7 @@ DIST_NAME=AcePerl
 DIST_AUTHOR=LDS
 DIST_VERSION=1.92
 DIST_EXAMPLES=("examples/*")
-inherit perl-module
+inherit perl-module toolchain-funcs
 
 DESCRIPTION="Object-Oriented Access to ACEDB Databases"
 
@@ -23,18 +23,20 @@ RDEPEND="virtual/perl-Digest-MD5
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i 's/", "1")/", "3")/' "${S}/Makefile.PL" || die "Can't patch config"
+	eapply "${FILESDIR}/${PN}-1.92-rpcxs.patch"
+	eapply "${FILESDIR}/${PN}-1.92-gcc-nonvoid.patch"
+
 	cat > "${S}/acelib/wmake/DARWIN_DEF" <<EOF
 NAME = DARWIN
-COMPILER = clang -fwritable-strings -DACEDB4 -DPOSIX
-LINKER = clang
+COMPILER = $(tc-getCC) -fwritable-strings -DACEDB4 -DPOSIX
+LINKER = $(tc-getLD)
 
 LIBS = -lm
 
 EOF
 
 	if use elibc_glibc ; then
-		sed -i -e 's:^USEROPTS=:USEROPTS=-I/usr/include/tirpc :g' -e 's:^LIBS =:LIBS = -ltirpc:g' "${S}/acelib/wmake/LINUX_DEF"
+		eapply "${FILESDIR}/${PN}-1.92-glibc26.patch"
 		export LIBS="-ltirpc"
 	fi
 
diff --git a/dev-perl/Ace/Manifest b/dev-perl/Ace/Manifest
index ef3890c74a74..461cce9bcb29 100644
--- a/dev-perl/Ace/Manifest
+++ b/dev-perl/Ace/Manifest
@@ -1,5 +1,8 @@
+AUX Ace-1.92-gcc-nonvoid.patch 729 BLAKE2B d98d4d2925f8f10f55f64c945ff61509c3ba9fe585432623b97d50eb65ae827ad30e03b653d0e3c2cc7de7bdedff5e312b5383ca303a24c6aa2f5cd95f0bbb81 SHA512 69b2c93de2457aee9908374c475ae2c3aa3e03bcec807abe86ba0a39d28ee41ea2d0a6aaebe99067e50f044933e6b19ea16d1c6e0bd6423b4bb54bf09bf30e90
+AUX Ace-1.92-glibc26.patch 749 BLAKE2B 261d699ab79bb625cf8590c900913ee35363b7cd7a70d3ec82a3866c9e06c33e70f760610b65e2591b1becbff5b58264c61917628cddbd8a2d490ea6c4911e0d SHA512 a383275a27abaf533174395040513dc47355a1c56d660d7221e4142ea90a1ca97957f8fd981476ec62744df7a65037b44ad957467962ce5aa730f2fba916f7d1
+AUX Ace-1.92-rpcxs.patch 819 BLAKE2B 2eb978b7bbced6b67976685d8102724f6357983459e90a14fdab1cb696a8e8c033093d3427cf7aec820aa27eb0f71c9d505962dc2aa62ca67455562b869a5179 SHA512 ae26f67a5a0b91652c90dbb4beea7553e3affc40a15db52247ba28e4171f150c4ffa70ce15b69ce3735176c810b36105b00fb5675f4320340354a929568b49d9
 DIST AcePerl-1.92.tar.gz 300163 BLAKE2B 4fac4d7f56d31f179a1a310688cde078371a1e6605b229016a5a2f3a32de01bf3421c459eeefcdfdd12df3baf34d6495c8e7998e1c66a47215ea2abd741303b6 SHA512 0db8392336dd48c58bdaf8d8d9ac6d1106124259f27fa95951aa8d496014e1e8b89ed87f6df276473e3bcb44a8d323f864178a9b84dd1e787d614bd0b8e93be9
 EBUILD Ace-1.920.0-r1.ebuild 390 BLAKE2B 0ebada0a7083cfeaf609a6fc94b1fefb274fd6907d6f41b8286d91714364c3c5bb51e1429ddc9b4fb3b75624367085caed1708a60444c0b6c48d2b17b5543394 SHA512 3ad41c3cc828bdc55beddf2852b5a7b98236416fded8b10367f7bfc0192fcd14b0ffd1f476792fd0c33571a394a80461fa6ceadeaf0bc1dc3520dc0f115db9bc
 EBUILD Ace-1.920.0-r2.ebuild 2549 BLAKE2B ddefb1e0b5efc25a98a9364497fd39475f0cb71796ffe7045a219095dc3c75711db6e2e746c2be4c565b9934660f39d5534fcde092a2844ec7bb1589a30801b7 SHA512 ba43b8facb594c8043c915e794130092f540b472b0df565b648e11fa809c73bf83aefb52a4723edb0f79c64109090447b07e1a4481ee9b3229af99c028d7c8c8
-EBUILD Ace-1.920.0-r3.ebuild 2953 BLAKE2B 357adf953c2150d200bb18026a2492d52962b660090b8f0176bd9e994d2902bfb77412d43261d722aef585e9b5bf1ada57753216db66bbf4883580f2469919da SHA512 84ac8eebb8f5eca442ad77a049702f5c5bf123f83dc8033ae7b48b6fcb3027452de0599d00fa9f5ee7f24c075c0ae6c1cd5f3d010bcd83e6ea917ad5bba6d501
+EBUILD Ace-1.920.0-r3.ebuild 2928 BLAKE2B 3578aad242c68490d34192bbe1b903a2fca7d016bf97952fcdb1915068d463a33cb0e54209c1c8dd2c73836312d0a821dcfd72d89f6eec6cd86b9b202fba73ef SHA512 a5bf42540b42f46148f704f6c97f27f0e336ca1b23dbdb7ac6dda9319dbb7f7d25d610bf4846a7eb341d698c951a257585515b4555f1899cbb3594280fd672d2
 MISC metadata.xml 3416 BLAKE2B 4385d220ac60f2e41750bb1afeff4f9a9055526710db08c2688f1e3787a17f2d9943af22825c8ec554c832f2a428410578baf25044348cbc984114890adcc770 SHA512 aa3443c187165f3cf97e7110238cb039242345071f9e3f74ed40e39a9ce0720062706dd78539eff1553703ed5e8cf55d42b924ebae3cc992366358d300ec544d
diff --git a/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch b/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch
new file mode 100644
index 000000000000..78c0572ed6ff
--- /dev/null
+++ b/dev-perl/Ace/files/Ace-1.92-gcc-nonvoid.patch
@@ -0,0 +1,31 @@
+From c36659030eab65bcf7017e099377bf87a04d1667 Mon Sep 17 00:00:00 2001
+From: Anton Molyboha <anton.stay.connected@gmail.com>
+Date: Fri, 10 Nov 2017 17:37:54 -0500
+Subject: Fix compile with newer gcc "non-void function 'constant' should ..."
+
+Bug: https://bugs.gentoo.org/637330
+Bug: https://rt.cpan.org/Ticket/Display.html?id=123593
+---
+ RPC/RPC.xs | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/RPC/RPC.xs b/RPC/RPC.xs
+index 3e059c0..cd4f6fa 100644
+--- a/RPC/RPC.xs
++++ b/RPC/RPC.xs
+@@ -152,12 +152,6 @@ int arg;
+     case 'Z':
+ 	break;
+     case '_':
+-	if (strEQ(name, "_ACECLIENT_"))
+-#ifdef _ACECLIENT_
+-	    return _ACECLIENT_;
+-#else
+-	    goto not_there;
+-#endif
+ 	break;
+     }
+     errno = EINVAL;
+-- 
+2.16.2
+
diff --git a/dev-perl/Ace/files/Ace-1.92-glibc26.patch b/dev-perl/Ace/files/Ace-1.92-glibc26.patch
new file mode 100644
index 000000000000..93913485b2f4
--- /dev/null
+++ b/dev-perl/Ace/files/Ace-1.92-glibc26.patch
@@ -0,0 +1,29 @@
+From 79cbe4803f73eab5474e709b20ed570a44071182 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 31 Mar 2018 08:12:32 +1300
+Subject: Fix building with GlibC 2.26
+
+Bug: https://bugs.gentoo.org/637114
+---
+ acelib/wmake/LINUX_DEF | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/acelib/wmake/LINUX_DEF b/acelib/wmake/LINUX_DEF
+index ba96774..bd89334 100644
+--- a/acelib/wmake/LINUX_DEF
++++ b/acelib/wmake/LINUX_DEF
+@@ -18,9 +18,9 @@
+ NAME = LINUX
+ COMPILER = gcc -g -Wall -O2 -DACEDB4
+ LINKER = gcc -g
+-USEROPTS=-fPIC
++USEROPTS=-I/usr/include/tirpc -fPIC
+ 
+-LIBS = -lm
++LIBS = -ltirpc -lm
+ Xt_LIBS = -L/usr/X11R6/lib -lXaw -lXt -lXmu -lXext -lX11
+ LEX_LIBS = 
+ 
+-- 
+2.16.2
+
diff --git a/dev-perl/Ace/files/Ace-1.92-rpcxs.patch b/dev-perl/Ace/files/Ace-1.92-rpcxs.patch
new file mode 100644
index 000000000000..be67f6fe1168
--- /dev/null
+++ b/dev-perl/Ace/files/Ace-1.92-rpcxs.patch
@@ -0,0 +1,25 @@
+From f44e3b39758057e3a5af7654768d40de2b249ae5 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Fri, 13 Oct 2017 17:30:57 +1300
+Subject: Enable RPC and XS support
+
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 232bc42..7a312fd 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -10,7 +10,7 @@ while (!$choice) {
+ 		  "  1) Interface to Ace socket server and local databases (pure Perl)\n" .
+ 		  "  2) The above plus XS optimizations (requires C compiler)\n" .
+ 		  "  3) The above plus RPC server interface (requires C compiler)\n\n" .
+-		  "Enter your choice: ", "1");
++		  "Enter your choice: ", "3");
+   if ($reply =~ /(\d+)/) {
+     $choice = $1;
+     die "invalid choice: $choice!" if $choice < 1  ||  $choice > 3;
+-- 
+2.16.2
+