diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:22:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-24 17:22:19 +0000 |
| commit | aa3411e241a201d53a2689766fe419f2756819f3 (patch) | |
| tree | cc19adfde0a10aab1ab566c8dfe3c1616e5cc390 /net-libs/libpsl | |
| parent | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (diff) | |
gentoo resync : 24.03.2019
Diffstat (limited to 'net-libs/libpsl')
| -rw-r--r-- | net-libs/libpsl/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/libpsl/libpsl-0.20.2.ebuild | 39 |
2 files changed, 22 insertions, 19 deletions
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest index 1d401e12ea9c..22d81fb926d4 100644 --- a/net-libs/libpsl/Manifest +++ b/net-libs/libpsl/Manifest @@ -1,3 +1,3 @@ DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe -EBUILD libpsl-0.20.2.ebuild 1255 BLAKE2B 12acd8586de06566ec80715e192d1de1f13e0607157926a31bec2a926e1ddd776a0ff54d330f469f7f58d040c856862b754829500ddd1d0a993e2c84fc727d89 SHA512 f572e03390841e4a3e0a0664d23e275b9e00ca973ea509147fa8ff35d504f25b04a458e4fb068ec96d194f8004221d278a446600ace4c75c1afe5e5d1b08846b +EBUILD libpsl-0.20.2.ebuild 1374 BLAKE2B 26d1fe5f640fef99d3bf2d9cc67da609076bf83fba413bfd8a4b2ee76882bafb04de47e186009f989765414dc668df058dbba42fe925afd3afcfd5a524c05cbb SHA512 256a9fb9313caaf221ac102e1f9a6cc1ca6790e3c1e34460ddc94b4f5b74ad76ba4a484a5c6be0271ed616c7c877699fd4d3547c83e8181def201d381d881a52 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 58adc0c67916..a395bc9b9de5 100644 --- a/net-libs/libpsl/libpsl-0.20.2.ebuild +++ b/net-libs/libpsl/libpsl-0.20.2.ebuild @@ -11,13 +11,11 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" IUSE="icu +idn +man" -REQUIRED_USE="^^ ( icu idn )" - RDEPEND=" - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) idn? ( dev-libs/libunistring[${MULTILIB_USEDEP}] net-dns/libidn2:=[${MULTILIB_USEDEP}] @@ -34,27 +32,32 @@ BDEPEND=" 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 - --didable-ubsan + --disable-ubsan $(use_enable man) ) - if use icu || use idn ; then - if use icu ; then - myeconfargs+=( - --enable-builtin=libicu - --enable-runtime=libicu - ) - fi - if use idn ; then - myeconfargs+=( - --enable-builtin=libidn2 - --enable-runtime=libidn2 - ) - fi + # 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 |