public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2016-04-17  1:19 Davide Pesavento
  0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2016-04-17  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9f954563a2abd999dd87fe37c5ddd911e72ceaab
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 01:19:26 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 01:19:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f954563

dev-python/sip: version bump; EAPI=6

Package-Manager: portage-2.2.28

 dev-python/sip/Manifest                            |  1 +
 dev-python/sip/files/sip-4.18-darwin.patch         | 30 +++++++++++++++++
 .../sip/{sip-4.9999.ebuild => sip-4.18.ebuild}     | 39 ++++++++++------------
 dev-python/sip/sip-4.9999.ebuild                   | 19 ++++++-----
 4 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index fc9dd24..988913f 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,4 @@
 DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
 DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
 DIST sip-4.17.tar.gz 959835 SHA256 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060 SHA512 ac9af0b0e8424152a9768bccacd4db393fd3f4e5c8cf171863d9e615564c744c5be4d0b4af82c5ceed8d27f9845e308f559df30153e6d5bce8d4e2af6e5192d9 WHIRLPOOL a11d1f3d43b60fa06bc67dec60a500c0c163f179bec8865e5eef286c191652fd51d45965f8f96c3c13365976a5bd85c36454924a4da9c1508df0d807466ecf20
+DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4

diff --git a/dev-python/sip/files/sip-4.18-darwin.patch b/dev-python/sip/files/sip-4.18-darwin.patch
new file mode 100644
index 0000000..6dd45ac
--- /dev/null
+++ b/dev-python/sip/files/sip-4.18-darwin.patch
@@ -0,0 +1,30 @@
+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.9999.ebuild b/dev-python/sip/sip-4.18.ebuild
similarity index 74%
copy from dev-python/sip/sip-4.9999.ebuild
copy to dev-python/sip/sip-4.18.ebuild
index f7b9c0d..799bd72 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.18.ebuild
@@ -1,44 +1,34 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-inherit eutils mercurial python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
+DEPEND="${RDEPEND}"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	python_setup 'python2*'
-	"${PYTHON}" build.py prepare || die
-	if use doc; then
-		"${PYTHON}" build.py doc || die
-	fi
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+DOCS=( "${S}"/{ChangeLog,NEWS} )
 
+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.in)
@@ -50,6 +40,11 @@ src_prepare() {
 		eerror
 		die "sub-slot sanity check failed"
 	fi
+
+	# Fix out-of-source installation of sip.pyi
+	sed -i -e '/installs.*sip\.pyi/ s/build_dir/src_dir/' configure.py || die
+
+	default
 }
 
 src_configure() {
@@ -57,9 +52,10 @@ src_configure() {
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
 			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
+			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
 			CFLAGS="${CFLAGS}"
@@ -86,11 +82,10 @@ src_compile() {
 
 src_install() {
 	installation() {
-		emake DESTDIR="${D}" install
+		default
 		python_optimize
 	}
 	python_foreach_impl run_in_build_dir installation
 
-	dodoc ChangeLog NEWS
 	use doc && dodoc -r doc/html
 }

diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index f7b9c0d..aa6c006 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
-inherit eutils mercurial python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs mercurial
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
@@ -30,9 +30,10 @@ REQUIRED_USE="
 	|| ( $(python_gen_useflags 'python2*') )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
+PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
+DOCS=( "${S}"/{ChangeLog,NEWS} )
 
+src_prepare() {
 	python_setup 'python2*'
 	"${PYTHON}" build.py prepare || die
 	if use doc; then
@@ -50,6 +51,8 @@ src_prepare() {
 		eerror
 		die "sub-slot sanity check failed"
 	fi
+
+	default
 }
 
 src_configure() {
@@ -57,9 +60,10 @@ src_configure() {
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
+			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
 			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
+			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
 			CFLAGS="${CFLAGS}"
@@ -86,11 +90,10 @@ src_compile() {
 
 src_install() {
 	installation() {
-		emake DESTDIR="${D}" install
+		default
 		python_optimize
 	}
 	python_foreach_impl run_in_build_dir installation
 
-	dodoc ChangeLog NEWS
 	use doc && dodoc -r doc/html
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2017-01-01 14:20 Michael Palimaka
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-01-01 14:20 UTC (permalink / raw
  To: gentoo-commits

commit:     652f805fcb91f5115757bd9519cb7a18233e8abd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 14:15:12 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan  1 14:20:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652f805f

dev-python/sip: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-python/sip/Manifest                      |   2 -
 dev-python/sip/files/sip-4.15.5-darwin.patch |  30 -------
 dev-python/sip/sip-4.16.2.ebuild             | 113 ---------------------------
 dev-python/sip/sip-4.16.9.ebuild             |  85 --------------------
 4 files changed, 230 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index dc68b0f..e835051 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,3 @@
-DIST sip-4.16.2.tar.gz 793663 SHA256 a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce SHA512 07ced0188bd4dc897ddacbce226b33ac9d236455a95018e900fd5f652439c905ddd56688f8bb29f704fcf201a8e668d5cc89ba887065826653087cf0a9f6dbfb WHIRLPOOL 47c741f1b787ba147e7a299e3c93a7537f14f1b192726e39f3679d0b0e0a991df603509c5674f262311259d9ad2e1e845746d215d5ef70eb7b827c1557eb8b82
-DIST sip-4.16.9.tar.gz 957858 SHA256 dbe173aa566e26ca0bb5bcbc1d30ef780f416267bb3b5df48149a737ea6b0555 SHA512 f9e7deac3462f71e809fce29aea4b7e7e3d1acb7600252178459cfb9e09d1543e9a189bdc66c946c9d11c4a6f3175a6d6b306481cadab70ed7f17f6e7c328ddc WHIRLPOOL f4cfcb5ecc945332683bdcbd6913b87fc975f8e268e02e6bdeaadebf578e40f1e94a3c76cdb1ea3890ec969d1454560d58df01ba4ad507d914a300076365ade0
 DIST sip-4.18.1.tar.gz 992624 SHA256 9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290 SHA512 c4277fa113bf5e28d8a19388f160456654e4ccbbc2adc1209677e95e1efad427ce641ef09875ec0a59e555578986671261dd4c3ac52c673b5803f188fc311222 WHIRLPOOL 6250081ffda585dda7c7728fe1253a1791ef63d4798d02c752e1c5b58837d2c55dd87306c83202be03f96bd644bd5b17b3b1e28b5c06b28bb8a69dd23da2ee09
 DIST sip-4.18.tar.gz 991980 SHA256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 SHA512 365fb51b8c833ebc923b87a961fac83976b653ebcec8fe7ad1543ee5a406471eb9309c8efbee6662c7b622f36771cd3ac31ede10208f23d2531a45af906d383d WHIRLPOOL 3cf3516483e62ed26fca1de6bc90e58a2bd04d3d66214b0f62eb4338c2b7a8a595d46952ef86cd7fa61e50b160a06b484a7d4f5997be2f2a7714b1edabaef2a4
 DIST sip-4.19.tar.gz 1009474 SHA256 014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27 SHA512 0df39c2e004f5077439bdb4b4e463cdf0c141ce4e5dc65a957123801c122d6e3a30e238c0a77559d7202002a396d521be5517a8417b34c4092ab8319fa1d054c WHIRLPOOL b86f55750bc971d57420b24e1988f42e6974f7b222b1291c4def4ceb557c75e1c9cc15bbba27c7b99693fa0307aa171de6271acd7648cc6917cc0dc7b7486deb

diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch
deleted file mode 100644
index b625d15..00000000
--- a/dev-python/sip/files/sip-4.15.5-darwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py
---- siputils.py	2014-02-21 18:31:35.000000000 +0800
-+++ siputils.py	2014-04-01 23:21:41.895036589 +0800
-@@ -945,8 +945,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
- 
-@@ -961,8 +959,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")
- 
-@@ -1633,7 +1629,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.16.2.ebuild b/dev-python/sip/sip-4.16.2.ebuild
deleted file mode 100644
index 9298751..00000000
--- a/dev-python/sip/sip-4.16.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro https://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-	inherit mercurial
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	HG_REVISION=
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	# official release
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-[[ ${PV} == *9999* ]] && DEPEND+="
-	=dev-lang/python-2*
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	if [[ ${PV} == *9999* ]]; then
-		python2 build.py prepare || die
-		if use doc; then
-			python2 build.py doc || die
-		fi
-	fi
-
-	# 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.in)
-	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
-
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}" configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			$(use debug && echo --debug)
-			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[@]}"
-	}
-	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
-
-	dodoc NEWS
-	use doc && dohtml -r doc/html/*
-}

diff --git a/dev-python/sip/sip-4.16.9.ebuild b/dev-python/sip/sip-4.16.9.ebuild
deleted file mode 100644
index db18ecb..00000000
--- a/dev-python/sip/sip-4.16.9.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit eutils python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.com/software/sip/intro https://pypi.python.org/pypi/SIP"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/11"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
-
-	# 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.in)
-	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
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(use debug && echo --debug)
-			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
-
-	dodoc ChangeLog NEWS
-	use doc && dodoc -r doc/html
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2022-06-08 19:16 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2022-06-08 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     77942a08e5dfba186e4a2a4a65f58e5b37829b9c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 14:41:20 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 19:15:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77942a08

dev-python/sip: add 6.6.1, enable py3.11

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/sip/Manifest                            |  1 +
 .../files/sip-6.6.1-python311-invalid-regex.patch  | 21 ++++++++++++
 dev-python/sip/sip-6.6.1.ebuild                    | 39 ++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 52c9a17c715e..e7ef4971e16e 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,3 +2,4 @@ DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb13
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.4.0.tar.gz 1201890 BLAKE2B be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee SHA512 eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
 DIST sip-6.5.0.tar.gz 1202004 BLAKE2B a67ba784c0851a528fded689cc2a84fa18ba906d23adb71fceab14e652c02b079ce7d3b40a3594251852d20875ac53571e851630e441b8846c302772933b1829 SHA512 3baa20403b668e5f02b2506a693522ce421080e073ac39f62a23823b3e023b0b88fc60ab79e2301ecc39304f6df3d8647adc56429641e91c217fecea9bfacb91
+DIST sip-6.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1696fbf256d000d266f9e3921dcafaead40bcf3dc67d42aa89c5982d090abde7d8b3c3f8ec6ddd4470b9a43 SHA512 49d03730819210f4239946da0ddd0694583dc13458997edc11895ef399d8017f38e3354a87bae495492c3cf3334b810c2d924ec0f5bbb129e88cc15eac720c01

diff --git a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
new file mode 100644
index 000000000000..908111627854
--- /dev/null
+++ b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1651507410 -3600
+# Node ID 3d656f0765f508ea9714b5e7c9ce00e304e6f600
+# Parent  c179f418c5bee188e3ec7a0c0e50f9eab34cf12f
+Fixed indented directives.
+
+diff -r c179f418c5be -r 3d656f0765f5 sipbuild/generator/parser/tokens.py
+--- a/sipbuild/generator/parser/tokens.py	Mon May 02 16:51:06 2022 +0100
++++ b/sipbuild/generator/parser/tokens.py	Mon May 02 17:03:30 2022 +0100
+@@ -174,7 +174,7 @@
+ 
+ # Handle directives.
+ def t_DIRECTIVE(t):
+-    r'(?m)^\s*%[a-zA-Z][a-zA-Z]*'
++    r'%[a-zA-Z][a-zA-Z]*'
+ 
+     # The name of the directive is used as its type.
+     name = t.value[t.value.index('%') + 1:]
+

diff --git a/dev-python/sip/sip-6.6.1.ebuild b/dev-python/sip/sip-6.6.1.ebuild
new file mode 100644
index 000000000000..4e130e33eb13
--- /dev/null
+++ b/dev-python/sip/sip-6.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/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="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
+	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python311-invalid-regex.patch"
+	"${FILESDIR}/${PN}-6.5.0-pep517-args.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2022-09-26 17:18 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-09-26 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     4770d54128c0201ee9c0b58eb4d1536f9186df36
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 11:20:58 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 17:15:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4770d541

dev-python/sip: drop 6.6.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/sip/Manifest                            |   1 -
 dev-python/sip/files/sip-6.5.0-pep517-args.patch   | 190 ---------------------
 .../files/sip-6.6.1-python311-invalid-regex.patch  |  21 ---
 dev-python/sip/sip-6.6.1.ebuild                    |  39 -----
 4 files changed, 251 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9c197847ec48..d4f0c3000b0d 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.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1696fbf256d000d266f9e3921dcafaead40bcf3dc67d42aa89c5982d090abde7d8b3c3f8ec6ddd4470b9a43 SHA512 49d03730819210f4239946da0ddd0694583dc13458997edc11895ef399d8017f38e3354a87bae495492c3cf3334b810c2d924ec0f5bbb129e88cc15eac720c01
 DIST sip-6.6.2.tar.gz 1143535 BLAKE2B 92158af35be47a7581b71d97d1d79f6ca9022144144e3e44e09ccbfa3a285ebb4cec1264e621275159345c33f0f45c86183f7ea1fb3792aca2aeb64d9e46f7ad SHA512 5e031baa9ff6d8d19f4c36ef7c3900c6440d261102259cdc12fce28471a849fed80c123bf31ad506b099a925b2967eb5863e6736ac00fbcff99198711cf0e5e5

diff --git a/dev-python/sip/files/sip-6.5.0-pep517-args.patch b/dev-python/sip/files/sip-6.5.0-pep517-args.patch
deleted file mode 100644
index c4d39dcf6156..000000000000
--- a/dev-python/sip/files/sip-6.5.0-pep517-args.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Backport from https://www.riverbankcomputing.com/hg/sip/
-
-changeset:   2771:8543f04b374f
-branch:      6.6-maint
-tag:         tip
-user:        Phil Thompson <phil@riverbankcomputing.com>
-date:        Tue May 10 13:58:28 2022 +0100
-summary:     Fixed the PEP571 backend to handle multiple instances of the same config
-
-changeset:   2769:c02af095a016
-branch:      6.6-maint
-user:        Phil Thompson <phil@riverbankcomputing.com>
-date:        Sat May 07 15:18:14 2022 +0100
-summary:     Fix an API backward incompatibility.
-
-changeset:   2768:98dbce3e62f1
-branch:      6.6-maint
-user:        Phil Thompson <phil@riverbankcomputing.com>
-date:        Sat May 07 15:03:49 2022 +0100
-summary:     Any config settings passed by a PEP 571 frontend are now used.
-
-diff -r 8583e2bb1b32 sipbuild/abstract_project.py
---- a/sipbuild/abstract_project.py	Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/abstract_project.py	Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2020, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -34,7 +34,7 @@
-     """ This specifies the API of a project. """
- 
-     @classmethod
--    def bootstrap(cls, tool, tool_description=''):
-+    def bootstrap(cls, tool, tool_description='', arguments=None):
-         """ Return an AbstractProject instance fully configured for a
-         particular command line tool.
-         """
-@@ -79,6 +79,10 @@
-                     "The project factory did not return an AbstractProject "
-                     "object")
- 
-+        # We set this as an attribute rather than change the API of the ctor or
-+        # setup().
-+        project.arguments = arguments
-+
-         # Complete the configuration of the project.
-         project.setup(pyproject, tool, tool_description)
- 
-diff -r 8583e2bb1b32 sipbuild/api.py
---- a/sipbuild/api.py	Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/api.py	Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2019, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -28,10 +28,8 @@
- def build_sdist(sdist_directory, config_settings=None):
-     """ The PEP 517 hook for building an sdist from pyproject.toml. """
- 
--    # Note that we ignore config_settings until we have a frontend that we can
--    # fully test with.  (pip seems lacking at the moment.)
--
--    project = AbstractProject.bootstrap('pep517')
-+    project = AbstractProject.bootstrap('sdist',
-+            arguments=_convert_config_settings(config_settings))
- 
-     # pip executes this in a separate process and doesn't handle exceptions
-     # very well.  However it does capture stdout and (eventually) show it to
-@@ -45,10 +43,8 @@
- def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):
-     """ The PEP 517 hook for building a wheel from pyproject.toml. """
- 
--    # Note that we ignore config_settings until we have a frontend that we can
--    # fully test with.  (pip seems lacking at the moment.)
--
--    project = AbstractProject.bootstrap('pep517')
-+    project = AbstractProject.bootstrap('wheel',
-+            arguments=_convert_config_settings(config_settings))
- 
-     # pip executes this in a separate process and doesn't handle exceptions
-     # very well.  However it does capture stdout and (eventually) show it to
-@@ -57,3 +53,26 @@
-         return project.build_wheel(wheel_directory)
-     except Exception as e:
-         handle_exception(e)
-+
-+
-+def _convert_config_settings(config_settings):
-+    """ Return any configuration settings from the frontend to a pseudo-command
-+    line.
-+    """
-+
-+    if config_settings is None:
-+        config_settings = {}
-+
-+    args = []
-+
-+    for name, value in config_settings.items():
-+        if value:
-+            if not isinstance(value, list):
-+                value = [value]
-+
-+            for m_value in value:
-+                args.append(name + '=' + m_value)
-+        else:
-+            args.append(name)
-+
-+    return args
-diff -r 8583e2bb1b32 sipbuild/configurable.py
---- a/sipbuild/configurable.py	Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/configurable.py	Tue May 10 16:15:30 2022 +0200
-@@ -1,4 +1,4 @@
--# Copyright (c) 2021, Riverbank Computing Limited
-+# Copyright (c) 2022, Riverbank Computing Limited
- # All rights reserved.
- #
- # This copy of SIP is licensed for use under the terms of the SIP License
-@@ -244,7 +244,7 @@
-     """
- 
-     # The tools that will build a set of bindings.
--    BUILD_TOOLS = ('build', 'install', 'pep517', 'wheel')
-+    BUILD_TOOLS = ('build', 'install', 'wheel')
- 
-     # All the valid tools.
-     _ALL_TOOLS = BUILD_TOOLS + ('sdist', )
-diff -r 8583e2bb1b32 sipbuild/project.py
---- a/sipbuild/project.py	Thu Nov 25 18:15:32 2021 +0000
-+++ b/sipbuild/project.py	Tue May 10 16:15:30 2022 +0200
-@@ -155,6 +155,7 @@
- 
-         # The current directory should contain the .toml file.
-         self.root_dir = os.getcwd()
-+        self.arguments = None
-         self.bindings = collections.OrderedDict()
-         self.bindings_factories = []
-         self.builder = None
-@@ -204,11 +205,6 @@
-     def apply_user_defaults(self, tool):
-         """ Set default values for user options that haven't been set yet. """
- 
--        # If we are the backend to a 3rd-party frontend (most probably pip)
--        # then let it handle the verbosity of messages.
--        if self.verbose is None and tool == '':
--            self.verbose = True
--
-         # This is only used when creating sdist and wheel files.
-         if self.name is None:
-             self.name = self.metadata['name']
-@@ -569,14 +565,9 @@
-         # Set the initial configuration from the pyproject.toml file.
-         self._set_initial_configuration(pyproject, tool)
- 
--        # Add any tool-specific command line options for (so far unspecified)
-+        # Add any tool-specific command line arguments for (so far unspecified)
-         # parts of the configuration.
--        if tool != 'pep517':
--            self._configure_from_command_line(tool, tool_description)
--        else:
--            # Until pip improves it's error reporting we give the user all the
--            # help we can.
--            self.verbose = True
-+        self._configure_from_arguments(tool, tool_description)
- 
-         # Now that any help has been given we can report a problematic
-         # pyproject.toml file.
-@@ -712,8 +703,8 @@
-         for bindings in self.bindings.values():
-             bindings.verify_configuration(tool)
- 
--    def _configure_from_command_line(self, tool, tool_description):
--        """ Update the configuration from the user supplied command line. """
-+    def _configure_from_arguments(self, tool, tool_description):
-+        """ Update the configuration from any user supplied arguments. """
- 
-         from argparse import SUPPRESS
-         from .argument_parser import ArgumentParser
-@@ -739,7 +730,7 @@
-             bindings.add_command_line_options(parser, tool, all_options)
- 
-         # Parse the arguments and update the corresponding configurables.
--        args = parser.parse_args()
-+        args = parser.parse_args(self.arguments)
- 
-         for option, configurables in all_options.items():
-             for configurable in configurables:

diff --git a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
deleted file mode 100644
index 908111627854..000000000000
--- a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 1651507410 -3600
-# Node ID 3d656f0765f508ea9714b5e7c9ce00e304e6f600
-# Parent  c179f418c5bee188e3ec7a0c0e50f9eab34cf12f
-Fixed indented directives.
-
-diff -r c179f418c5be -r 3d656f0765f5 sipbuild/generator/parser/tokens.py
---- a/sipbuild/generator/parser/tokens.py	Mon May 02 16:51:06 2022 +0100
-+++ b/sipbuild/generator/parser/tokens.py	Mon May 02 17:03:30 2022 +0100
-@@ -174,7 +174,7 @@
- 
- # Handle directives.
- def t_DIRECTIVE(t):
--    r'(?m)^\s*%[a-zA-Z][a-zA-Z]*'
-+    r'%[a-zA-Z][a-zA-Z]*'
- 
-     # The name of the directive is used as its type.
-     name = t.value[t.value.index('%') + 1:]
-

diff --git a/dev-python/sip/sip-6.6.1.ebuild b/dev-python/sip/sip-6.6.1.ebuild
deleted file mode 100644
index fa5b7a2265af..000000000000
--- a/dev-python/sip/sip-6.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/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="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python311-invalid-regex.patch"
-	"${FILESDIR}/${PN}-6.5.0-pep517-args.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2023-04-25 15:38 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-04-25 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c4f51f46223fecd5e2e8ed6eda059e14aba05dc5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 13:09:13 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 15:38:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f51f46

dev-python/sip: drop 6.7.5-r1, 6.7.7

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-python/sip/Manifest                    |  2 -
 dev-python/sip/files/sip-6.7.5-tomli.patch | 93 ------------------------------
 dev-python/sip/sip-6.7.5-r1.ebuild         | 44 --------------
 dev-python/sip/sip-6.7.7.ebuild            | 44 --------------
 4 files changed, 183 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 281a406407ad..0c5d9a1e495c 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,4 +1,2 @@
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-DIST sip-6.7.5.tar.gz 1160691 BLAKE2B 64572687e026854c3e8ba7de637925f13a880e51e574993e37190b9b1fafa1850da686600a652bab9d399f58516e2c4e4d8a93f5fb13d53a12ecc5ec3885a98c SHA512 2dc38a6c0489e374a016b7db1f9443bb5d2fb29dc1fa7647ed2dd5bb4aa8758586e2b85569f9fb3b992e15eded0f7a783ec1a53b3d18bee3f8be53d43b79b7b9
-DIST sip-6.7.7.tar.gz 1161807 BLAKE2B b9a49e2d86f3b13b5852b91403946920c25e9b7c3cb3129f6beece1ba6d607493a04fb0d5c0dd564fbe4b7e814ad9837daf6331096b7a1a4a24ff2a7bb11acb4 SHA512 b41a1e53e8bad1fca08eda2c89b8a7cabe6cb9e54d0ddeba0c718499b0288633fb6b90128d54f3df2420e20bb217d3df224750d30e865487d2b0a640fba82444
 DIST sip-6.7.8.tar.gz 1162921 BLAKE2B 3cc7107ad8c81240131ba96c43815b2a971bf109166a7a1bb3401cf5ed99e5d525599c0e7fcf7005c4b1d2194f9e7f386c4d58c10da712d4bd80d95e678f6804 SHA512 5d8965542c3fe821c95b2d2331d7f7df2ac9587a535f0b91f31223f4ee29f893ee73af42dc575abdff44a22a5b2ad98c6738211757595ae5a11f5a54fcea960d

diff --git a/dev-python/sip/files/sip-6.7.5-tomli.patch b/dev-python/sip/files/sip-6.7.5-tomli.patch
deleted file mode 100644
index c785e41f265a..000000000000
--- a/dev-python/sip/files/sip-6.7.5-tomli.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 586606d..312a431 100644
---- a/setup.py
-+++ b/setup.py
-@@ -51,7 +51,7 @@ setup(
-         version=version,
-         license='SIP',
-         python_requires='>=3.7',
--        install_requires=['packaging', 'ply', 'setuptools', 'toml'],
-+        install_requires=['packaging', 'ply', 'setuptools', 'tomli; python_version<"3.11"'],
-         packages=find_packages(),
-         package_data={
-             'sipbuild.module': ['source/*/*'],
-diff --git a/sip.egg-info/requires.txt b/sip.egg-info/requires.txt
-index b465c08..8547535 100644
---- a/sip.egg-info/requires.txt
-+++ b/sip.egg-info/requires.txt
-@@ -1,4 +1,4 @@
- packaging
- ply
- setuptools
--toml
-+tomli; python_version<"3.11"
-diff --git a/sipbuild/bindings_configuration.py b/sipbuild/bindings_configuration.py
-index 8197e27..a942f3f 100644
---- a/sipbuild/bindings_configuration.py
-+++ b/sipbuild/bindings_configuration.py
-@@ -22,11 +22,16 @@
- 
- 
- import os
--import toml
-+import sys
- 
- from .exceptions import UserFileException, UserParseException
- from .module import resolve_abi_version
- 
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
-+
- 
- def get_bindings_configuration(abi_major, sip_file, sip_include_dirs):
-     """ Get the configuration of a set of bindings. """
-@@ -47,7 +52,8 @@ def get_bindings_configuration(abi_major, sip_file, sip_include_dirs):
- 
-     # Read the configuration.
-     try:
--        cfg = toml.load(toml_file)
-+        with open(toml_file, "rb") as f:
-+            cfg = tomllib.load(f)
-     except Exception as e:
-         raise UserParseException(toml_file, detail=str(e))
- 
-diff --git a/sipbuild/pyproject.py b/sipbuild/pyproject.py
-index 1ba2223..6e4a7c6 100644
---- a/sipbuild/pyproject.py
-+++ b/sipbuild/pyproject.py
-@@ -22,11 +22,16 @@
- 
- 
- from collections import OrderedDict
--import toml
-+import sys
- 
- from .exceptions import UserFileException
- from .py_versions import OLDEST_SUPPORTED_MINOR
- 
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
-+
- 
- class PyProjectException(UserFileException):
-     """ An exception related to a pyproject.toml file. """
-@@ -69,7 +74,8 @@ class PyProject:
-         self.toml_error = None
- 
-         try:
--            self._pyproject = toml.load('pyproject.toml', _dict=OrderedDict)
-+            with open('pyproject.toml', 'rb') as f:
-+                self._pyproject = tomllib.load(f)
-         except FileNotFoundError:
-             self.toml_error = "there is no such file in the current directory"
-         except Exception as e:
-@@ -174,4 +180,4 @@ class PyProject:
-     def _is_section(value):
-         """ Returns True if a section value is itself a section. """
- 
--        return isinstance(value, (OrderedDict, list))
-+        return isinstance(value, (OrderedDict, dict, list))

diff --git a/dev-python/sip/sip-6.7.5-r1.ebuild b/dev-python/sip/sip-6.7.5-r1.ebuild
deleted file mode 100644
index a839024c9fa8..000000000000
--- a/dev-python/sip/sip-6.7.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="
-	https://www.riverbankcomputing.com/software/sip/
-	https://pypi.org/project/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="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	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.{8..10})
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tomli.patch
-)

diff --git a/dev-python/sip/sip-6.7.7.ebuild b/dev-python/sip/sip-6.7.7.ebuild
deleted file mode 100644
index 0c6d35c90af4..000000000000
--- a/dev-python/sip/sip-6.7.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="
-	https://www.riverbankcomputing.com/software/sip/
-	https://pypi.org/project/sip/
-"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P=${PN}-${PV/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	inherit pypi
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
-	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
-	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.{8..10})
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.5-tomli.patch
-)


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/
@ 2023-12-16 11:36 Ionen Wolkens
  0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2023-12-16 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     96fed03ebede4d4844af30d6a1474a56031ae23d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 11:33:54 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 11:36:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fed03e

dev-python/sip: drop 6.8.0

Semi-broken release, not a stable candidate.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-python/sip/Manifest                       |  1 -
 dev-python/sip/files/sip-6.8.0-typo-fix.patch | 11 -----------
 dev-python/sip/sip-6.8.0.ebuild               | 27 ---------------------------
 3 files changed, 39 deletions(-)

diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 813d45fd16e3..7afa3154991b 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,3 +1,2 @@
 DIST sip-6.7.12.tar.gz 1169656 BLAKE2B 07ae682e783da5bc6fc3109c62c7bff245faab795cc28f135758b1211fae1dfae79668e7e7c0de8b3bae5c8b10534d153cdd47969b34149c8f5598867d19f17c SHA512 885c32a051e882b82b59bf1365050933f8fc1c619b19f4bc03235edc5741a5e14aae8edf90479ad0283f74ba5c5233a2589c151ec865b130199a6db9800a2294
-DIST sip-6.8.0.tar.gz 985563 BLAKE2B 676636882a5bb39b226e7b25ae60cec43bf8ccfe9af085e14d9ff627af5ee579cc3ba01dbc5c2e75490575888fabdbd469895dbd964ea741d9e86748bebc1097 SHA512 09e25e3937339b6dbaa0b693bf0b99e5c225751ca79e0a307387c331f2b84e4e5a276897b471a123d24715e5d9cb85e84d244cf07960ff6f53f75859bbb2f901
 DIST sip-6.8.1.tar.gz 986219 BLAKE2B c9055b1aff3314661bfa2daa4fab465b57e811976aeb76fc2dafcb684b4ff2274c4eed88952ccfa904dd0e04a73f8f1eb6b969409146cbb80d3f1a2f58af9a99 SHA512 315243ec94fa66165ea458b64ab11d5b682f17723148e4dbe844dc31d6d7b024458a58c68bf2643f0930a31f28821b85a99fa1b02431a9a2e1c0d8ddd1df3342

diff --git a/dev-python/sip/files/sip-6.8.0-typo-fix.patch b/dev-python/sip/files/sip-6.8.0-typo-fix.patch
deleted file mode 100644
index 637d416d403e..000000000000
--- a/dev-python/sip/files/sip-6.8.0-typo-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/916261
-https://www.riverbankcomputing.com/pipermail/pyqt/2023-November/045607.html
---- a/sipbuild/generator/outputs/code.py
-+++ b/sipbuild/generator/outputs/code.py
-@@ -8409,5 +8409,5 @@
-         is_first = True
- 
--    if klass.docstring is None or klass.docstring.signature is not SocstringSignature.DISCARDED:
-+    if klass.docstring is None or klass.docstring.signature is not DocstringSignature.DISCARDED:
-         for ctor in klass.ctors:
-             if ctor.access_specifier is AccessSpecifier.PRIVATE:

diff --git a/dev-python/sip/sip-6.8.0.ebuild b/dev-python/sip/sip-6.8.0.ebuild
deleted file mode 100644
index 67ecebb1da3e..000000000000
--- a/dev-python/sip/sip-6.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/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/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-
-PATCHES=(
-	"${FILESDIR}"/${P}-typo-fix.patch
-)


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-16 11:36 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-08 19:16 [gentoo-commits] repo/gentoo:master commit in: dev-python/sip/, dev-python/sip/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2023-12-16 11:36 Ionen Wolkens
2023-04-25 15:38 Andreas Sturmlechner
2022-09-26 17:18 Andreas Sturmlechner
2017-01-01 14:20 Michael Palimaka
2016-04-17  1:19 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox