gentoo resync : 30.05.2020

3 files changed, 2 insertions, 50 deletions

diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index e5d1200718fa..6711c01488e3 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,5 @@
-AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 EBUILD rpcsvc-proto-0.ebuild 478 BLAKE2B c7c8e675ea6a1fab782b3b8da093eada21de0ddda0835aeedf0e3aa39828df23b7f6b797c4178f9eccb676ffb45dc059d48b07e88488d7f4771202154d36c67e SHA512 30964ff01fa3043f9719bebce15d3b64d26dd77fa71375db16bc59ba7308d8db5861d2f8619bdbea425576f714ed428587288774c872a53ee1268f304d0abbd2
-EBUILD rpcsvc-proto-1.4.1-r1.ebuild 954 BLAKE2B 38ec166200ca7b5173de5c5be6782339ea52c55f9a3717cb1d9af091bd0ac9cecfcd45c6e1a767632b82b108d2549d7defa8946c88d0e95645f760c07344681a SHA512 e0be6fac36dd860fbb9f407ee37f5e2f81885ef70c330315976e223b669f38368d7622c9585b330b6509235b0ffea20b8196277f94e2b50fe8225a9aed9da609
+EBUILD rpcsvc-proto-1.4.1-r1.ebuild 946 BLAKE2B 91ece062544c6daaa92b52a52aeee51f0f007695c298043a31cc71eb56accf081a3ceeb9a3eb6672119a5c6d47c98741e279616648085b31c3d5a95a94909002 SHA512 7a207992ebe9c185b6044679e05f1bd9d3ad48c4bc50aa8a7c247886944338bfcfbab3a2291b18b051b1eaccc4023e7eac7ca932689c3ad01398d932b553a821
 EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
deleted file mode 100644
index a5088735bbb1..000000000000
--- a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2527c37f956aa38408e251587556a6c8389af319 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 29 Dec 2019 23:38:28 +0000
-Subject: [PATCH] configure.ac: autodetect need for external libintl
-
-uclibc-ng and macos standard libraries don't provide libintl
-facilities. As a result build fails as
-(x86_64-gentoo-linux-uclibc example):
-
-```
-...
-gcc  -g -O2   -o rpcgen rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o rpc_sample.o rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o
-/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: rpc_main.o: in function `usage':
-/root/rpcsvc-proto/rpcgen/rpc_main.c:1403: undefined reference to `libintl_gettext'
-/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: /root/rpcsvc-proto/rpcgen/rpc_main.c:1404: undefined reference to `libintl_gettext'
-...
-```
-
-The change is simple: add gettext m4 macros to detect need
-for libintl and link to an external library if needed.
-
-Tested on x86_64-glibc and x86_64-uclibc-ng.
-
-Reported-by: Anton
-Bug: https://bugs.gentoo.org/637084
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -16,4 +16,7 @@ AC_ISC_POSIX
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
-+AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
-+
- AC_OUTPUT([Makefile rpcgen/Makefile rpcsvc/Makefile])
---- a/rpcgen/Makefile.am
-+++ b/rpcgen/Makefile.am
-@@ -10,3 +10,4 @@ noinst_HEADERS = proto.h rpc_parse.h rpc_scan.h rpc_util.h
- rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
- 	rpc_parse.c rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c \
- 	rpc_util.c
-+rpcgen_LDADD = $(LIBINTL)
--- 
-2.24.1
-
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
index d7df5d09a441..9e60b7f9d8f7 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.