gentoo resync : 28.04.2019

3 files changed, 78 insertions, 2 deletions

diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 08a04938d878..4cd58a14e9d9 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,3 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
-EBUILD libpsl-0.20.2.ebuild 1454 BLAKE2B 28c1e1c78e913245e0210b08cfb9dddba48cd1c995222c884a1c39fe43567bd0913ab4e2d76c3bccc522162fa1a8848a7bd13a1bcd71cb4ed5501a720d243c56 SHA512 8f15cc0b55a3b7fa388fe249fe34c1158727c420f0bdbce38c591b88926191eefb5b38dd76aa99e4e1c91d20aa4be5c830ac3a3634714e325e0ac5c2563713d2
+DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
+EBUILD libpsl-0.20.2.ebuild 1461 BLAKE2B 2f07b01bdd6afe98646c0bcf8c3ad7cef361cbc1b47348a2add40031a0975a35a6c69dccefcd5eb7bbbb76895d2f8d320eacf230e48a13757288fe90fef1cb99 SHA512 f38e604f17c5a6c329cd32ce218d41a49ef2d8ac65a52fb09ce1ea3a10a8ba89bf79b7348e7a0d9d05a11ff3e60c5bdc340c257dc833094aec2e0d54b1686fff
+EBUILD libpsl-0.21.0.ebuild 1461 BLAKE2B 2f07b01bdd6afe98646c0bcf8c3ad7cef361cbc1b47348a2add40031a0975a35a6c69dccefcd5eb7bbbb76895d2f8d320eacf230e48a13757288fe90fef1cb99 SHA512 f38e604f17c5a6c329cd32ce218d41a49ef2d8ac65a52fb09ce1ea3a10a8ba89bf79b7348e7a0d9d05a11ff3e60c5bdc340c257dc833094aec2e0d54b1686fff
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index 80c11e68aac9..fd6aa857e238 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~s390 ~sparc ~x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
new file mode 100644
index 000000000000..fd6aa857e238
--- /dev/null
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_{5,6,7}})
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="C library for the Public Suffix List"
+HOMEPAGE="https://github.com/rockdaboot/libpsl"
+SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~s390 ~sparc ~x86"
+IUSE="icu +idn +man"
+
+RDEPEND="
+	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
+	idn? (
+		dev-libs/libunistring[${MULTILIB_USEDEP}]
+		net-dns/libidn2:=[${MULTILIB_USEDEP}]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	man? ( dev-libs/libxslt )
+"
+
+pkg_pretend() {
+	if use icu && use idn ; then
+		ewarn "\"icu\" and \"idn\" USE flags are enabled."
+		ewarn "Using \"idn\"."
+	fi
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-asan
+		--disable-cfi
+		--disable-ubsan
+		$(use_enable man)
+	)
+
+	# Prefer idn even if icu is in USE as well
+	if use idn ; then
+		myeconfargs+=(
+			--enable-builtin=libidn2
+			--enable-runtime=libidn2
+		)
+	elif use icu ; then
+		myeconfargs+=(
+			--enable-builtin=libicu
+			--enable-runtime=libicu
+		)
+	else
+		myeconfargs+=( --disable-runtime )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}