diff options
Diffstat (limited to 'dev-libs/liblouis')
| -rw-r--r-- | dev-libs/liblouis/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/liblouis/liblouis-3.23.0.ebuild (renamed from dev-libs/liblouis/liblouis-3.13.0.ebuild) | 8 | ||||
| -rw-r--r-- | dev-libs/liblouis/liblouis-3.25.0.ebuild (renamed from dev-libs/liblouis/liblouis-3.17.0.ebuild) | 55 |
3 files changed, 43 insertions, 24 deletions
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest index 2a111bfcdeb2..1f385d6b1315 100644 --- a/dev-libs/liblouis/Manifest +++ b/dev-libs/liblouis/Manifest @@ -1,2 +1,2 @@ -DIST liblouis-3.13.0.tar.gz 14683684 BLAKE2B 9596fac30ee8512498826ea11c3fe4d9dfba6706166938852242533f1fadde9ca8e363ea1364ebb4266b366ee49863d84ad757f8634d90e48dd8c562c31e9e8d SHA512 68f0205dc55a106c5707f959c1c0d3c121dfe62f263a664e6bec0780bee65cce2fb5d7033ae1c8312d1d79f7ccaf650af71906e8651b60f11219758e41051b61 -DIST liblouis-3.17.0.tar.gz 14868166 BLAKE2B 2edc5ef4366e29080d0d138fe45d946730e04dea278a14751106a25862f6266fe0fda492e12f4d2aa7d26d7277a11dfa2eaf8be39cdeffbcf83f2c143922e6d6 SHA512 9511e0f76ef6def3fa30f0bce4df188b2a11251e8ced0a76a92e172026e6751bc19b2c8ccd5789043b65398190a367bca03b3f1449344750e63ebd0fde60b4e3 +DIST liblouis-3.23.0.tar.gz 16738612 BLAKE2B b4508d27eaa9669bb2a1fbaac55edb3a85d3d2df18a8b26f4c9c396579b04614da3b3bcd6af45459d9129d2b81a920262dcb8fef7bee4290752174411fd66109 SHA512 25819758fc987ed378c439c5d40efd2692247a6020a40e5909320021e518e0518f5b022dda4ea5c7006a0f1ce2a4225d4ee1404560987bb2dd83504d58aa09db +DIST liblouis-3.25.0.tar.gz 16939419 BLAKE2B f67dc1ee3aa9eb32fcf0693b3a31d40c56f048b393785011ec2b4c61611a3ab67d181d1e76148c489e443e3b0c4d5f7846ac1b4810ffa2c6a6e1d081cceab6ae SHA512 4e6456f30e845b955e98346cb94bdd4eaa6aff30f3e29fbd4e91c5bb58d1182c679fbf8afa27d7031c80d5755ae8567b830fa57c175522a038ef18d1bdc0707d diff --git a/dev-libs/liblouis/liblouis-3.13.0.ebuild b/dev-libs/liblouis/liblouis-3.23.0.ebuild index fbbf70e7da5d..97e257e1a3db 100644 --- a/dev-libs/liblouis/liblouis-3.13.0.ebuild +++ b/dev-libs/liblouis/liblouis-3.23.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar. LICENSE="LGPL-2.1+" SLOT="0/20" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" diff --git a/dev-libs/liblouis/liblouis-3.17.0.ebuild b/dev-libs/liblouis/liblouis-3.25.0.ebuild index 7eeaf31dbe47..ae8c9ea52083 100644 --- a/dev-libs/liblouis/liblouis-3.17.0.ebuild +++ b/dev-libs/liblouis/liblouis-3.25.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 @@ -13,14 +13,15 @@ SRC_URI="https://github.com/liblouis/liblouis/releases/download/v${PV}/${P}.tar. LICENSE="LGPL-2.1+" SLOT="0/20" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" -BDEPEND="sys-apps/help2man +BDEPEND=" + sys-apps/help2man python? ( ${PYTHON_DEPS} >=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}] ) @@ -31,39 +32,57 @@ src_prepare() { default if use python; then - pushd python > /dev/null + pushd python > /dev/null || die distutils-r1_src_prepare - popd > /dev/null + popd > /dev/null || die fi } src_configure() { - econf \ - --enable-ucs4 \ - --disable-static + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + # CONFIG_SHELL is temporary until https://github.com/liblouis/liblouis/pull/1369 + # is in a release. + CONFIG_SHELL="${BROOT}"/bin/bash econf --enable-ucs4 } src_compile() { default if use python; then - pushd python > /dev/null + pushd python > /dev/null || die # setup.py imports liblouis to get the version number, # and this causes the shared library to be dlopened # at build-time. Hack around it with LD_PRELOAD. # Thanks ArchLinux. - LD_PRELOAD+=':../liblouis/.libs/liblouis.so' - distutils-r1_src_compile - popd > /dev/null + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_compile + popd > /dev/null || die fi } +src_test() { + default + + if use python; then + pushd python > /dev/null || die + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_test + popd > /dev/null || die + fi +} + +python_test() { + local -x LOUIS_TABLEPATH="${S}"/tables + "${EPYTHON}" tests/test_louis.py || die +} + src_install() { if use python; then - pushd python > /dev/null - LD_PRELOAD+=':../liblouis/.libs/liblouis.so' \ - distutils-r1_src_install - popd > /dev/null + pushd python > /dev/null || die + LD_PRELOAD+=":${S}/liblouis/.libs/liblouis.so" distutils-r1_src_install + popd > /dev/null || die fi # These need to be after distutils src_install, or it'll try to install them from under python/ as well |