gentoo resync : 31.05.2021

3 files changed, 3 insertions, 99 deletions

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index b2df2528dfc0..224c9ebc0b07 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,4 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
-DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD sip-4.19.24.ebuild 2282 BLAKE2B d58ef24520a95ccb3a4f2113769a9187f2b1ea7172e6e63ae992565c20a413b7d3a8ad91f00c719a8117ed3ef5d4a23e717f21d026cd1a37fea07b95b222920a SHA512 005130da866237d4b391c2b516c1741e9544503adce8e61bea83a654649e3b1e073682eae29022d5e506476daf51b127fcb95279500306a096bc61cdf6910ce3
-EBUILD sip-4.19.25.ebuild 2276 BLAKE2B 2bccef09bae58cb39f4fcb41f99d704b631b53403a7744daed309cc0f910f07336b169c457127508d0b73f8f8ce6a11bd4b5f1a15cdd508041c92a2992bddc79 SHA512 a56729ff7ddf6d3afb06d4430aa4e4863fe521b91c8eeee3e62ef884a87ffb8c1030b14deeb4ec64e5b638b9bcfcb12230e3b50abf43689a74b043fb46f41001
+EBUILD sip-4.19.25.ebuild 2271 BLAKE2B 7cbea5a93443ee348c5cfd2d0341c6b4927d1ee22b4d92eb64dd76c1418787389cdbf85b955716e5f795770d1e7292503ba12f424adc1c3e0a57f6922991ea55 SHA512 88cbd929f6f72c1e773e4622a4501395fcaa0656945456d5938c6a848f9d3e86de21cd5739b3cd7a1bbeb571d1552bbf92de37d66a9bdf879f58b9ff25ad60e2
 MISC metadata.xml 642 BLAKE2B 496a8870b0d30bc0587fb4729dc592eb335a8f7323106f8559a01980e25bd3efcc23ebdebb4a5ae9b1ac2c1397f41b2e48d21daa16b89265531112e5ebd7822f SHA512 d2e0e0b142a3cdb3f7f279c9c16100ba7a720c1d1348282ac4aeaf9541d6a351495a22eeb2e1f60f1dd3ee7998da2624a09b47abcd57093f0e273d797215f8cc
diff --git a/dev-python/sip/sip-4.19.24.ebuild b/dev-python/sip/sip-4.19.24.ebuild
deleted file mode 100644
index 13b20ad0c9b7..000000000000
--- a/dev-python/sip/sip-4.19.24.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-MY_PN=sip
-MY_P=${MY_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/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-# 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 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-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=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--sysroot="${ESYSROOT}/usr"
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="${incdir#${SYSROOT}}"
-			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-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
index 1b8bd36af39c..c75d9a8ffcf2 100644
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ b/dev-python/sip/sip-4.19.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
@@ -20,7 +20,7 @@ fi
 # 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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"