diff options
Diffstat (limited to 'sys-libs/cracklib')
| -rw-r--r-- | sys-libs/cracklib/Manifest | 3 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.9.10-r1.ebuild (renamed from sys-libs/cracklib/cracklib-2.9.10.ebuild) | 45 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch | 20 |
3 files changed, 50 insertions, 18 deletions
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest index bac6c65639af..ec99f6523c66 100644 --- a/sys-libs/cracklib/Manifest +++ b/sys-libs/cracklib/Manifest @@ -1,5 +1,6 @@ +AUX cracklib-2.9.10-python-inc.patch 712 BLAKE2B 2e5d1dd7637632d25c408232dac77220e844d8084c29867b7382a644edcc856e4ec6c1dd6f3f4fb6e812b71ecc7c4157b2a65f637e1d2a691454de5927b5cfec SHA512 7e87b932cf1a997a3e75c5bfe51428f4506e23e117a2b9964c91bd3fe7e953d459d266bdcffa6c5dcbbf6d0d35812a540e8e67427d1f0ca8c9e6741cac9463d5 DIST cracklib-2.9.10.tar.bz2 620648 BLAKE2B f4ebf4aea6da81424a8b9fae9c204260f6020937b6b2b02cec13527f812e1751522a47a4432ff0a2a233eeb88fe0c8b7e7fd371f611a40bf2d34a10ddfd4fe83 SHA512 0c3856833f4c58fc1ebc63cc08b189c55e8d5722ef8cdc1cad5f717cef137a83648657e005e2d0367006b27aafa1bb63e36e7998918937733816635880c85f74 DIST cracklib-2.9.8.tar.bz2 613017 BLAKE2B d9a5d922d6ac777b08cec9c427c0cde48666cdf67bf4136eb5866a0111b101c795dceb8e206e90bff31d1c8d26505bc1a950e8ea079562d8afd601641a7caf0c SHA512 bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371 -EBUILD cracklib-2.9.10.ebuild 2680 BLAKE2B 98ed0d58753cafb74bdac00088d1bd60b2852a82ba255bb511b180bcabf23b73fe60b9d006983f349f18e8b02be17b818c31cbb745713ea8609079c304fea63f SHA512 1c4fc36e395b1a8db0096ab11f0532398121211496eaa15ab05744fa3fd1cc3f401f60d49f1a4d9b84c918812213fff486165069afe441d70dd381c2bf4bab74 +EBUILD cracklib-2.9.10-r1.ebuild 3032 BLAKE2B e408bf8549fffc5a617cc2e4b6ca949e84f52b1d45330f1d075b4d4cad781dbf32df186b39c7e62c5e92825b18c5404763d9bcfef9aa9b68c4f167e13a365a82 SHA512 be576eae3cc42876c80ef64716a1e7c26e08c63b46e154774b08ec0451094c0bbd1a426dfbf6e7ae00a34e030f83efaacaa1abca88f158557c3df8bb00cd40a2 EBUILD cracklib-2.9.8.ebuild 2672 BLAKE2B 88614b0d1a368daaf22b2249ab50f8f4fb0c03d249ecc8b700a0e8800128c21e2224d437040c43886c620ca2224c2bc97aa2c24a58a7bea095cf4f29c8aed5aa SHA512 6b265982b4405a42f0581511432942f37f6ecbe1136f9cd7d40eb4f142810b3f2b4a38b477378bc748b8483f86bbdf846d5d55f4375b1b903b74689a6d815e69 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796 diff --git a/sys-libs/cracklib/cracklib-2.9.10.ebuild b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild index 71fddeb64779..0553dfd808a8 100644 --- a/sys-libs/cracklib/cracklib-2.9.10.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild @@ -6,6 +6,7 @@ EAPI=8 # Note: ideally bump with sys-apps/cracklib-words DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 libtool multilib-minimal usr-ldscript @@ -31,19 +32,14 @@ DEPEND=" " BDEPEND=" nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) + python? ( ${DISTUTILS_DEPS} ) " -do_python() { - multilib_is_native_abi || return 0 - use python || return 0 +PATCHES=( + "${FILESDIR}"/${PN}-2.9.10-python-inc.patch +) - pushd python > /dev/null || die - distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null || die -} +distutils_enable_tests unittest pkg_setup() { # Workaround bug #195017 @@ -57,10 +53,12 @@ pkg_setup() { src_prepare() { default - # bug ##269003 + # bug #269003 elibtoolize - do_python + if use python ; then + distutils-r1_src_prepare + fi } multilib_src_configure() { @@ -81,18 +79,28 @@ multilib_src_configure() { multilib_src_compile() { default - do_python + if multilib_is_native_abi && use python ; then + local -x CFLAGS="${CFLAGS} -DLOCALEDIR='\"${EPREFIX}/usr/share/locale\"' -DDEFAULT_CRACKLIB_DICT=\'${EPREFIX}/usr/lib/cracklib_dict\'" + cd python || die + distutils-r1_src_compile + fi } multilib_src_test() { default - # Make sure we load the freshly built library - LD_LIBRARY_PATH="${BUILD_DIR}/lib/.libs:${LD_LIBRARY_PATH}" do_python + if multilib_is_native_abi && use python ; then + distutils-r1_src_test + fi } python_test() { - ${EPYTHON} -m unittest test_cracklib || die "Tests fail with ${EPYTHON}" + cd "${S}"/python || die + + # Make sure we load the freshly built library + local -x LD_LIBRARY_PATH="${BUILD_DIR/-${EPYTHON/./_}}/lib/.libs:${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" + + eunittest } multilib_src_install() { @@ -101,7 +109,10 @@ multilib_src_install() { # Move shared libs to / gen_usr_ldscript -a crack - do_python + if multilib_is_native_abi && use python ; then + cd python || die + distutils-r1_src_install + fi } multilib_src_install_all() { diff --git a/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch b/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch new file mode 100644 index 000000000000..fd9960df0e8f --- /dev/null +++ b/sys-libs/cracklib/files/cracklib-2.9.10-python-inc.patch @@ -0,0 +1,20 @@ +https://github.com/cracklib/cracklib/pull/61 + +From 802cbc426779489d44d7fc19e695e7d962c65665 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 17 Mar 2023 02:20:19 +0000 +Subject: [PATCH] python: adjust include path for builddir + +We need this for config.h added by 2e0f854bada720ff4fbd13aed4f87087d466274d. +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -22,7 +22,7 @@ from setuptools import setup, Extension + extensions = [ + Extension("_cracklib", + ["@srcdir@/_cracklib.c"], +- include_dirs = ["@top_srcdir@/lib"], ++ include_dirs = ["@top_builddir@", "@top_srcdir@/lib"], + libraries = ["crack"], + library_dirs = ["@top_builddir@/lib/.libs"]), + ] + |