gentoo auto-resync : 01:09:2023 - 10:13:22

4 files changed, 33 insertions, 126 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9878590adba7..bda37e010ffd 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,5 @@
-AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-6.7.10.tar.gz 1165087 BLAKE2B 945027e741033a9d85dd9716586324d50380a1cbb4bcbe0df5e2db08697f6e088fb6778d93488c3d07947df3b57442af7a2225500efec0b274a8a9bfa177ecc8 SHA512 56f18fe6599dc74a90c07c58a7f1c23511c7f3661a3ec507d70fd2d32e636713ecd3cf1c960a3687261175c9a42df9de099e28cd1e6c0067ed755b97fc753e96
-EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 3b74d08ad36c71fff2d6982548870f14a1425903d94fcd86a21788bae8f9f0c30485846fe49f0aba13843d0764f421be133ec1a14d5e38f65b61a0a889155b25 SHA512 fa4b11a80372b8c9abf0a5c6b4ceb5b41f998342cd997a856b38f52e07e3c89524bdcfa6539dccd207bb03cfac231a7231304162c2984795d962ad10c88cfda1
+DIST sip-6.7.11.tar.gz 1165368 BLAKE2B 62ba38ca39544e7ed0935e91729ba6f82a5e613a4b26fbf27c3708a5cb38ba0fa583ceb6a45c0c7485579f4c318fc5ac910eee8477aee6d25d33d4ae07bf527b SHA512 a9247714fd6f6e6dffff2e6b53b35a7831ced55f0706e7c883d6700f22b814dc2cf1e56e681214759c90386ff2c77cb4ace6d07cd0c8b6da0ed65444f9857056
 EBUILD sip-6.7.10.ebuild 790 BLAKE2B 27e9f2be3e97ed1fafc24d1ef1144ab6718003c8c564d8538ad2ce80f344d320aec765863b37f68b7e4a33e20545b1f6853f5130e16cc3188a321a9e9fe8f6e3 SHA512 dcfb2797a857c60ce46c051f24a7abd19a49fd4085a7fe68696213a43f7c560b283d1324348cbb843fc741f03d1bef4274b2192fbc55fdae0695c155de0607fc
+EBUILD sip-6.7.11.ebuild 749 BLAKE2B cbbbd13677bf6091e8a45fb7646a1eea102e50ba0c391c8e26c8dcb00408f554b19c6773e37b531ebe8d3852e9475dff7034d0972c0ebc843fb11e08bafb3fc5 SHA512 4098e11513bc2273bdaf5dc02d67ee6688b7434d8d5230726b2823febe280d0ec1f3a0de79bae27d5fd993aa84081d6721d9a23e629ef0510dab20c5f3f423fa
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
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
-}
diff --git a/dev-python/sip/sip-6.7.11.ebuild b/dev-python/sip/sip-6.7.11.ebuild
new file mode 100644
index 000000000000..d24ad8c097f4
--- /dev/null
+++ b/dev-python/sip/sip-6.7.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="
+	https://www.riverbankcomputing.com/software/sip/
+	https://pypi.org/project/sip/
+"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+distutils_enable_sphinx doc --no-autodoc