summaryrefslogtreecommitdiff
path: root/net-libs/libpsl
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/libpsl')
-rw-r--r--net-libs/libpsl/Manifest4
-rw-r--r--net-libs/libpsl/libpsl-0.20.2.ebuild74
-rw-r--r--net-libs/libpsl/libpsl-0.21.0.ebuild12
3 files changed, 5 insertions, 85 deletions
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index c923f8d4b73a..13de7c9a8519 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,3 @@
-DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.20.2.ebuild 1465 BLAKE2B c4a6222de8dfb1bbe040d557fa5993ce0e4589932b2ecbf2b8dd2555fc34d3ac52c7be7107907c99c69e2eb72ee4641238c75667a714e945a87325b36e12250c SHA512 51bfda0c75541704bc96d684e6a588c87f858fc86f27a005e8d0a59b31a7b16a8f893acc5a4a3a75261244262dd5e3fb6109d1ce754ecbae8c65711558a3f486
-EBUILD libpsl-0.21.0.ebuild 1475 BLAKE2B 9831172d536f0634d4925c7931fc53cec63946c1576908f61513171462ebafee034deb502645eb166594ed948fc606ce3c6b7802bce311b004aeeb64fee5850a SHA512 13cf6d1c670232b2cdd64693d53ea3ab45b22ecc110d0d8306cd7c8ecd741bfa24be4919a8c72658b3b799bbf230836392b367822371b755b93df67fc952c2ce
+EBUILD libpsl-0.21.0.ebuild 1471 BLAKE2B e47eecfd4d43860a67c74646a52eb91e065bcbd40dcb5904a469dac61cce5a174053cb0cd35b6c494ad39c2d5aec6e824a6e77b24a14e14949e40dadaebfae43 SHA512 8ca2066bce3f979d9d63a175fb1fdf75b66ef222051b868f09d0e7ee08719231169bb16ce04e500e4cd95dbc3f1ac19370e062b22c9a4d12930f823705a7d44f
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
deleted file mode 100644
index 77d9d740faae..000000000000
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{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 ~ppc ~ppc64 ~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
-}
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 973bf4d107b2..2db775b91e56 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -2,16 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=(python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7,8})
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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
IUSE="icu +idn +man"
@@ -22,12 +22,8 @@ RDEPEND="
net-dns/libidn2:=[${MULTILIB_USEDEP}]
)
"
-
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- ${PYTHON_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
dev-util/gtk-doc-am
sys-devel/gettext
virtual/pkgconfig