gentoo resync 08.09.2018

4 files changed, 69 insertions, 5 deletions

diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 9da035485b46..8e6424568782 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -4,7 +4,9 @@ AUX libtirpc-1.0.2-exports.patch 424 BLAKE2B c5292cd01b7b8ffd6be3fcd5842f66ce20b
 AUX libtirpc-1.0.2-glibc-2.26.patch 276 BLAKE2B 8e557e3c40c4c12339d90c238b26ee396f0ed92622907bf829bb2758119d45a401e29610b5b30c1e9177922546bc1fab535d005df43061cbcca09b8be9a0416f SHA512 67256d618db1330eeb616ade4b79376a600ed2457c03b420fc88b9ba89ea2451c9aac3f48c4967bc5695f10e6d8c895370cc10144ecc53ed0d3810d4cf65265a
 DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
 DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
+DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
-EBUILD libtirpc-1.0.2-r1.ebuild 1634 BLAKE2B 1a95787b197965383fbab8f5c7c475df2ced8d21b331c11fc351bda1e17b864ba74bff204d140776a1c1384fce42ae580fc6403ce1b88e946716b4d2274f7881 SHA512 8cb2e688bb9b1b4a8cdfd48ef19e608f68588af6f4d4bb2a1c8d770d44a9909db5634507f664ad305d4ba2e71402fd52a32a3f01096a50d84d32e34f5cf3beaa
-EBUILD libtirpc-1.0.3.ebuild 1562 BLAKE2B 544ee8a721fc1e7f04e41ac1ce778b9d5c13093782282679aa58e16c3fe10dca06fcd7c4deffb99cd7c5b7d46655a4bf036e2233e434a1374c690bca9bc69f38 SHA512 769c5e2666f6621aef826d8b4a2364d8038627004e96e1979029cff0dbae83d22398e031284ad3896490d8fececd4eba9ccc9223ce0861636c4e68a6d6d2b797
+EBUILD libtirpc-1.0.2-r1.ebuild 1623 BLAKE2B 8c5bd3d83726459b32305c1a4404618a576caa22ef78c3b131bb3df4e69de6fc17a05a3d0e8187023a7422832a5d9f0befd1b2a13d1360c6aa7e2b60c222d41f SHA512 d9dd4009fc6ddddebdc9606935eab9ae88cfef2330d63c23529e0122ee3687098c5bf0447751112af622c5653ef02c2d1188ddd497349f02fb6a3895d2787bea
+EBUILD libtirpc-1.0.3.ebuild 1538 BLAKE2B 314c521489ba189ee6158743027dfc7558171e845102d51f3fd5eb7b7fe4aac839611ccac272fa2c1f72f8c65173715e6c4a9b84c99d0d02fdfb1d5875c82a14 SHA512 ca43ba15a2c642ae9165b516ab3d0a0df974021c168482d609feea331f92eb952419c92f3a5649d51e97ca51dac538b37e06510263ec3f3146241a934018309a
+EBUILD libtirpc-1.1.4.ebuild 1538 BLAKE2B 314c521489ba189ee6158743027dfc7558171e845102d51f3fd5eb7b7fe4aac839611ccac272fa2c1f72f8c65173715e6c4a9b84c99d0d02fdfb1d5875c82a14 SHA512 ca43ba15a2c642ae9165b516ab3d0a0df974021c168482d609feea331f92eb952419c92f3a5649d51e97ca51dac538b37e06510263ec3f3146241a934018309a
 MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
diff --git a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
index e299ad562072..78e72ddcfc29 100644
--- a/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
index 355ad74c14ae..edd425c4147f 100644
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
@@ -27,7 +27,6 @@ PATCHES=(
 src_prepare() {
 	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
 	default
-	eapply_user
 	eautoreconf
 }
 
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
new file mode 100644
index 000000000000..edd425c4147f
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
+)
+
+src_prepare() {
+	cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable kerberos gssapi)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	# libtirpc replaces rpc support in glibc, so we need it in /
+	gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc
+	doins doc/netconfig
+
+	insinto /usr/include/tirpc
+	doins -r "${WORKDIR}"/tirpc/*
+
+	# makes sure that the linking order for nfs-utils is proper, as
+	# libtool would inject a libgssglue dependency in the list.
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}