commit: 81baa4f22c4992cad8d8926985a6b81cc970eb7e Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Sep 1 05:06:02 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Fri Sep 1 05:19:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81baa4f2
dev-python/sip: drop 4.19.25-r1 (last of SLOT=0) Debated doing last-rites (as noted in bug #896878) but, given this is py3.10-only, any revdeps left in overlays are likely aleady in a poor state either way. Closes: https://bugs.gentoo.org/896878 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-python/sip/Manifest | 1 - dev-python/sip/files/sip-4.18-darwin.patch | 30 ---------- dev-python/sip/sip-4.19.25-r1.ebuild | 93 ------------------------------ 3 files changed, 124 deletions(-) diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest index 95cfcff07124..de0eadf0b901 100644 --- a/dev-python/sip/Manifest +++ b/dev-python/sip/Manifest @@ -1,3 +1,2 @@ -DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001 DIST sip-6.7.10.tar.gz 1165087 BLAKE2B 945027e741033a9d85dd9716586324d50380a1cbb4bcbe0df5e2db08697f6e088fb6778d93488c3d07947df3b57442af7a2225500efec0b274a8a9bfa177ecc8 SHA512 56f18fe6599dc74a90c07c58a7f1c23511c7f3661a3ec507d70fd2d32e636713ecd3cf1c960a3687261175c9a42df9de099e28cd1e6c0067ed755b97fc753e96 DIST sip-6.7.11.tar.gz 1165368 BLAKE2B 62ba38ca39544e7ed0935e91729ba6f82a5e613a4b26fbf27c3708a5cb38ba0fa583ceb6a45c0c7485579f4c318fc5ac910eee8477aee6d25d33d4ae07bf527b SHA512 a9247714fd6f6e6dffff2e6b53b35a7831ced55f0706e7c883d6700f22b814dc2cf1e56e681214759c90386ff2c77cb4ace6d07cd0c8b6da0ed65444f9857056 diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch deleted file mode 100644 index 6dd45ac024e3..000000000000 --- a/dev-python/sip/files/sip-4.18-darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru sip-4.18.orig/siputils.py sip-4.18/siputils.py ---- sip-4.18.orig/siputils.py 2016-04-16 22:38:22.662502890 +0200 -+++ sip-4.18/siputils.py 2016-04-16 22:38:39.881551111 +0200 -@@ -946,8 +946,6 @@ - """ - if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): - plib = clib + ".lib" -- elif sys.platform == "darwin" and framework: -- plib = "-framework " + clib - else: - plib = "-l" + clib - -@@ -962,8 +960,6 @@ - """ - if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"): - prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl") -- elif sys.platform == "darwin" and framework: -- prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl") - else: - prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl") - -@@ -1639,7 +1635,7 @@ - if sys.platform == "win32": - ext = "pyd" - elif sys.platform == "darwin": -- ext = "so" -+ ext = "bundle" - elif sys.platform == "cygwin": - ext = "dll" - else: diff --git a/dev-python/sip/sip-4.19.25-r1.ebuild b/dev-python/sip/sip-4.19.25-r1.ebuild deleted file mode 100644 index a647c9b88364..000000000000 --- a/dev-python/sip/sip-4.19.25-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -inherit python-r1 toolchain-funcs - -DESCRIPTION="Python bindings generator for C/C++ libraries" -HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"; - -MY_P=${PN}-${PV/_pre/.dev} -if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"; -else - SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${PN}/${PV}/${MY_P}.tar.gz"; -fi -S=${WORKDIR}/${MY_P} - -# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h -SLOT="0/12" -LICENSE="|| ( GPL-2 GPL-3 SIP )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" -IUSE="doc" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch ) - -src_prepare() { - # Sub-slot sanity check - local sub_slot=${SLOT#*/} - local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die) - if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then - eerror - eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\"" - eerror - die "sub-slot sanity check failed" - fi - - default -} - -src_configure() { - configuration() { - local incdir=$(python_get_includedir) - local myconf=( - "${EPYTHON}" - "${S}"/configure.py - --sysroot="${ESYSROOT}/usr" - --bindir="${EPREFIX}/usr/bin" - --destdir="$(python_get_sitedir)" - --incdir="${incdir#${SYSROOT}}" - --no-dist-info - AR="$(tc-getAR) cqs" - CC="$(tc-getCC)" - CFLAGS="${CFLAGS}" - CFLAGS_RELEASE= - CXX="$(tc-getCXX)" - CXXFLAGS="${CXXFLAGS}" - CXXFLAGS_RELEASE= - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - LFLAGS="${LDFLAGS}" - LFLAGS_RELEASE= - RANLIB= - STRIP= - ) - echo "${myconf[@]}" - "${myconf[@]}" || die - } - python_foreach_impl run_in_build_dir configuration -} - -src_compile() { - python_foreach_impl run_in_build_dir default -} - -src_install() { - installation() { - emake DESTDIR="${D}" install - python_optimize - } - python_foreach_impl run_in_build_dir installation - - einstalldocs - use doc && dodoc -r doc/html -}
