Numerous updates

app-crypt/certbot-dns-rfc2136/Manifest

@@ -1,8 +1,2 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
+DIST certbot-2.6.0.tar.gz 1336339 BLAKE2B 0c0575ad553ebe0f3ab56da750572bca46b30d034033e43c30c3793c114050ad824a277eab0be5a47326ea099e58e9a421448b53fc1b9173afae9a0ec308ac62 SHA512 d694156886484511f5a38fb5e40f98b2e2dbe4bc5110c95b2084ec03b39cb0eb9bbc623c7bca4a81054e980c8dbac752949042391813298a27be7e70410882e3
-DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-dns-rfc2136-2.6.0.ebuild 942 BLAKE2B 49450ab1bdff5b1ce1361ee7de07e978bd00a7ffd10fc2166e46fdd2ae0f12a173691d20205ff14fb0613e63d0acb89cd7c8a6804b42d8af4f4dd6e40c8a22a6 SHA512 e2c2968795f027f7c7cd32f007374100cfcfe154522adce0525f5069c1064ea72405e619cd8928b0bd027b2b91bfd86ac0d38d1779250cb0861701bed31e9f7f
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
-DIST certbot-2.3.0.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
-EBUILD certbot-dns-rfc2136-1.13.0.ebuild 1168 BLAKE2B dc81d001f898be52daa3fd9aeefb99abacfb84b8d5632f496ab0df5bce588caa6ff0a4e32fa0205719b03376f055e6512f0c00a95464fb3cfe07e2fe00a901ef SHA512 7b8e35497134fa356ae200ee6b800dac57fa945fb741e0f558304c0298d37590330f498b0d8d9ce1228a953a17b040bb9eda9c2183e75f4b3698743d7a4651b8
-EBUILD certbot-dns-rfc2136-1.16.0.ebuild 1164 BLAKE2B 2baaf0cf813d78c852274ff6292cc252c574d46baa9a67a5b5da0fc6fcb2a7f4db1e232347552ebf1a57f9a2b7de6809a80c2fa0725613b46ddefd709d7f9414 SHA512 544b731c80eca95427d19279606522936876c9b29de67e8581d695ce082f66054b4300e891b5df1b157a5a7813068358de51bd95a021dd65485f3767ccb8340f
-EBUILD certbot-dns-rfc2136-1.17.0.ebuild 1164 BLAKE2B 2baaf0cf813d78c852274ff6292cc252c574d46baa9a67a5b5da0fc6fcb2a7f4db1e232347552ebf1a57f9a2b7de6809a80c2fa0725613b46ddefd709d7f9414 SHA512 544b731c80eca95427d19279606522936876c9b29de67e8581d695ce082f66054b4300e891b5df1b157a5a7813068358de51bd95a021dd65485f3767ccb8340f
-EBUILD certbot-dns-rfc2136-2.3.0.ebuild 939 BLAKE2B 874126c8a8306ea94a420828638a3669ab8985dc9b286233e5bb0373e28a9ad7fa59d5d46f40a75d575ff76b1aa4878ec5e0440902a16d48f5836ae24298d256 SHA512 eb93d6161ff86f3909fcebf604ab7cb4f0621d28e1d13d023455cb9185f019e592fd662f780d056b4ba26bf329eb5e0b4cf842085063c0d31eb9c0eb43ab0999

app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.13.0.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.13.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.16.0.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{7..10})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.13.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-1.17.0.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python3_{7..10})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-dns-rfc2136}/${PN%-dns-rfc2136}/archive/v${PV}.tar.gz -> ${PN%-dns-rfc2136}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	S=${WORKDIR}/${PN%-dns-rfc2136}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.13.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}

app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.6.0.ebuild

@@ -3,9 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{9..12} )
-
+DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"

app-crypt/oscam/Manifest

@@ -1,6 +1,6 @@
 AUX oscam.confd 56 BLAKE2B ce7446a5b7520ef4b11e403e14b4be8710e00ba8031bceb21634da36d601f2c1e4e7af71c604f064c3288f50cb40ce9f1df56cd1489e483a9995bf654077bb5d SHA512 a8b637c8e88e93cc0f12b73b9bb3bedf8709c316c041cb42aa157e75a48a66bc0edc1704d5296a7f57f4f7a38b3ba4416d7a8034fafd2c29a1c16335633a1d51
 AUX oscam.initd 372 BLAKE2B e11b74fdde6dd0b86d5a7ec7f5043fb885ae9a2306321ee565c8a7b8cc850b857325cffe3f74af8ca0491ec9daf2eb13e07bfecc04e0c1ba3369301e0286f938 SHA512 6b386e04255b422aac39fc0e0ddd683e20ec066fc7b85d4ceeb25f4901c7003e59ba3d62746915987f3be7cfbc52e36fa9aade5449b84b4da56d41adf20cfebe
 AUX oscam.service 245 BLAKE2B c93430b8ce3e798d01bd350cf7a255a42cdb5ded8a9b418b5632d0c6f198acb32bf5fd1af38e80bc97aaea59edd538cc0c3ce48fa214f5d169e6346b2512a09b SHA512 7b9893962793c56dc0f402dbb9938bd81231204bcf430a3e537fc4b3196f67ec86d0f280b16d7b588c95b10c59747cb8e5b72a082148790533bfa4526bbe67e5
-EBUILD oscam-9999.ebuild 6600 BLAKE2B de08271e52d8c8b626614dfcd7be2cafcf9469ffe61d95f7b747cc71162ca575c0b6d47ee12b76a9dc6709998d3ac6faa3ce5446c66f172f70e50449a117e7ab SHA512 9aa5e100219ffb3ed86c5fdaf70345d418d106f131a8d30f281039f8c98544df6516d20347ae4485d231cb1a918f7931532330deca87e23d394fc7b3beea5269
+EBUILD oscam-9999.ebuild 6574 BLAKE2B b646b50e310e92af2cc174e656079965d9202b4823a0a72c0a7a647f314e2debde0f5ab26a9b94d21a453086186222dbd8a8e64fff51c1f037511b273ffe474e SHA512 7dc81cb7666132572754ac36ad6842df4e2c8867f1fb2675efe5939c144f95384e0b65c1f85bf164edea3e90fcc4c88558b94f7aeedde9acc333244dd9aa5922
 MISC ChangeLog 290 BLAKE2B 36fb20456d44d71117d2845d45868cab61dd7e309fad1c3622e9895cfb0279827690117a9220a44695031d9637ff07628b9b2ef0d0ba6d84f9dd21f9bc42723b SHA512 e7c4c74bc75e3e08ac360f5ee2451054a314309d80e15029ce13c4b11407963e0721a11185c0dc21f4fe1816dde9355392dd01f4f37d4b2b86a8d9554a61ebe1
 MISC metadata.xml 249 BLAKE2B 81f45d16793b7a445e3aca417c1209366f9025b0285ec8324c8b5b9a3dc5bbe3b84513057f16bcd900d89b9d678d4467631bc1c9978e5c670eaf9c0e8595931d SHA512 62e5924d69c6499ee7b5e6629714ae2f546534016044e1505132b542c96ebc6cfde60c439864389b03a0522eb7e42e21c1e2c577e0d6a1c887b4018e1871a279

app-crypt/oscam/oscam-9999.ebuild

@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="6"
+EAPI=7
 
-inherit eutils cmake-utils flag-o-matic systemd
+inherit eutils cmake flag-o-matic systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="http://streamboard.tv/svn/oscam/trunk"
@@ -133,13 +133,13 @@ src_configure() {
 	# Set default config dir to /etc/oscam
 	MYCMAKEARGS="-DCS_CONFDIR=/etc/oscam"
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
 	# Binaries
 	exeinto /usr/bin
-	doexe "${CMAKE_BUILD_DIR}/oscam" "${CMAKE_BUILD_DIR}/utils/list_smargo"
+	doexe "${BUILD_DIR}/oscam" "${BUILD_DIR}/utils/list_smargo"
 
 	# Init scripts
 	newinitd "${FILESDIR}/oscam.initd" oscam

dev-libs/or-tools/Manifest

@@ -1,2 +0,0 @@
-DIST or-tools-9.4.tar.gz 14411489 BLAKE2B 9fe09798071f8ed2aa9634ad566ef00a68fd64892cf7169762108c2dc86a4fd144cfa70d78b69d73f645802318b1a20f2f8fc0ded32638260a122cdc857e6a7f SHA512 578f1e18ab0467ca686539768f7d881542a2815577e2f5aed962ae2a4a8f9c1c9a30b59ff4bd5ed9819115d4e7b6f455352d50097d7b0d0ef6870d7525258cd5
-EBUILD or-tools-9.4.ebuild 2265 BLAKE2B a30b57553a4004392bbbc2cd6f5f9320e7e3f571f5c14a76144e72ddf793b5b02dcc2369ba1004bcd3bda341a70853a2bfc11bc79a91e88b2993e90633797fce SHA512 3628dcb29d15bd56d05961e7875e07c671f7f3cc7577f34847f9f5534a34cfd046b082b6c6845e9541811d8d7926fecf9b9a5cc3700cd20357c13a7a5f78a53b

dev-python/euclid3/Manifest

@@ -1,3 +1,2 @@
 DIST euclid3-0.01.tar.gz 13201 BLAKE2B ffa8d368f58cae91969230eaf4fa5324cda2c45ff69c98d73b1fdfbdb67e38846090fac4cdd128439583a7f36190c2d474c7f647823ac79440218bf02a73070f SHA512 c4e5e2770ab4ede08904fc3b76e50d6812944ed226c9db52f2da8d100370e20ea6031ca554ae44d72d53e96727d163bd3cc8da7bf175539de10749da77877b0b
-EBUILD euclid3-0.01-r1.ebuild 447 BLAKE2B 24e1374da60c37c2cd7646cbdb0136fefdada089d224300940f4a7adfa54a06ada12fa84c5b0b744dbd1dd2d2218e10b079510052dcb8448db81cc8f052f4ea1 SHA512 145e496cf4aef7f0c048896a93c0deca90c22ae7409b47542b203baeaf1357337fb0c58b482bb744d4380e71e5fe590cce572ee64e0f41acd901aa5f9b2d01eb
+EBUILD euclid3-0.01-r1.ebuild 404 BLAKE2B 372df0d13a6fe97d31db82bc6a8c0af556c750a9a27d6258c0d02124484c7ce2f269ccadbe3c7dc6d9262ff64fd98426e94d5ba39c721628949a437f8bcb093f SHA512 b4b7d0a0182d9b84631642a231a6a75c236fcf25172a9fff7f717fa0c74285a800aac0ab7d0edd4c7c02dec3fdf52ec9fef57b0e02eeb725e2fbbbea68735525
-EBUILD euclid3-0.01.ebuild 446 BLAKE2B 63f940400d181acaaea3956be22602d1254a70b8eb50a6c1cec187d4970521340f475ad6bf940d7452f105ae85f9deec6dad7eb247e863765e2b2a39fc530cd0 SHA512 2d570962118a8a4ff458442714e31e0d040bc852201cb7f614ee311a1651b4ab2859117b3364d4821995b40247b4336a10dfe0390fb8ebc5c91c0f96ed89efb3

dev-python/euclid3/euclid3-0.01-r1.ebuild

@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="2D and 3D maths module for Python"
 HOMEPAGE="http://partiallydisassembled.net/euclid.html"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE=""
 SLOT="0"

dev-python/euclid3/euclid3-0.01.ebuild

@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="2D and 3D maths module for Python"
-HOMEPAGE="http://partiallydisassembled.net/euclid.html"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"

dev-python/flask-restx/Manifest

@@ -1,7 +1,2 @@
-DIST flask-restx-0.4.0.tar.gz 397306 BLAKE2B fa177708c7576b03fb75dc70aeb00ab72617b2eca0f600b96cb25f8a5c51c3487c5368f20ebbfa55cbe647732150ba9d64fd1149e7ca04d238df724f995cc737 SHA512 d35ebd830e6a988540e2913e9424939d27876ed0bc67d3c46d6cc857348b54d73753606d4fc593c6e7a8f21d2a7a4a1fed58a6310b71a8594400def9f710199c
+DIST flask-restx-1.1.0.tar.gz 398890 BLAKE2B 0268d0173e35bd36e3cd7c8eb40b1083370eed9cad3fe0cd0c55c548481844f14fa68b80f7d0461ef98074ca384cb880c1c9c30fb8d1bf0ca5e497b0cfc134b2 SHA512 83c0319591078827fe7ad2db04833817df13b5e808e3137b309b6b994908c9ae40c665aa8f10def5e06a7d1f41d9b4dc03be35c46b6403e03ef28684cc512380
-DIST flask-restx-0.5.0.tar.gz 398620 BLAKE2B 23ac1a51b4cb0848b28dc14bd1727849c51287d9e05a881835d2b5122d6869fce87827403e86d0359d3d05fa77f93be33ba8b3442b61d21ecefae50fbb38d46c SHA512 0961400267358b45c6cde6865cba547d98ef89f4f12830cf469ba12520cda0e0f179791e8ded1f0d99047fe63f654e14499f592894a05769cb510dae821642ee
+EBUILD flask-restx-1.1.0.ebuild 1258 BLAKE2B 073bfa48bf53d54eb1b536cc9c1b314105c82a5dcf5efbe986137cb8dea5a2020c88b35c87f6b88a4f08f578c291e94922069c63776afb39382ca75983e8ef89 SHA512 7d4a26b0d37e7f85b285ee633f32f71936e60d23f64a724e570febe7bc130bc7af23c55db980e0f6b83e734ef6f07b519c218aed83b448f0ea4100c99908a8b0
-DIST flask-restx-0.5.1.tar.gz 398653 BLAKE2B 605c66decc83d8d7fc3449d3b7053cc2bb589d23f4db22d3a61b9422a97ceefdc0335af8c002762ec7693844b005f5562fdfda09e95c1e83fa266709af640a9d SHA512 0e4ca95a6bb45f7dfba1758387aded6215ec64fa55060889e6843fb50eed09fda96ba936eacd0d8f27b29f5dec2468d4945386f25ff4de6a51f571e16617cf52
-EBUILD flask-restx-0.4.0.ebuild 1268 BLAKE2B 4c426b81c38b602a99694c3d17664d3e0cd38437267ca2fcc6e4d3b9e585e65f33fae7d53c063428be3391fd1ffbf0d8029e122b34f9849948959e3e77c94712 SHA512 af14497fadb54590be7ed74fccb81c149031ae40f24599eb51c552c0b83c4799aaae12e8384acc97ce06b94fc1d7df6b4b1f56cc227475488a582244f3ba6581
-EBUILD flask-restx-0.5.0.ebuild 1260 BLAKE2B 11e45314ac878651d3a8e5eb3472f3c1c5b3d0aaf2c996335317f650666884d83b927453efdf7c4e2218b92a337b54c86283a2c5ece0f52f60cb29bc8e25ecfa SHA512 794a57f8058f3765c9781463a0a77199fc2bc853c9e9e7a8a1af83c8a649188c7bc0f1e3d6f5559adb24d48e509b56151886a80ffbcc6ded593ae4664d57f247
-EBUILD flask-restx-0.5.1-r1.ebuild 1261 BLAKE2B eda76afc28aef66063a10529145241e3c30a52aecab3a3c2f0097bb2e69a08642c4678964c1bde4a4d10e90b8ac85c86785c18e811939207830103df2f50f0e7 SHA512 d8d077739e0df531fe59bf5b5dc1d597065db8007cf86dcfbb8c1ff78ac7344665c2f2443e970482f37b184eff58f1ea46bde7e97a41ec4cd577aad9081057a5
-EBUILD flask-restx-0.5.1.ebuild 1260 BLAKE2B 11e45314ac878651d3a8e5eb3472f3c1c5b3d0aaf2c996335317f650666884d83b927453efdf7c4e2218b92a337b54c86283a2c5ece0f52f60cb29bc8e25ecfa SHA512 794a57f8058f3765c9781463a0a77199fc2bc853c9e9e7a8a1af83c8a649188c7bc0f1e3d6f5559adb24d48e509b56151886a80ffbcc6ded593ae4664d57f247

dev-python/flask-restx/flask-restx-0.4.0.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Fully featured framework for fast, easy and documented API development with Flask"
-HOMEPAGE="https://github.com/python-restx/flask-restx"
-SRC_URI="https://github.com/python-restx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		~dev-python/alabaster-0.7.12[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		~dev-python/sphinx-issues-1.2.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/rednose[${PYTHON_USEDEP}]
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	use test || rm -rf "${S}"/tests
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

dev-python/flask-restx/flask-restx-0.5.1-r1.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Fully featured framework for fast, easy and documented API development with Flask"
-HOMEPAGE="https://github.com/python-restx/flask-restx"
-SRC_URI="https://github.com/python-restx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		~dev-python/alabaster-0.7.12[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		~dev-python/sphinx-issues-1.2.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/rednose[${PYTHON_USEDEP}]
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	use test || rm -rf "${S}"/tests
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

dev-python/flask-restx/flask-restx-0.5.1.ebuild

@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Fully featured framework for fast, easy and documented API development with Flask"
-HOMEPAGE="https://github.com/python-restx/flask-restx"
-SRC_URI="https://github.com/python-restx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		~dev-python/alabaster-0.7.12[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		~dev-python/sphinx-issues-1.2.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/rednose[${PYTHON_USEDEP}]
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	use test || rm -rf "${S}"/tests
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}

dev-python/flask-restx/flask-restx-1.1.0.ebuild

@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
@@ -19,10 +19,10 @@ IUSE="doc examples test"
 
 RDEPEND="
 	>=dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	doc? (

dev-python/kikit/Manifest

@@ -2,8 +2,6 @@ AUX kikit 205 BLAKE2B 35fc0aedeb0295b5bce775b1239a61f9aade6719194045caa8b9d0c0ad
 AUX kikit-info 207 BLAKE2B 7fe87332597c79e911ba231de7198810b169f88335766d5adaa1a53b535efaf739466cdff5b9d4b8873b862290dbaa5b98431add5eefd24fda7398089cb21461 SHA512 15720d4ea4ee1a259519d5b94509eff3c36830e63654525074afc01daf646396f57b88bab1c2bc18adae322c7d963f604268772e5f931b9b79e54064bb384c90
 AUX kikit-plugin 209 BLAKE2B ec92753c891f310f4f4f8a9fc245220565ea5f7fea41c12b6dcd9a276a9f3dc599fbb0db1902fbd84382bdf17d18d90584184ba407c2c8b7ec2533a687a8a530 SHA512 3283843e09272bbebfaae0cb3545c5a107ae24720c4817a03b47e4415f65b2733dd79af0551fc79db548116da452ee9decebbecf97776d9c3546ff99fed6c126
 AUX kikit_plugin.py 106 BLAKE2B dfc9e818c59d5b59a6a31d8394b8cb00a3839450f1563ea2124d84935276b26125e9dd078f8e6cdc0f057d9865358cc11694188f3c0fea58e2829dd39c5d881d SHA512 ff8907d3f044384261ad1340c5c234edf5a3cd8cce1bb97753aee3fb6c85c19d0ac0ad187fda5bfc88a850d5812a07fc41f0f8e62cdb8f68aad59974d00a94e0
-DIST kikit-1.1.0.tar.gz 229899 BLAKE2B cbf2d0b35a8ad41b3e605435a6d887c2d07c4aaea2a33a4ed9c3f8b4c9b1ebc3a543ab85283c11fedc28ffe88e6e12a132e05145b0a3e65779aab334354e8701 SHA512 65639b09ebb3ba087621045261fe7db4eef1b5cb851891ae5ef0254cbc096663d2151028a2ea8a5c747f065edfe52d36debdce13894ac02ee41a3d6b2e004e45
+DIST KiKit-1.3.0.tar.gz 235750 BLAKE2B 79ab137ef4b281ee2349f29faed3dab749e132a49fc3c2b3428bb623ee95f8733f52a22047c5e7b8801155ebc7c663fd767a9596a2bbe8cf067c36f7a1829459 SHA512 39cc68357c7a01e4aa7b68867287080c9b0f1f3d4e293c6680560a946302a5a21e7ca17fdb0daa351876fdb633497d9665d3fb0a8820e970059cc2d6d22ce2d3
-DIST kikit-1.3.0.tar.gz 235750 BLAKE2B 79ab137ef4b281ee2349f29faed3dab749e132a49fc3c2b3428bb623ee95f8733f52a22047c5e7b8801155ebc7c663fd767a9596a2bbe8cf067c36f7a1829459 SHA512 39cc68357c7a01e4aa7b68867287080c9b0f1f3d4e293c6680560a946302a5a21e7ca17fdb0daa351876fdb633497d9665d3fb0a8820e970059cc2d6d22ce2d3
+EBUILD kikit-1.3.0.ebuild 1627 BLAKE2B 78bd4dc7526b7fc474ba1bbdc17509fc0b4ba74af7f3a644b50e4acb601f5c1c1959a43f926a49fcdc627b0048364b3f5cde1d868740c81e6e3ed2fa44089467 SHA512 f2a072386cbe08e7515c2b3e0636da068a78df2f22d0f79221cf0ab1d3d40490f4a3f6fca3df66b6c880b43de4e04953aac5de03d5d3cd4f8609aad012d4b8ad
-EBUILD kikit-1.1.0.ebuild 1599 BLAKE2B 99391c81442d9494e88e8cf2f8a043d6321e6f91f6b1359082c6e6424d3be27b4a44f5165e5061dba779afdee32de6793bac1249f5f39c7a633fc222deb489be SHA512 9606a1eb6333daf028e5c8f699a0866b516dfc76cdc88012072af255c418748de9161f652a4cad5b487b18a4b4dc0fa8110e83988fb3dd573d70506b6274a7c7
+EBUILD kikit-9999.ebuild 1627 BLAKE2B 78bd4dc7526b7fc474ba1bbdc17509fc0b4ba74af7f3a644b50e4acb601f5c1c1959a43f926a49fcdc627b0048364b3f5cde1d868740c81e6e3ed2fa44089467 SHA512 f2a072386cbe08e7515c2b3e0636da068a78df2f22d0f79221cf0ab1d3d40490f4a3f6fca3df66b6c880b43de4e04953aac5de03d5d3cd4f8609aad012d4b8ad
-EBUILD kikit-1.3.0.ebuild 1599 BLAKE2B a0401fe3ef6f4c472cc8c538b294e75b5d0ada904d850e3216732fb6ac155a2c60a4ffd45491afe2188335678cf8120ae8b355eee2040067eb0263e3fd6ad2c8 SHA512 96e9719a41c0d49a138858638b1ff3557d2ed7783b003f4afbdc8cf1226ccfd05dbad8528d9db9ee6a6dfdb836950f9d435aebbe2b5feded67eb74d907f27955
-EBUILD kikit-9999.ebuild 1554 BLAKE2B 74db7b6c7cb96a8fa53221fbbd861aae69cd22fe9de1515e204fe8a0dc127e0aab01258f6c5260ceeb0ca2e96eecc8e62a25bb4c62ce2f89d5f8d17d1e9795bb SHA512 d61dc94f2daf38054325cd632b8bf3d1e0718324959a9066cdc08939be5463d5c00f5e0dc363f7a750cd31f333b83868be02a1ddb822943056c84431aa711f18

dev-python/kikit/kikit-1.1.0.ebuild

@@ -1,67 +0,0 @@
-## Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-single-r1
-
-MY_PN="KiKit"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="KiKit is a Python library and CLI tool to automate several tasks in a standard KiCAD workflow"
-HOMEPAGE="https://github.com/yaqwsx/KiKit"
-if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
-        KEYWORDS=""
-        inherit git-r3
-else
-        KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="$(python_gen_cond_dep '
-		dev-python/click[${PYTHON_USEDEP}]
-		>=dev-python/commentjson-0.9.0[${PYTHON_USEDEP}]
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pcbdraw[${PYTHON_SINGLE_USEDEP}]
-		dev-python/pcbnewtransition[${PYTHON_SINGLE_USEDEP}]
-		dev-python/pybars3[${PYTHON_USEDEP}]
-		>=dev-python/shapely-1.7[${PYTHON_USEDEP}]
-		>=dev-python/solidpython-1.1.2[${PYTHON_USEDEP}]
-		sci-electronics/kicad[${PYTHON_SINGLE_USEDEP}]
-	')
-"
-
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/versioneer[${PYTHON_USEDEP}]
-	')
-"
-
-src_compile() {
-	true
-}
-
-src_install() {
-        python_domodule ${PN}
-	python_doscript ${FILESDIR}/kikit{,-info,-plugin}
-
-	insinto /usr/share/kicad/scripting
-	doins ${FILESDIR}/kikit_plugin.py
-	dodoc LICENCE README.md
-	
-	if [[ ${PV} == "9999" ]] ; then
-		dodoc -r doc
-		dodoc -r scripts
-	fi
-}

dev-python/kikit/kikit-1.3.0.ebuild

@@ -3,28 +3,31 @@
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1
+inherit distutils-r1
 
-MY_PN="KiKit"
+PYPI_PN="KiKit"
-MY_P="${MY_PN}-${PV}"
+MY_P="${PYPI_PN}-${PV}"
 
 DESCRIPTION="KiKit is a Python library and CLI tool to automate several tasks in a standard KiCAD workflow"
 HOMEPAGE="https://github.com/yaqwsx/KiKit"
 if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
+        EGIT_REPO_URI="https://github.com/yaqwsx/${PYPI_PN}.git"
         KEYWORDS=""
         inherit git-r3
 else
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	inherit pypi
+	SRC_URI="$(pypi_sdist_url --no-normalize)"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -60,8 +63,8 @@ src_install() {
 	doins ${FILESDIR}/kikit_plugin.py
 	dodoc LICENCE README.md
 	
-	if [[ ${PV} == "9999" ]] ; then
+	#if [[ ${PV} == "9999" ]] ; then
-		dodoc -r doc
+	#	dodoc -r doc
-		dodoc -r scripts
+	#	dodoc -r scripts
-	fi
+	#fi
 }

dev-python/kikit/kikit-9999.ebuild

@@ -1,29 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+## Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-MY_PN="KiKit"
+inherit distutils-r1
-MY_P="${MY_PN}-${PV}"
 
-inherit python-single-r1
+PYPI_PN="KiKit"
+MY_P="${PYPI_PN}-${PV}"
 
 DESCRIPTION="KiKit is a Python library and CLI tool to automate several tasks in a standard KiCAD workflow"
 HOMEPAGE="https://github.com/yaqwsx/KiKit"
 if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
+        EGIT_REPO_URI="https://github.com/yaqwsx/${PYPI_PN}.git"
         KEYWORDS=""
         inherit git-r3
 else
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	inherit pypi
+	SRC_URI="$(pypi_sdist_url --no-normalize)"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -57,7 +61,10 @@ src_install() {
 
 	insinto /usr/share/kicad/scripting
 	doins ${FILESDIR}/kikit_plugin.py
-        dodoc -r doc
+	dodoc LICENCE README.md
-        dodoc -r scripts
+	
-        dodoc LICENCE README.md
+	#if [[ ${PV} == "9999" ]] ; then
+	#	dodoc -r doc
+	#	dodoc -r scripts
+	#fi
 }

dev-python/pcbdraw/Manifest

@@ -1,4 +1,4 @@
 AUX pcbdraw 207 BLAKE2B b30a413cf0e03bc3a96b32606942b623e705554b286ab9a7f89e1de2ce2af92a73d4e76faa30793f0869d2bed203e5a316bcd60e0096d129165b4f26c6a39a70 SHA512 312c7c7d5ab16ddf892d369bf3cb8f76929500e040af4d2e0d3cdab45004303bede29c3230a9c468f8ee50a50a463d02385468a6552e8a02b4e49aff119f0fe6
-DIST pcbdraw-1.1.2.tar.gz 805513 BLAKE2B 3eb612e7434668caf7f1bbad7dc11bf002e33c27445e07ce7c78932763ea14093cd797a01728a91a3f8d54b2e52d0189fe5de4c9d4f73b3f63310e8494fbecc0 SHA512 653cc72e1452d2d215dcf0822b6ff58c28d109a0ba05ad1e4f67b63683060e16cd56a43dcc9a449e5641c1396a85b18e413d225ad39bbd78d69d5d0f828a8028
+DIST pcbdraw-1.1.2.tar.gz 805502 BLAKE2B 94ee57a17ed627feab7ba6b9c28c0ae087dbf81963740dd2eafd8601ec349021dbb099121821a5422ddda83a27af40d9d9025a276ad1991a5fbbc3a3d0730731 SHA512 067678386bf0d0b4adcaa62513822add9daa7ee3e33504c4284de94f9b87a9df8fc399eb401c084da616be27f70d09e22d5b7640de9a53a7fabf15b92d1ca34a
-EBUILD pcbdraw-1.1.2.ebuild 1594 BLAKE2B edf540bd0532af3525e42b29edeb6712c92ec5ba6626d2f30b296b463f7950e34eb56beea1b9930b389a3c913564ace87930f5015c3abc2648f05d822e87b875 SHA512 7fcd939f6e9131de89464a09e8bf7fa19eb9538426cbb17237ab808114e5ccdc2d07881af4957582ddbf4e12acb11fbda446ec91c1063600c4472aa74c2f3d94
+EBUILD pcbdraw-1.1.2.ebuild 1624 BLAKE2B a036dcc9c8a86081d351d5da49e7f421ee52e4b82026cfce4e65ce061cd8c805cc01e6c5e49055fd2d7c18c49a9e71bba49d3e265e5c197a1d3aa34085ac866b SHA512 b81747247bb044d59a55337c1a742400368f8d3e4b3809a223ae6f6e660366ccea1b3dcaf6d73179d34ec9828849bdffd077239abf257ab50e9acbc1bfe8329e
-EBUILD pcbdraw-9999.ebuild 1519 BLAKE2B 0e78f6cbef129e45749f4d3ceded9a4c37d14b193733fd9127bca299a1435b4f865bc5edb079b43ef3a97d26a228267967885d53fb137d99ee8f2e943f6ee509 SHA512 7f5b12947f2dba64a00830f5969d64a94c625f63cf710eeede36470fe4afbb4d1e23fcc92624d8e1f013b80b80cb7476e76ed7591aae5cfd7a9d1a598bc850c6
+EBUILD pcbdraw-9999.ebuild 1624 BLAKE2B a036dcc9c8a86081d351d5da49e7f421ee52e4b82026cfce4e65ce061cd8c805cc01e6c5e49055fd2d7c18c49a9e71bba49d3e265e5c197a1d3aa34085ac866b SHA512 b81747247bb044d59a55337c1a742400368f8d3e4b3809a223ae6f6e660366ccea1b3dcaf6d73179d34ec9828849bdffd077239abf257ab50e9acbc1bfe8329e

dev-python/pcbdraw/pcbdraw-1.1.2.ebuild

@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1
+inherit distutils-r1
 
 MY_PN="PcbDraw"
 
@@ -18,11 +19,13 @@ if [[ ${PV} == "9999" ]] ; then
 else
         KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/yaqwsx/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -50,14 +53,12 @@ DEPEND="${RDEPEND}
 	')
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_compile() {
         true;
 }
 
 src_install() {
-	sed -
         python_domodule ${PN}
 	python_doscript ${FILESDIR}/pcbdraw
 	dodoc -r doc

dev-python/pcbdraw/pcbdraw-9999.ebuild

@@ -3,9 +3,12 @@
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1
+inherit distutils-r1
+
+MY_PN="PcbDraw"
 
 DESCRIPTION="Convert your KiCAD board into a nicely looking 2D drawing"
 HOMEPAGE="https://github.com/yaqwsx/KiKit"
@@ -15,12 +18,14 @@ if [[ ${PV} == "9999" ]] ; then
         inherit git-r3
 else
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/yaqwsx/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -29,14 +34,14 @@ RDEPEND="$(python_gen_cond_dep '
 		dev-python/engineering-notation[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/markdown2[${PYTHON_USEDEP}]
-		~dev-python/mistune-0.8.4[${PYTHON_USEDEP}]
+		>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pcbnewtransition[${PYTHON_SINGLE_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/pybars3[${PYTHON_USEDEP}]
 		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		~dev-python/svgpathtools-1.4.1[${PYTHON_USEDEP}]
+		~dev-python/svgpathtools-1.6.0[${PYTHON_USEDEP}]
 		dev-python/wand[${PYTHON_USEDEP}]
 		sci-electronics/kicad[${PYTHON_SINGLE_USEDEP}]
 	')
@@ -48,12 +53,12 @@ DEPEND="${RDEPEND}
 	')
 "
 
+
 src_compile() {
         true;
 }
 
 src_install() {
-	sed -
         python_domodule ${PN}
 	python_doscript ${FILESDIR}/pcbdraw
 	dodoc -r doc

dev-python/pcbnewtransition/Manifest

@@ -1,4 +1,2 @@
-DIST pcbnewtransition-0.2.0.tar.gz 18960 BLAKE2B 4681ced2238d7898cbf5e9f44bfd0acc32b5c697cf1a513bd6d237813014dc58aa90d6d1a3947b869736b61047804e3c6215e80e60036ae502642985eb5f70c8 SHA512 650867b9d3ed7e4f9a6e9e90c58a0e8bee6efccd7cf88c145229837540d053d221f4d78f4ceb2c3286d4f64966542b5170c574b28455b9f5535f7a76b653f1c9
+DIST pcbnewTransition-0.3.4.tar.gz 21636 BLAKE2B 5d60619b99652a9349d90f5055177bcf39154f5b29bfe2ab4e4d66b733256817e1a9cf930ffcf9622573a8bee1b9177fc694f86e698dccf0e1a5249d0c203bcb SHA512 cca02f15d59e051f2a04f561a1ecc9a3dcf2f755695feb38850eaf3c0fbb2a92a43049d4af51cb9fc7850059404c8da209121c82902e0775f23af7aeb4c178bc
-DIST pcbnewtransition-0.3.4.tar.gz 21636 BLAKE2B 5d60619b99652a9349d90f5055177bcf39154f5b29bfe2ab4e4d66b733256817e1a9cf930ffcf9622573a8bee1b9177fc694f86e698dccf0e1a5249d0c203bcb SHA512 cca02f15d59e051f2a04f561a1ecc9a3dcf2f755695feb38850eaf3c0fbb2a92a43049d4af51cb9fc7850059404c8da209121c82902e0775f23af7aeb4c178bc
+EBUILD pcbnewtransition-0.3.4.ebuild 930 BLAKE2B c4aeab336dd808d5d96f9e7672508cdf90ed0411e95c96473a0059eb8f73795d48ce021272b0b9f7ab1bedd3017270ac42091dfbf5381b6de568f8bf094798fd SHA512 b2c323de52826dcbd60ce1f56c617406ff8ca97032c7cf94186664ce4c3b2ccffe4673617b8158749cd175c9d5bea3ea36dd347e6edc7e6cbf0b06ea74281b0a
-EBUILD pcbnewtransition-0.2.0.ebuild 920 BLAKE2B 78bbad3237794b6df63633921556061710fa9b4c7b51b00ce1667fa0c48aed5ba4bf51699f32533300be539d5b64ddd491a96393c7756118d5d648f5f0a5550e SHA512 c5481e80e80370607d8b4d50c68e00bfa6828b2b76605b66c705fca824ab0b16312dc52b0d16b5a466343e5ba515b4d2f1b237599bbb59bf9e0f17fe42944dfd
-EBUILD pcbnewtransition-0.3.4.ebuild 920 BLAKE2B eabcb056ff9245aa54ac24eb0a97fc27e22e10dcfde0c6e9616cf98c3800c4a7d80ba672715bc64b40dea2e3211e9693aa415d1791610fd40df1e81b5d41d182 SHA512 8fada47628557ab356ac5dbb22db481a81a2578e16f4a14d28807a8c8c72180c34d6deb4e2477c2bb6b96c396a75121c25c106c27aa016a27103bf5019b81a4b

dev-python/pcbnewtransition/pcbnewtransition-0.2.0.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-MY_PN="pcbnewTransition"
-MY_P="${MY_PN}-${PV}"
-
-inherit python-single-r1
-
-DESCRIPTION="Library that allows you to support both, KiCAD 5 and KiCAD 6 in your plugins"
-HOMEPAGE="https://github.com/yaqwsx/KiKit"
-if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
-        KEYWORDS=""
-        inherit git-r3
-else
-        KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/versioneer[${PYTHON_USEDEP}]
-	')
-"
-
-src_compile() {
-	true;
-}
-
-src_install() {
-        python_domodule ${MY_PN}
-        dodoc README.md
-}

dev-python/pcbnewtransition/pcbnewtransition-0.3.4.ebuild

@@ -3,23 +3,24 @@
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-MY_PN="pcbnewTransition"
+PYPI_PN="pcbnewTransition"
-MY_P="${MY_PN}-${PV}"
+MY_P="${PYPI_PN}-${PV}"
 
-inherit python-single-r1
+inherit distutils-r1
 
 DESCRIPTION="Library that allows you to support both, KiCAD 5 and KiCAD 6 in your plugins"
 HOMEPAGE="https://github.com/yaqwsx/KiKit"
 if [[ ${PV} == "9999" ]] ; then
-        EGIT_REPO_URI="https://github.com/yaqwsx/${MY_PN}.git"
+        EGIT_REPO_URI="https://github.com/yaqwsx/${PYPI_PN}.git"
         KEYWORDS=""
         inherit git-r3
 else
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	inherit pypi
-	S="${WORKDIR}/${MY_P}"
+	SRC_URI="$(pypi_sdist_url --no-normalize)"
 fi
 
 LICENSE="MIT"
@@ -36,11 +37,13 @@ DEPEND="${RDEPEND}
 	')
 "
 
+S="${WORKDIR}/${MY_P}"
+
 src_compile() {
 	true;
 }
 
 src_install() {
-        python_domodule ${MY_PN}
+        python_domodule ${PYPI_PN}
         dodoc README.md
 }

dev-python/prettytable/Manifest

@@ -1,3 +1,4 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
-EBUILD prettytable-0.7.2-r1.ebuild 599 BLAKE2B 1133ae57b583f869d249940d7f36c97c9161a59ed56e023461c83016d85d3dce1f2d3d7f31b7ddbf73eac71db9969ce7c2eb70592f6bc37be532be63bf955d41 SHA512 384161e40a8e694a93d094f473acd7bdd5582572328c59cd6a8a8a854e1dfa6178023fab757ff81654242200380e0e5d46af4283e4d0a980085637c8f35d9339
+DIST prettytable-3.8.0.tar.gz 47735 BLAKE2B df31c77eaa4c0b4e7dc5845255383c13d5eff23c7fb8743c4cdd9f726229c84d98a0b4e66e8d42ec4d3e2d43db703d55706705d2e79c4ae8682b7b8b794217a4 SHA512 4719f16e98d4e7b89d8a7f6b2e1d15fd2c44410e5c9edc29a4dbb8ef2899eccff524932afe179bea7a6bbe607a809274b805e76e9ef2e3bf2c77f054635f8f04
 EBUILD prettytable-0.7.2-r2.ebuild 601 BLAKE2B 595a16e5553ce765780e3aff21611358a5903844dac548412f456dac76183277f2217453978ddceb27aaceeaaccaa498677269523e4ec01b7037d75b700f8a35 SHA512 f9dae57fca39034f1ba8472a106372364e41b043d14bf61e0afd47c45ecde56b546f1ae0b4ee808575f5342473f92e958fa473d4f85dce4775d8d74e35a1a91a
+EBUILD prettytable-3.8.0.ebuild 495 BLAKE2B 9df210fe5392764a1c9e852c096d44cec83293b10319491d1aaf7847b022b44f2f17bf90145df9b85d68a776e341d4a5ca854c49548d4a2613fe7045bbe1a665 SHA512 a744a7da66149d0bcdd8ce416a58406719c3e91714f44b0fc164f22301c5646cf1e3bfc183ef8b374cb048862059dfe653b3b972e753739d2885bb7ff7657148

dev-python/prettytable/prettytable-0.7.2-r2.ebuild

@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
-}

dev-python/prettytable/prettytable-3.8.0.ebuild

@@ -1,22 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=hatchling
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="https://code.google.com/p/prettytable/"
+HOMEPAGE="https://github.com/jazzband/prettytable"
-SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
-
-python_test() {
-	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
-}

dev-python/pybars3/Manifest

@@ -1,2 +1,2 @@
 DIST pybars3-0.9.7.tar.gz 29203 BLAKE2B 7255a9bf7c2d0e56d90bef95a007a0d6ae9d4bc25dbdfef0a76d7dc3927da01d2ec7e4f597f53e62fd1c540e72718778cb0a5882b20e054b2fbfa9dfc927c82c SHA512 7aff86c0703e3827909f3603d7f35026ee39ce74d9c5ff1beb18a71b0a839c3aa407402f8d9c1aca9eb69af33750db0477881826e72135fc26a7274b0f1f538b
-EBUILD pybars3-0.9.7-r1.ebuild 492 BLAKE2B b0661f34beccfa24b1a5fe2b8cb3bf733b241cf75047faa5cccd0ae2a5f27c81485eca4c8a51a2e6fe1e03cb0f8bb8719bcec3d80febad74346f68ea681d276f SHA512 1c7a421d9800b0d1b3d7919c471b3c2fe9452f2b5e597521bf4367d8611912cb64b61fdb7b40c7e7abc6196e2672c7f25d5e3e1ef583ad1063ef45ab00a55437
+EBUILD pybars3-0.9.7-r1.ebuild 449 BLAKE2B 5d1e5d307a29a10228fac99dd0c5b1af173dad5fa76c8b961b0ad790468b53d5024d434e7e30e158465c1392e8b89892b36f7629aef5ebdb1d8e75d170348c61 SHA512 c5dce3aaad6944d4065e43ff0a9b98053a15863b579f82d006d131cc9257232984a515a1941865a9b51268cd57559670a47a02794b42c3e92cfcb74a8f874e25

dev-python/pybars3/pybars3-0.9.7-r1.ebuild

@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Handlebars.js templating for Python"
 HOMEPAGE="https://github.com/wbond/pybars3#readme"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL"
 SLOT="0"

dev-python/pyhidapi/Manifest

@@ -1,2 +1,2 @@
 DIST pyhidapi-1.0.4.tar.gz 3940 BLAKE2B f2c0f85f83a2720c57d8c819ab3312306dad56e4c95ea2a568d2c157b4876cdc4927c868b093c5aabdab68c8af7a5cc1315a9fcc591c9021ae8cc88026b08e68 SHA512 c159597b27314a3635862c9a7230adb599a9a64ac96e24d7d61d182d9c891c574e7d7f424baddfdeb90742058a300bf9c7bd49512ba4df41f3b94da781b23c84
-EBUILD pyhidapi-1.0.4.ebuild 563 BLAKE2B 678c0e4b8e7ae489cfe27422ee181401fcba9155e261005e68f69a35dee3d92382ad3d1de3e5f995918b46c5b8da8d45ff6acb6293473da02a8bfd1e4ebea675 SHA512 f2ba2ebfcc335ed718e5b3e0911b0b62cab6d5d1eb9dbd0606ddfc754c8cf0e670d04aeaf82cca670420df17ed7e1082e834309043551f0821cb88461e779e94
+EBUILD pyhidapi-1.0.4.ebuild 586 BLAKE2B 2c6dcefa86edb8c8687e8ef9c356818b7342b832f0275f87921cdbae678230f7f9bff275ad16eefd03a27958ec1c68e6a3b3c3423cf11d5b523994c3cbe95d25 SHA512 6e7da99db19eb1f20e0666e69b5f448c690b176e54b7643dce370d60ab2380f345ee345195d0c758e9679a89ce10dd4792d9ae4c0bc9c28500734cfbfaa18932

dev-python/pyhidapi/pyhidapi-1.0.4.ebuild

@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 

dev-python/pymeta3/Manifest

@@ -1,3 +1,2 @@
 DIST pymeta3-0.5.1.tar.gz 29566 BLAKE2B ca508055c7ae23d488bfa8f79874aad104de6f92f9e02c096fd252e1aaae551f30964d2b134918ce7c313c0d5985365cd1c1b4d1886ef8f6fc64fd8266a77ff1 SHA512 3a44661ae550cbb56fb0397af835e3a12ac81243d4a2f1ac3d9d713a3955cb276441e112e7cd75beb7ebd0c4bfa03014ec8b625750dffeec891b5b7802b72575
-EBUILD pymeta3-0.5.1-r1.ebuild 540 BLAKE2B aeb4959d8fbee72fbf243a0479e5e5fc6a23e8e1dfa93b81d496a4dcd69c088179b6431023b848e3439fc05dfdbe30ad663e3a1fbdc75339f1c515964ff1a6ba SHA512 171faff402c00a3bdfe0756f563b80bea7a9506a5ee4f6e8965d1662b5e4c6de74fd06c9e0ac030be8f258f0237358247608ccf2494d9926fb1476cfe8f9e244
+EBUILD pymeta3-0.5.1-r1.ebuild 462 BLAKE2B a8e3509b938afd9e273d177c06257b5230effd8d2f0051d2c0d573f49b22a52c93f6c83686fc09f1d9512ca564e7390dacfb2441ad865957e79145594994f3df SHA512 248fad7683e305c5b4fd8daa677f8cfb21444a116fe92c78330fd0009c39e5a11146ec45ed4cc864f74a3d712f9befd7d14fae6cfbcabafb64c6590342f3f2f8
-EBUILD pymeta3-0.5.1.ebuild 539 BLAKE2B 8aa9c167b46b25f3ddc2c76a770d549a60a382415cb200b62fed6f4e35891ab351362c2bc17fdb4b3624aac5c6041fb72cfa014ab7fbe9032be9b46d85f4b870 SHA512 e6a8d4c4491c6d614e9a68675b31148cc37bde71b2b736fa821cc5d4ef97311d0e4d817bb1c01fe5156a91afef2b9491553e4d29f22d5fe4b795bcf1a4575a02

dev-python/pymeta3/pymeta3-0.5.1-r1.ebuild

@@ -2,18 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
-MY_PN="PyMeta3"
+PYPI_PN="PyMeta3"
-MY_P="${MY_PN}-${PV}"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Pattern-matching language based on OMeta for Python"
 HOMEPAGE="https://github.com/wbond/pymeta3"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE=""
 SLOT="0"
@@ -23,4 +21,4 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PYPI_PN}-${PV}"

dev-python/pymeta3/pymeta3-0.5.1.ebuild

@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_PN="PyMeta3"
-MY_P="${MY_PN}-${PV}"
-
-inherit distutils-r1
-
-DESCRIPTION="Pattern-matching language based on OMeta for Python"
-HOMEPAGE="https://github.com/wbond/pymeta3"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"

dev-python/pynzb/Manifest

@@ -1,3 +1,3 @@
 DIST pynzb-0.1.0.tar.gz 5598 BLAKE2B 1448dc4ddf429e4ec23b6e9c6afd25c4dde70e761a632534a5d6fadf326f86ecf748f7323cb32d7b0970703c9de03ab93d047fde83b83d13bc9d4b188849c7e8 SHA512 c1efb43e56c67652bc12ec555700f134b2bd32546b9dd6c0a28a043db5c8ded5758940121b84541bdb972c7c740357cbc656e233ecfb77787d77727e245b1e72
 EBUILD pynzb-0.1.0-r3.ebuild 472 BLAKE2B bd75a216f190d9b72cfd261921da84eb689b17d8b01a6b9db3b69b1d66b6e31420d5a59a1f22acad5151ba72280c365f5eda6dfece09e27f3c215e6ecc651559 SHA512 6c73e6d5670191d95465107819fdb0a4ad0a5032009639f3e8457ac9938cb6fa3a9f65fc8a8a5b7694cb9cbed1a3bdde360b74b30bf85cc9eca094ed85a4b45e
-EBUILD pynzb-0.1.0-r4.ebuild 465 BLAKE2B 4634af2dfa7f36580a905eb6d7c3fcc1c6d0d53f5a9e9d5262937e1ab5f944545bba74c8186676aa0f21ad635d817b6a4b409b3f240dae3f25b2aa3670dfb5a9 SHA512 3d21d16167c05d03aeaa3885158cf52fd92df6d9ff6a2f650740df0fdc7a6977c2e512933c93d0d5e596a082ee5f74ab68953f239646f0745c87770f325055e2
+EBUILD pynzb-0.1.0-r4.ebuild 418 BLAKE2B 6f8a0ff14e252ef9e500889c0256b601f7b41582225622b92688c5e3ba6acc5844049d115c093dbd3a5554df742d0b1d94b2c8a4b12c0b8ca286c8cb57108f77 SHA512 ac518f5fe3cd6f6faa2119f22264e6a51c76d754176ca7d5687cb1072066eb51c620e0c479a05e4195d9ece1f4e37c4d844a4cf994fb67b04d8e11a8bcecf411

dev-python/pynzb/pynzb-0.1.0-r3.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Unified API for parsing NZB files"
-HOMEPAGE="https://pypi.python.org/pypi/pynzb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""

dev-python/pynzb/pynzb-0.1.0-r4.ebuild

@@ -1,15 +1,14 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Unified API for parsing NZB files"
 HOMEPAGE="https://pypi.python.org/pypi/pynzb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"

dev-python/pystray/Manifest

@@ -1,4 +1,2 @@
-DIST pystray-0.15.0.tar.gz 22184 BLAKE2B 0c14cda53efa1eed5154794dc0ac1aa2197a6d8075cefaac7142fc22b2b97bc6a02ecf744e1dab2d87ec79e1bb3cdd0d45a5da7412d652c5999619c3e4929d11 SHA512 1edd4be9b42e5cd65683cfc016a4bbaf42823fed614f82e14dca4ca4335783fa2cf5b13eab2c41306b1f47d54d61361b825c474745fd36363643dfc2e3eedc05
+DIST pystray-0.19.4.tar.gz 41421 BLAKE2B 0cbd47bd3270da059a0d898a4ee175f3c50cf78d531af16b9acde8a7a01ba801edf56c01cdcad57822ac02f089c74bb06fb5e6e49e8d0ce9bdf2f31aab58aad0 SHA512 b3adeb3c4efa1514a534446037a8d3dac3c1e68eec9d14026ae2840fd606c943af6861e1f8c28b87374b9fc130b1cbd87e9df27051c0ab131df2b71f0824867b
-DIST pystray-0.17.2.tar.gz 24618 BLAKE2B 8576c35d5cef59910d29688357aa37a47c7c508ffbce7451b698afb138cf96b55f1149071d381cad57b6c8931d30a015f28a793bb25a21ddd18480108162189b SHA512 d9527a34956837bd3193d80db0c4bcd2a4fb82025d3e62f339e09ee500101ced87d2cd461672d01ed07b34a6afe3f47a7c2fa9c83155cc78a9d024774dc0e6b9
+EBUILD pystray-0.19.4.ebuild 633 BLAKE2B 5924ca24b62ac78c10faa00960fdabd64e8980800c6ed116226df1c11449385c4edeb9658784fd9aab1feba66f7bedeef552bb2ed453065489cb5a6073382578 SHA512 a995ad60449069931c3150cf1b3206b280fd466f832c2a7750d746fd1a9d6a6011b4da6d718a472a1ce19db01fae7423ef232ad160388a78bebd507427398a90
-EBUILD pystray-0.15.0.ebuild 676 BLAKE2B 2ce2e965681f07d4d583dfb12dba6479399e4373adec94e3feb2a9d449def41501c620f079d61ddf28fa049fe2bbfb349466c7c0f7e696e6f3ceed3f1bfa565b SHA512 a77ddd86ac5764dbb49de50340f9c30e3a10255b42fb54059a8f12569cca7082900fff9afa1062cb53ca375cdf789a68d7f4113cffdab037600d0d4273ed4a05
-EBUILD pystray-0.17.2.ebuild 708 BLAKE2B 9f7825dcfa8e2555a210564a407e28c82fecaad5934a4eb1dd2d8a5b0360e8fcedc1ab2534b474bb71307fdb809060174630727e098eb863efe926418da911f3 SHA512 7d9de1bbd9151cb17efc7c04e36c1c61548c7aa05cba932c93ab4681207459daac3bf5543088a3ed87b5588e61aec591fd6ddc7f8fa1152db9d1545628b92c40

dev-python/pystray/pystray-0.17.2.ebuild

@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-ISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="Python library to create a system tray icon"
-HOMEPAGE="https://pythonhosted.org/pystray/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-
-RDEPEND="
-	dev-python/pillow
-	>=dev-python/python-xlib-0.17
-	dev-python/six
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1
-"

dev-python/pystray/pystray-0.19.4.ebuild

@@ -2,17 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy )
+inherit distutils-r1 pypi
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
 
 DESCRIPTION="Python library to create a system tray icon"
 HOMEPAGE="https://pythonhosted.org/pystray/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"

dev-python/pytest-benchmark/Manifest

@@ -1,3 +1,3 @@
-DIST pytest-benchmark-3.4.1.tar.gz 340349 BLAKE2B 474743ef6c2d098ca6451e6da1a40686a529af901bf40ba8daf900844166895c676e3a95e8c252557d97d6668e077f625f96c90c00cdb4a1de021a5e5abae479 SHA512 630b27462796aea97c2d878bb936009d59e1c33be3f4219113eae5e389d2cd7912a7f7bc10a1a9a7abbfc4f69213be10a3cc68bbdceef0783f4b0a8a13600119
+DIST pytest-benchmark-4.0.0.tar.gz 334641 BLAKE2B 56a193820c177f220ac91e7af7f618501ffb1899d85e03685cd447ed5d282d51fee02d50a7c0f74759ebb26df6d263d0220c6debf87b3ce9ddc0bff73db06b85 SHA512 e5b8ae4459d1236ec32e09fb6e95e63c4b46e575348e701dc26b3362c445c2e00cf2994aa4dcf69aa39ee2bd73740bbe89bd012e3730584ddbdec3f41499cef3
-EBUILD pytest-benchmark-3.4.1.ebuild 684 BLAKE2B 6c518e72c904aa3e0c88b270257728e08a63ffe0b685c2803d0939d8251621960433b50c341f6b943aa7c611a3809a85ddfae89081d30f1d8e737ec360f0381e SHA512 40c613af23ff727550ff387924975d032f538eb4df0f2926be53bbb9f73b368399edaa96e50bf94da10e93c6a44df103ffa31eff69e729fcde25b2233a1c3a84
+EBUILD pytest-benchmark-4.0.0.ebuild 733 BLAKE2B b356e036cd10df2e17f306ce20b1d6a563201d09d985b13d328c4798c581a21e114753f266fc6b2f0eedc6eb5399797bccff67ee98c013ff7e26b4d478529065 SHA512 566ec6b124cb1bbdda92a8d1c3e3e26b685fb22ee04e973ef2a2fe11dc983b384c592d50ad216a655fc0450e7de91f0d9b1e465ee64dde327645c1e840e67148
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604

dev-python/pytest-benchmark/pytest-benchmark-4.0.0.ebuild

@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 pypy3 )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="py.test fixture for benchmarking code."
 HOMEPAGE="https://pypi.org/project/pytest-benchmark/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize)"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,3 +29,5 @@ BDEPEND="
 		dev-python/tox[${PYTHON_USEDEP}]
 	)
 "
+
+S="${WORKDIR}/${P}"

dev-python/pytest-pep8/Manifest

@@ -1,3 +1,3 @@
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6.ebuild 500 BLAKE2B d453315fbd12fe4d0cc40c1d0c370215af37530816563d7432acc00d138551db86b849e0abefb41dd4878c0fa3ff17ce8a69404541ad95d94918886ff35801cc SHA512 470416a5cabaf00b83743a1778b2953de34a399e788480d18ec54e4cee5f2502d4804eec7f7451291532048c4ad46e333a2efbaf382abf6193e6b399e4436f65
+EBUILD pytest-pep8-1.0.6.ebuild 549 BLAKE2B 5d5f27d7840013535bc2b0f1390b5652c6f86d32d28fa181b9540c7c6ddf3a9653937afcb22d0c866a607a3251a95407cce04ab91b978c942b5a2373626f8967 SHA512 441005d1e1b62b19b35766eb948a280b5808a238fbdaad1c8cdb3931985c29f22f240659a564f82c965bb4bd29658519428f05000d4b6baec9dcbf91b292cd80
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604

dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild

@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 pypy3 )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="py.test plugin to check PEP8 requirements"
 HOMEPAGE="https://pypi.org/project/pytest-pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize)"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,3 +20,5 @@ IUSE=""
 RDEPEND="
 	>=dev-python/pytest-3.8[${PYTHON_USEDEP}]
 "
+
+S="${WORKDIR}/${P}"

dev-python/pytest-runner/Manifest

@@ -1,4 +1,3 @@
-DIST pytest-runner-5.3.1.tar.gz 16262 BLAKE2B 2531bec32afb29a63253289f30880a7f6e74f0dc8626518c17326b74615697a8f7ef3075077a5da61c235e71ffed7aca9bdd64e3722d9381ecbdc66bc4fcbeed SHA512 7104ea8d714cc48fd69cbaedab5e71553889d1bc58b61bbb0d80a1de1cd9002eca2e05d6bc726c984ed4e4c4a276a757153164058295d445e458d763a888bcb6
+DIST pytest-runner-6.0.0.tar.gz 11962 BLAKE2B 122a59bf1577b5dd7aaa483c1eb7aa9989508dd4c8bd7fb5e6f5bcc9e6de87d01715f38050fb9f6f4e262db5f4313043abd8f5d092c4bda75708a26e9092300d SHA512 8628f4b2ef24a1bcd3294efcfad289cb96949b0b1176e64b2033b8767c5fd217acdf763a3cdb137af6043e0dacd64a76d0a104674dc88464fbb473df37d24c61
-EBUILD pytest-runner-5.3.1-r1.ebuild 525 BLAKE2B cd928d48542a19d47b3f6fb83ef04dfb8ff3b85b4164fe7ad7b97447e00276b3d68e27b0b319e2e25ee5dd42cf4e1b623123fdcc980b0b087de7e6448c5fb103 SHA512 6bcff63e6fe623398c06eab969741c1326502cb8e4ef5ac55d7a39f02cf2889d336f815220c17aaaffee842ca40d7ae92bb87ce4e7641885687935bc6827fcb6
+EBUILD pytest-runner-6.0.0.ebuild 614 BLAKE2B d9216fe5f65333620238b83aab127026d69ad925eb45ed25db6721c61e506beea8f7991df7168be41758ffa5d520a72acf291f70f40a8e2c184b47169cbae52b SHA512 8f2a6cfb851f5855b2cf40b6c79ce11ea4e9301572cff4eaeacbe03dd33b62bdb3ef86cd79f9b299ffefbabb688caf4ac3d15be5ca523ab22cb04d66d054de77
-EBUILD pytest-runner-5.3.1.ebuild 520 BLAKE2B 1ca8efa706340c3272e3f4107739f44ece76707fa9451ee31db37627ea5cc2a6966a77522514526798eb6d3c95b057a0f2f0f7ae3ce453c701a94509f97e4b82 SHA512 53ec1afe4491df322a41976ce20a82d228f1d8faf902401dec03cd17bdfa097c258785279feffcd62cb7f58d44f12e0933fca7eb3631ce706f59b5bcc66e3c08
 MISC metadata.xml 412 BLAKE2B 0d79131c6fd8adf72493a7c333959e065cf4f2231f6c770800b6d05ff9afcc246cd202406bea6e28f6b0fd23ee6197aa8dac2dd59d0a89d9b07741f57e8fa5e8 SHA512 d1aab9ea8042bf810398a4195fd3595a8abbeb060ab38fd7b7e40085c8d5f22ecb78bab02e2331d4588199d88e0d3848413d75a18fe4373ecd9940a3c990c604

dev-python/pytest-runner/pytest-runner-5.3.1-r1.ebuild

@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Invoke py.test as distutils command with dependency resolution"
-HOMEPAGE="https://pypi.org/project/pytest-runner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"

dev-python/pytest-runner/pytest-runner-6.0.0.ebuild

@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 pypy3 )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Invoke py.test as distutils command with dependency resolution"
 HOMEPAGE="https://pypi.org/project/pytest-runner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="$(pypi_sdist_url --no-normalize)"
 
 LICENSE="MIT"
 SLOT="0"
@@ -19,3 +20,7 @@ IUSE=""
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+S="${WORKDIR}/${P}"

dev-python/solidpython/Manifest

@@ -1,6 +1,2 @@
-DIST solidpython-1.0.2.tar.gz 67607 BLAKE2B 273bcf188d141d91d83be440e78346aa9b3f955ba8134e6a11d5707829218bbb27ffcdf4e8e86a093249908df4a16ac0d878fe6ed31790b5772340533e48796d SHA512 eeb7c68e54055fcfd5b53cf9c2745ea4dac602dbce158c8c7559dde21372c87cacbcac9c203cf0b577bd292a59304d48e8a4c7afcf9afdd9cc6c6cf0286e1d09
-DIST solidpython-1.1.2.tar.gz 87366 BLAKE2B 6556c7b5095d9f8d9e75851dbf0dd58c1dd6b406f4a33a5ed7e6112f9d290d7d14dd5074f85caad1ac773af3939bdaa0f3fb1307b1c44b231a20c589f016a038 SHA512 b66b530fc1abc9c8c3044ad0bb74f7dab2932c77e6374a1e46573f934c2d59af9c24dae86e54201dec7ebae4d3e0dbfa2c2733fa18394a9ce87d5fd562544dc0
 DIST solidpython-1.1.3.tar.gz 2571639 BLAKE2B 56c2af3cd6357c63059707b71b1571f677593fde3e4bbf76dae8e0ef480dbfbf646110b78e5fa45922e834e2e9b00a363415a848b639aca0abfac3d2b448e918 SHA512 09f00ad53df499b6f6a0aa2cc53fbd09fc110135ec5f2607f2c7cf245eecbe0da09306b33ca4e13b2298ee3ab84076872a97eecfff247fad6c11fbaa522233f9
-EBUILD solidpython-1.0.2.ebuild 814 BLAKE2B a3b6c347beb01bd9eac3bd5889f62766eb451ab44f8bde0b7f835c0338df84a95cb5f3b3de44007e1ab85b26d4c9d9b22bd1acbf11fbd1f0f6a21e70e7bb20da SHA512 50680105f606331d50477958ef0d7e2bdd25224fb66f5c9f22e026d4a5d644f82e622be4e5416686de42d03e3e81992347b1ff80612e10a8148aeefba43e6b2b
+EBUILD solidpython-1.1.3.ebuild 776 BLAKE2B afe52e0df55def3d14befa46021e85276cf2045575c862ed03658ea13a705b2940f61aa049bd786adfcb424e57378253598b97fb4bd1fdec7be20499667fc37b SHA512 37878f60e712d25de730414fe333af63c2beb4bf485132f8e0ea631b896e166ae8f3085bda1999abdc5006453f9d7bf838917921452d0dc88cf32111854d1d74
-EBUILD solidpython-1.1.2.ebuild 855 BLAKE2B 65b20fa63b46ab2b5cc53756e2f513e38623e1f4b9925dd679d646b0276e295ad417bd62a728124a136665399dc3912e230fc72423ab94770e60b1176cd7e246 SHA512 ad50cfaf3f57d7caeb2a11cd05c9da35469095131434286aeabbd76d822a9637998668994dbd2dde2ab8aa76dbf7621157a11daec76042b963770c1de67cfac6
-EBUILD solidpython-1.1.3.ebuild 856 BLAKE2B 912af83bc0cc6532261f975bed25312a7a92a87e5a14875a8c9c581209edd1bdaf1165b9d043c8b941a12a12e27ed1fbf3401127d3e02ae73ea3545ff7cdc44a SHA512 19165ea67c2b1c61101ca597c521fca863b774c24742ef000e1f476430417d75b0434d6a4d13febda11763ff4c2f8566e179788ae98d005a0333e9ad8f58079d

dev-python/solidpython/solidpython-1.0.2.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="OpenSCAD for Python"
-HOMEPAGE="https://github.com/SolidCode/SolidPython"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/euclid3-0.01[${PYTHON_USEDEP}]
-	>=dev-python/pypng-0.0.19[${PYTHON_USEDEP}]
-	~dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/regex-2019.4[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Sanitize dependency versions
-	sed -e "s/,<0.2.0//" \
-		-e "s/,<0.0.20//" \
-		-e "s/,<2020.0//" \
-		-i "${S}"/setup.py || die "sed failed"
-
-	default
-}

dev-python/solidpython/solidpython-1.1.2.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="OpenSCAD for Python"
-HOMEPAGE="https://github.com/SolidCode/SolidPython"
-KEYWORDS="~amd64 ~x86"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/euclid3-0.01[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
-	>=dev-python/pypng-0.0.19[${PYTHON_USEDEP}]
-	~dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/regex-2019.4[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Sanitize dependency versions
-	sed -e "s/,<0.2.0//" \
-		-e "s/,<0.0.20//" \
-		-e "s/,<2020.0//" \
-		-i "${S}"/setup.py || die "sed failed"
-
-	default
-}

dev-python/solidpython/solidpython-1.1.3.ebuild

@@ -2,16 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="OpenSCAD for Python"
 HOMEPAGE="https://github.com/SolidCode/SolidPython"
 KEYWORDS="~amd64 ~x86"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL"
 SLOT="0"
@@ -21,7 +19,7 @@ IUSE=""
 RDEPEND=">=dev-python/euclid3-0.01[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
 	>=dev-python/pypng-0.0.19[${PYTHON_USEDEP}]
-	~dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	~dev-python/prettytable-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/regex-2019.4[${PYTHON_USEDEP}]
 "
 

media-gfx/inkscape-silhouette/Manifest

@@ -1,2 +1,2 @@
 AUX inkscape-silhouette-cleanup.patch 1082 BLAKE2B 6d039b79b149468d1b6a677eb5f255bafddc66780c87b24bb53e03c3cdad84a1a7fdb06b892e573f546f43c100aeeb55588a14d54c052849f953c7be193ac471 SHA512 660aadf376f124a1b2f1f3daf24db9b3a998e565f92208e713de7f888601ed852080812120b8c3098dd1d955778d6cf4ba050d8d3254764503d5177026ab3660
-EBUILD inkscape-silhouette-9999.ebuild 994 BLAKE2B b5d0187e159db11a34cdaa50fe00aa57e2ac2dd9d6ffd80a8231a1852155dd9b1872a1d97cf3aefc4489e593b85a5785fd96019a57e97ea0dfaa243ca56422ed SHA512 fdb3d22ec0de6a2a8a69e08367cbf7dd5f6296012ace98a7a08996da3a5984ff0b1032991242311816a251b9c1c395c57820c6e0fa143a6b4f7e31523cf9ec9c
+EBUILD inkscape-silhouette-9999.ebuild 1015 BLAKE2B 7fa7c8b4bcb52ae8b6fc443d92f0d0e4c8461b47cf325881f7da1e77ed7fb87350dad9518233ac1556db8d791a5963896a4d2c3cbe172d9679c646a1fec6572f SHA512 dc76c0e94cf7582146bc04a4eb60c725ac3753475edc038f296c67808613ad12155bfd5be4b3d5aaaf33dcc232ca4924e1157e05bf9ce82012159bfa9903ae95

media-gfx/inkscape-silhouette/inkscape-silhouette-9999.ebuild

@@ -3,8 +3,10 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
-inherit python-single-r1 udev
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 udev
 
 DESCRIPTION="Drive Silhouette vinyl cutters from within inkscape."
 HOMEPAGE="https://github.com/fablabnbg/inkscape-silhouette"

sci-electronics/ampy/Manifest

@@ -1,2 +1,2 @@
 AUX ampy 207 BLAKE2B 3aceb69f428fe0b54ddf695c9eb4c2510aace96308c6dafac68525e2d1d5c34c67356234d5972114676d912e402569a0d0bce61ddd2206549b207860186f7ed4 SHA512 e3ccdf1bdbf27df31b91ba1d08b2072b3b3d4f2a3614182f5a162ef03b38305aef2654ba51b97775a8c840504f9538907f6c17932e07973a4f097e29f355c20c
-EBUILD ampy-9999.ebuild 1096 BLAKE2B 83de215272429bcfe29a049a0f5e7d9b2d0acf71229580263bf39af990f78cd02c9d82df06480eb7eac8564fd9491a60778c60e91bb3094dffae2b95c2aed8f1 SHA512 ff605484170eb972d3b91c8fe56619fb6fde580c0c510b89301f1828feea0d07be168aa72bf076913692916d9679fa827e16c5c421f1f333db772b75eaf4c291
+EBUILD ampy-9999.ebuild 1080 BLAKE2B 917202eabf7ce42b3a3d93ac6bdc66b99db9ef9abd080aca50b1205260ebb6803112d85a9bc5353905a43ec92712da3157b948afce7f4e1ed3b7df0baa655c78 SHA512 848b8022b11dec4a2920b1e4afab2590a3864ee7627c7addf0275b8399de978d0346735dc83ce936e27bf3c7e6828633a6f2e5fe83a8efffe467bc63a730d6df

sci-electronics/ampy/ampy-9999.ebuild

@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1
+inherit distutils-r1
 
 DESCRIPTION="MicroPython Tool - Utility to interact with a MicroPython board over a serial connection."
 HOMEPAGE="https://github.com/scientifichackers/ampy"
@@ -14,13 +15,14 @@ if [[ ${PV} == "9999" ]] ; then
         KEYWORDS=""
         inherit git-r3
 else
+	inherit pypi
         KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test" 
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

sci-electronics/flatcam/Manifest

@@ -1 +1 @@
-EBUILD flatcam-9999.ebuild 3328 BLAKE2B 6c39c6209ee691e2108b78a3eb19c590530b4470cd437b04056c36e0cf83c3b9ddedf1300ebb4c5538cc2932f2b2ab988d84a4205d6d80604fd2371d22a7c914 SHA512 af27192565207b5feb5441bb77b18701bb55473c640e0a3c3732fe881cdc2319c157ff9d5d495ddb9adddb9b2ca814a570aad51c5bc4bed595342e73037181d7
+EBUILD flatcam-9999.ebuild 3291 BLAKE2B a73820408377f96d00e45035e3e58c80db0894dbc416889c5f043278032207017f8f163c217fbf944e3f7db111d7c33ee439b142581282570acbe956d7d2a0a2 SHA512 6b52ce03c489d4b5f8a87d86c67767f803222220d4f18a14fc35f394903ad1294a647e7b4f77158e77b79d8cb2a11c721cd432025228fbc18db579957c1eeeaa

sci-electronics/flatcam/flatcam-9999.ebuild

@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=7
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit python-single-r1 gnome2
+inherit distutils-r1 gnome2
 
 DESCRIPTION="Free and Open-source PCB CAM.."
 HOMEPAGE="http://flatcam.org"
 
 if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
+	SRC_URI=""
 	EGIT_REPO_URI="https://bitbucket.org/jpcgt/${PN}.git"
 	EGIT_BRANCH="Beta"
-	KEYWORDS=""
+	inherit git-r3
-	SRC_URI=""
 else
 	SRC_URI="https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM-${PV}.zip -> ${P}.zip"
 	KEYWORDS="amd64 x86"
@@ -29,7 +29,8 @@ IUSE="+doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/or-tools[${PYTHON_SINGLE_USEDEP}]
+	dev-lang/tk
+	sci-libs/or-tools[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 	dev-python/cycler[${PYTHON_USEDEP}]
 	dev-python/dill[${PYTHON_USEDEP}]
@@ -38,8 +39,8 @@ RDEPEND="
 	dev-python/freetype-py[${PYTHON_USEDEP}]
 	dev-python/kiwisolver[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-1.3.1[${PYTHON_USEDEP},qt5]
+	dev-python/matplotlib[${PYTHON_USEDEP},qt5]
-	>=dev-python/numpy-1.8[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP},opengl,testlib]
 	dev-python/pyserial[${PYTHON_USEDEP}]
@@ -47,8 +48,7 @@ RDEPEND="
 	dev-python/qrcode[${PYTHON_USEDEP}]
 	dev-python/rasterio[${PYTHON_USEDEP}]
 	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.3[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/svg-path[${PYTHON_USEDEP}]
 	dev-python/svglib[${PYTHON_USEDEP}]

sci-electronics/kicad-footprints/Manifest

@@ -1,3 +0,0 @@
-DIST kicad-footprints-6.0.1.tar.gz 31372634 BLAKE2B 5cb451a9a69c926af1aa8e0b180a244b8e195a450c83c960d62125d3bfc35d6a8c0a07e1a54c207fe851198b83bbdc7e3a26d06bdd92afbb1637733898661159 SHA512 dbe8689a0f32a9b448c7aa37c673736d97163f8e3f23b1e5119a732926cfd635aaa7927f0bf77327ab824353fe431523ca10f4035a37ca4fa364c8a7e2e2805d
-EBUILD kicad-footprints-6.0.1.ebuild 862 BLAKE2B 2baa7e57061f5c3c0b9a28987d2c2c44a238d2f5a09343b7e3b283149523a264bb4c8f0974455713836ee147ff0083a04ebcfcec92e02c3334964ea294bc0cee SHA512 896c3f6c3df813454e9c01a4876e7561c8989d63a9a0a6eb2771a72ab2538aa0bd977e80ac3a757e17a95fde6fc7aa6111497be89b1a463c64065cea3199e5fd
-MISC metadata.xml 766 BLAKE2B cba91a16d3b205f5f36dff3aba3afad956d98d23ac08ecb26bf3ef5471e5fdb7698c86cc1e245a34069f73a052eebdd37594941194b7f3f5d9c57a88718d7de0 SHA512 8d24ac5ad64aec5939be1244e417c2299353d6d618bea63ef949f6c82a865cee98ab11a3dd8c57e447e13203abc3a40da7070f585379c1ec54b0bd46c214d0ec

sci-electronics/kicad-footprints/kicad-footprints-6.0.1.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
-HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
-	fi
-
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.99"
-
-if [[ ${PV} == 9999 ]] ; then
-#	 x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi

sci-electronics/kicad-footprints/metadata.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The KiCad footprint libraries are the individual .pretty directories.
-		Each .pretty directory contains multiple .kicad_mod footprint files.
-		These footprints are best used in combination with the official symbol
-		libs and 3d model libs.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kicad/kicad-footprints</remote-id>
-	</upstream>
-</pkgmetadata>

sci-electronics/kicad-meta/Manifest

@@ -1,2 +0,0 @@
-EBUILD kicad-meta-6.0.1.ebuild 610 BLAKE2B 076a001c4e2f7293d3cb459ce663b699404aabbc44ff646e3b65d2c65ee4660e19142fad23bfe7a18d3aef5c84f1834b92a7f421eba07078219ed8bebb4529cf SHA512 4331dc1c86b91e8a2f77d04bca014d88375a88d1c48367892553f3997ec16d357073adf6a5d98296b8e53380e25e5949891852fb7571b12cee9f4b0e48083de8
-MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6

sci-electronics/kicad-meta/kicad-meta-6.0.1.ebuild

@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
-HOMEPAGE="http://www.kicad.org"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-IUSE="doc minimal"
-
-RDEPEND="
-	>=sci-electronics/kicad-${PV}
-	>=sci-electronics/kicad-symbols-${PV}
-	>=sci-electronics/kicad-footprints-${PV}
-	doc? (
-		>=app-doc/kicad-doc-${PV}
-	)
-	!minimal? (
-		>=sci-electronics/kicad-packages3d-${PV}
-		>=sci-electronics/kicad-templates-${PV}
-	)
-"

sci-electronics/kicad-meta/metadata.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">KiCad/kicad</remote-id>
-		<remote-id type="launchpad">kicad</remote-id>
-	</upstream>
-	<use>
-		<flag name="minimal">Do not install extra data like 3D packages and templates.</flag>
-	</use>
-</pkgmetadata>

sci-electronics/kicad-packages3d/Manifest

@@ -1,3 +0,0 @@
-DIST kicad-packages3d-6.0.1.tar.gz 943455043 BLAKE2B 7d26b3f6eb9fe279343d9c43dfff875ba2f56b56ff1fe868a07fa43f9abe476f7b6c8e3e9122adf2bf5546b571f45573926055452bac9b5dc03618dd8ace245a SHA512 326ad5d3b4fea482921af2f69b21e7f36ad462632804c24c160b824e722d79050a2e7d81b499fad09c7e03381026a9d3d292a85ace79d7a7cc3a976454e8bb83
-EBUILD kicad-packages3d-6.0.1.ebuild 948 BLAKE2B 90380078eef843bfed59123c7754e2c56eb2d3f989a37cf3230d7654fe3d03157c5f1a1e1f91fa3f45027db4301055ca5fbcd6b0e4fb57117c724ec9a62619e3 SHA512 4bb464d7543c1c5e8c3770014361383b84d504f8b26056cd5ec1744098ce90a524d773585f9e9f92242f36aba9262138352657d35c3f6254deace34c29d2026b
-MISC metadata.xml 976 BLAKE2B 70851f4db73dbf597cb669018fe27e4e1507cf4e86fa82488751a27fbdb8e85eb13d81ec42d62685c459a8c56cb1899579430132bc9ae4c0c0c2fdcb756bae1b SHA512 1e6512afe9ff98ee23c33bb339e1b6ad4b9da8d2bdf6ea52f40874ab77e4918aa565a550c384ecdc693a2f7b366cd07d4c5abae52dfc6177cf9262ad1a01d7b4

sci-electronics/kicad-packages3d/kicad-packages3d-6.0.1.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
-HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
-	fi
-
-	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-530926da52f5226de6fc3167cf2e0671fb7f0cec"
-fi
-
-IUSE="+occ"
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-
-RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND=">=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="11G"

sci-electronics/kicad-packages3d/metadata.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The KiCad 3D model libraries are the individual .3dshapes directories.
-		These 3d models are best used in combination with the official footprint
-		libs. Each directory directory contains multiple 3D model files, with
-		the following supported file formats: WRL, STEP.
-	</longdescription>
-	<use>
-		<flag name="occ">
-			Use <pkg>sci-libs/opencascade</pkg> for data exchange
-		</flag>
-		<flag name="oce">
-			Use <pkg>sci-libs/oce</pkg> for data exchange
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">kicad/kicad-packages3d</remote-id>
-	</upstream>
-</pkgmetadata>

sci-electronics/kicad-symbols/Manifest

@@ -1,3 +0,0 @@
-DIST kicad-symbols-6.0.1.tar.gz 4809762 BLAKE2B 8133932edf7f480ea61c98838e0c7b0ed32c79ef8cc89d385192c7cd137bcfabdb9a4ed28cc10b2006dfc37729b070d286a5b29b94108da487c797fef1605b20 SHA512 0f62118118adff693bb127d229232cfeeb88f48d3d818d44c3d9d8d1db89de903587ed8cc9081914eec8233650dd0bac6dd5d4618b4417bdf06955ebd1b8923c
-EBUILD kicad-symbols-6.0.1.ebuild 853 BLAKE2B 3dc1b33c750bf72c8d4cc4a3b74a343896821b2550c7f62da393780d76bf7cb9c58d2d77329af800e2831cc04219959a3a867e2346ebd21b205292ee3f74a427 SHA512 e2aae5d0b1deba924b15ec05b29c487f7b8afd50f69c33deaa0f5c484feedbda5a12f150e8224cea28cfc2dfcd7ec77c0e95f8b8919ba9af08dbb7d10a1542ef
-MISC metadata.xml 724 BLAKE2B 10eccd33b4ca07e25e2b3ce44d30583671b33836f7fb7a9c68b063bb267529fb0e2988b71bc57d0d92967f583ae3ac4e0cdf0762da687a834f51620f45df5411 SHA512 76569f2955cf1db93bbac820d513aa4d58f4bf27089736a9adc98e1df4d21c0c80be6c894dc2eb024b2cb0271e37a479b15ce68d377bd028df2becf5166958a2

sci-electronics/kicad-symbols/kicad-symbols-6.0.1.ebuild

@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
-HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
-	fi
-
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sci-electronics/kicad-5.99"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi

sci-electronics/kicad-symbols/metadata.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The KiCad symbol libraries are the individual .lib files, with the
-		corresponding .dcm files containing symbol metadata. These symbols are
-		best used in combination with the official footprint libs.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">kicad/kicad-symbols</remote-id>
-	</upstream>
-</pkgmetadata>

sci-electronics/kicad-templates/Manifest

@@ -1,3 +0,0 @@
-DIST kicad-templates-6.0.1.tar.gz 2248692 BLAKE2B fa9f1667958f25f965e1f41b50b009724b8b46960b55561048aca74f876196ac896ee72294f32ad815f7d7097dd4caba2a4fe8c5f6731e0e13322c48cf6df1a0 SHA512 ee0423949e63a17634c0abe3eb5184d16650cf702f37fa2f10af8f0e9377d4031b0b213cb8570af63d8ff8d5549f0b6f153287db9d8f64140273134ee2650a60
-EBUILD kicad-templates-6.0.1.ebuild 690 BLAKE2B a91c08077e54223fdf646bb8a28ef168da5d7df0525ebb23a2f527f5d1c94b292679cde75de8476f917e2279eaaf1b21246126ff072e3a08cda4a70c853e1bfe SHA512 9f6be9016a944498a8e8302bbb2e610f14c255f399b58564b68e04faf6f3d758823063d5b4c6400a8aac612768ba006657225b0f27d0abe30a5aebe2ea908e45
-MISC metadata.xml 484 BLAKE2B 3542f585439e05e86fc86e11f524c15f10f835fe5419141b6361ae4503dc6dff5d0c9d7bb24134c3722e4ab11d6cad6d450625f7e5edc822b3d0ee82fd8bde48 SHA512 03468e0fa2d56c7241219eb07b1cddc225b5e18f6800a513005f76cd19110b4ad9d8f9b2895107695b6c62c8f276b38bbf544a7651b61f3e83878c94a40b8886

sci-electronics/kicad-templates/kicad-templates-6.0.1.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Electronic Schematic and PCB design tools project templates"
-HOMEPAGE="https://github.com/kicad/kicad-templates"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
-	fi
-
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-
-RDEPEND=">=sci-electronics/kicad-5.99"

sci-electronics/kicad-templates/metadata.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">kicad/kicad-templates</remote-id>
-	</upstream>
-</pkgmetadata>

sci-electronics/kicad/Manifest

@@ -1,3 +0,0 @@
-DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d
-EBUILD kicad-6.0.1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
-MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5

sci-electronics/kicad/kicad-6.0.1.ebuild

@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad.org"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
-	inherit git-r3
-else
-	MY_PV="${PV/_rc/-rc}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~x86"
-	fi
-fi
-
-# BSD for bundled pybind
-LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
-SLOT="0"
-IUSE="doc examples +ngspice openmp +occ +pcm"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Contains bundled pybind but it's patched for wx
-# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
-COMMON_DEPEND="
-	!sci-electronics/kicad-i18n
-	>=dev-libs/boost-1.61:=[context,nls]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	ngspice? (
-		>sci-electronics/ngspice-27[shared]
-	)
-	occ? (
-		>=sci-libs/opencascade-7.3.0:=
-	)
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND=">=dev-lang/swig-3.0
-	doc? ( app-doc/doxygen )"
-
-if [[ ${PV} == 9999 ]] ; then
-	# x11-misc-util/macros only required on live ebuilds
-	BDEPEND+=" >=x11-misc/util-macros-1.18"
-fi
-
-CHECKREQS_DISK_BUILD="800M"
-CAS_VERSION=7.5.3
-
-pkg_setup() {
-	use openmp && tc-check-openmp
-
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}"
-
-		-DKICAD_SCRIPTING_WXPYTHON=ON
-
-		# Merged from separate -i18n package, bug #830274
-		-DKICAD_BUILD_I18N=ON
-		-DKICAD_I18N_UNIX_STRICT_PATH=ON
-
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_PCM="$(usex pcm)"
-
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-		-DCMAKE_SKIP_RPATH="ON"
-	)
-
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doxygen-docs
-	fi
-}
-
-src_test() {
-	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
-	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
-
-	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
-	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}

sci-electronics/kicad/metadata.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="github">Add github support into PCB editor</flag>
-		<flag name="ngspice">Enable circuit simulation</flag>
-		<flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
-		<flag name="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
-		<flag name="python">Enable python scripting support</flag>
-		<flag name="pcm">Enable plugin content manager</flag>
-	</use>
-	<longdescription>
-		Kicad is an open source (GPL) software for the creation of electronic
-		schematic diagrams and printed circuit board artwork.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">KiCad/kicad-i18n</remote-id>
-		<remote-id type="launchpad">kicad</remote-id>
-	</upstream>
-</pkgmetadata>

sci-libs/or-tools/Manifest

@@ -0,0 +1,4 @@
+AUX Support-for-USE_PDLP-C-23-and-Werror-changes.patch 22055 BLAKE2B f861b9b7237df40dfae4cfac4adfcffb79a3a4a3fae4daf5b32304e1d3a69b836cd81a7f6307910281bd0363d4f40057e6f75f27f408e0250e829b101ea74ad9 SHA512 aabc3aed65d182159d016f38ec6156476b7cb7e6a48bf939df6a0d6d15f1efa6068827834a2b86a06c3cc2043426c80d4d5dd90fcae946704d744c06b91e2a31
+DIST or-tools-9.6.tar.gz 19252960 BLAKE2B 1c4a523db01d4d2675b4078b4c20557428ca1bd3aaad543026141ebbdb34a12ba9d38a6d2a483c6c384ea302f9760a13cad46c93960572ad12f94e6b2cf860a0 SHA512 c29d59fd170fecb72d5980df353d7bc4ef4210bea8f21cda4cf60d8a51e27104cc36a825a519fe5f2af7970f17410c920b7e7632e9c25185abfd91930a23b525
+EBUILD or-tools-9.6-r1.ebuild 1805 BLAKE2B bf03426ecae53e4c0c6efcf03d2e937bfd7d58dba30c3c86b5a367a1dd1d98b4414101c9ab859c119b1fae58904efc2eb141ba4a010793641102170dcdf9cc3a SHA512 f7dde8823545a384d0377362bdfd0ed6cc7d45bd15137b9360b1262e427bc6a0afd3a7955fb036f099cba84bf77e368995d360df504ba23a40857362c83bc18b
+EBUILD or-tools-9.6.ebuild 2220 BLAKE2B 0968b6601eefc33f3a0c9aa5d7c9f398ce316c7bf2c529b4f2318f62ae3dae6790ce82950541483faa8db5e297e58d7faabd5b8e276b7c25e37332001b8ecce7 SHA512 22e91ffe1c5b981af1f3092754817b4f9811fa47a0457c8f445b6ef9cd8e19d7c8f95a9c043db6b59ac009903222c6847bb16f70e8aa8c7922649aa740dd778b

sci-libs/or-tools/files/Support-for-USE_PDLP-C-23-and-Werror-changes.patch

@@ -0,0 +1,538 @@
+From e401b3e7cda8047ba7c29fa85acd8cf2d63064e8 Mon Sep 17 00:00:00 2001
+From: Amit Prakash Ambasta <amit.prakash.ambasta@gmail.com>
+Date: Fri, 9 Jun 2023 17:32:29 +0530
+Subject: [PATCH] Support for USE_PDLP, C++23 and Werror changes
+
+Signed-off-by: Amit Prakash Ambasta <amit.prakash.ambasta@gmail.com>
+---
+ CMakeLists.txt                                |  5 +--
+ cmake/cpp.cmake                               |  2 +-
+ ortools/base/file.cc                          |  5 ++-
+ .../routing_lp_scheduling.cc                  |  1 +
+ ortools/constraint_solver/search.cc           |  5 +--
+ ortools/glop/initial_basis.cc                 |  4 +++
+ ortools/glop/primal_edge_norms.cc             |  1 +
+ ortools/graph/iterators.h                     | 17 +++++++--
+ ortools/linear_solver/linear_solver.cc        |  4 +++
+ ortools/linear_solver/pdlp_interface.cc       |  3 ++
+ .../proto_solver/pdlp_proto_solver.cc         |  3 ++
+ .../proto_solver/pdlp_proto_solver.h          |  3 ++
+ ortools/linear_solver/solve.cc                |  5 +--
+ ortools/lp_data/mps_reader.cc                 | 36 +++++++++----------
+ ortools/lp_data/mps_reader.h                  | 12 +++----
+ ortools/pdlp/iteration_stats.h                |  4 +++
+ ortools/pdlp/primal_dual_hybrid_gradient.h    |  3 ++
+ ortools/pdlp/quadratic_program.h              |  3 ++
+ ortools/sat/cp_model_utils.cc                 |  1 +
+ ortools/sat/linear_programming_constraint.cc  |  3 +-
+ 20 files changed, 82 insertions(+), 38 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07bcaccc0b..aec8fc79d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,10 +28,11 @@ message(STATUS "${PROJECT_NAME} version: ${PROJECT_VERSION}")
+ if(MSVC)
+   set(CMAKE_CXX_STANDARD 20)
+ else()
+-  set(CMAKE_CXX_STANDARD 17)
++  set(CMAKE_CXX_STANDARD 23)
+ endif()
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_EXTENSIONS OFF)
++set(CMAKE_CXX_EXTENSIONS ON)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+ 
+ # Set max os target version.
+ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
+diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
+index daf6ba7eb8..35a94e3e8f 100644
+--- a/cmake/cpp.cmake
++++ b/cmake/cpp.cmake
+@@ -230,7 +230,7 @@ endforeach()
+ if(MSVC)
+   set(CMAKE_CXX_STANDARD 20)
+ else()
+-  set(CMAKE_CXX_STANDARD 17)
++  set(CMAKE_CXX_STANDARD 23)
+ endif()
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+diff --git a/ortools/base/file.cc b/ortools/base/file.cc
+index fa627c9393..f3bbda2d57 100644
+--- a/ortools/base/file.cc
++++ b/ortools/base/file.cc
+@@ -184,9 +184,8 @@ absl::Status GetContents(const absl::string_view& filename, std::string* output,
+     status.Update(file->Close(flags));
+     return status;
+   }
+-#endif  // _MSC_VER
+-
+-  file->Close(flags);  // Even if ReadToString() fails!
++#endif                               // _MSC_VER
++  auto closed = file->Close(flags);  // Even if ReadToString() fails!
+   return absl::Status(absl::StatusCode::kInvalidArgument,
+                       absl::StrCat("Could not read from '", filename, "'."));
+ }
+diff --git a/ortools/constraint_solver/routing_lp_scheduling.cc b/ortools/constraint_solver/routing_lp_scheduling.cc
+index a8370e71c0..e1acf01500 100644
+--- a/ortools/constraint_solver/routing_lp_scheduling.cc
++++ b/ortools/constraint_solver/routing_lp_scheduling.cc
+@@ -1337,6 +1337,7 @@ int64_t ComputeConvexPiecewiseLinearFormulationValue(
+       return PieceWiseLinearFormulationValueKnownSegment(
+           pwl, x, pwl.x_anchors.size() - 1, delta);
+   }
++  throw std::logic_error("Unhandled enum value");
+ }
+ 
+ bool DimensionCumulOptimizerCore::SetRouteTravelConstraints(
+diff --git a/ortools/constraint_solver/search.cc b/ortools/constraint_solver/search.cc
+index 4ea7186695..a71e99768d 100644
+--- a/ortools/constraint_solver/search.cc
++++ b/ortools/constraint_solver/search.cc
+@@ -2406,6 +2406,7 @@ int SolutionCollector::solution_count() const { return solution_data_.size(); }
+ 
+ int64_t SolutionCollector::wall_time(int n) const {
+   check_index(n);
++  auto rr = solution_data_[n];
+   return solution_data_[n].time;
+ }
+ 
+@@ -4233,8 +4234,8 @@ SearchLimit* RegularLimit::MakeClone() const { return MakeIdenticalClone(); }
+ 
+ RegularLimit* RegularLimit::MakeIdenticalClone() const {
+   Solver* const s = solver();
+-  return s->MakeLimit(wall_time(), branches_, failures_, solutions_,
+-                      smart_time_check_);
++  return s->MakeLimit(absl::Milliseconds(wall_time()), branches_, failures_,
++                      solutions_, smart_time_check_);
+ }
+ 
+ bool RegularLimit::CheckWithOffset(absl::Duration offset) {
+diff --git a/ortools/glop/initial_basis.cc b/ortools/glop/initial_basis.cc
+index ed4d5a65d8..060c583a92 100644
+--- a/ortools/glop/initial_basis.cc
++++ b/ortools/glop/initial_basis.cc
+@@ -17,9 +17,11 @@
+ #include <cmath>
+ #include <limits>
+ #include <queue>
++#include <stdexcept>
+ #include <vector>
+ 
+ #include "ortools/glop/markowitz.h"
++#include "ortools/lp_data/lp_types.h"
+ #include "ortools/lp_data/lp_utils.h"
+ 
+ namespace operations_research {
+@@ -218,6 +220,7 @@ int InitialBasis::GetMarosPriority(ColIndex col) const {
+     case VariableType::FIXED_VARIABLE:
+       return 0;
+   }
++  throw std::logic_error("Unhandled VariableType enum value");
+ }
+ 
+ int InitialBasis::GetMarosPriority(RowIndex row) const {
+@@ -387,6 +390,7 @@ int InitialBasis::GetColumnCategory(ColIndex col) const {
+     case VariableType::FIXED_VARIABLE:
+       return 5;
+   }
++  throw std::logic_error("Unhandled VariableType enum value");
+ }
+ 
+ Fractional InitialBasis::GetColumnPenalty(ColIndex col) const {
+diff --git a/ortools/glop/primal_edge_norms.cc b/ortools/glop/primal_edge_norms.cc
+index 0c54245faf..83e38097ce 100644
+--- a/ortools/glop/primal_edge_norms.cc
++++ b/ortools/glop/primal_edge_norms.cc
+@@ -58,6 +58,7 @@ const DenseRow& PrimalEdgeNorms::GetSquaredNorms() {
+     case GlopParameters::DEVEX:
+       return GetDevexWeights();
+   }
++  throw std::logic_error("Unhandled pricing rule");
+ }
+ 
+ const DenseRow& PrimalEdgeNorms::GetEdgeSquaredNorms() {
+diff --git a/ortools/graph/iterators.h b/ortools/graph/iterators.h
+index a89a8f5730..97398f1ad9 100644
+--- a/ortools/graph/iterators.h
++++ b/ortools/graph/iterators.h
+@@ -16,6 +16,7 @@
+ #ifndef UTIL_GRAPH_ITERATORS_H_
+ #define UTIL_GRAPH_ITERATORS_H_
+ 
++#include <compare>
+ #include <iterator>
+ #include <vector>
+ 
+@@ -102,15 +103,24 @@ BeginEndReverseIteratorWrapper<Container> Reverse(const Container& c) {
+ 
+ // Simple iterator on an integer range, see IntegerRange below.
+ template <typename IntegerType>
+-class IntegerRangeIterator
+-    : public std::iterator<std::input_iterator_tag, IntegerType> {
++class IntegerRangeIterator {
+  public:
++  using iterator_category = std::input_iterator_tag;
++  using value_type = IntegerType;
++  using difference_type = std::ptrdiff_t;
++  using pointer = IntegerType*;
++  using reference = IntegerType&;
++
+   explicit IntegerRangeIterator(IntegerType value) : index_(value) {}
+   IntegerRangeIterator(const IntegerRangeIterator& other)
+       : index_(other.index_) {}
+   IntegerRangeIterator& operator=(const IntegerRangeIterator& other) {
+     index_ = other.index_;
+   }
++
++  auto operator<=>(const IntegerRangeIterator& other) const = default;
++
++  /*
+   bool operator!=(const IntegerRangeIterator& other) const {
+     // This may seems weird, but using < instead of != avoid almost-infinite
+     // loop if one use IntegerRange<int>(1, 0) below for instance.
+@@ -119,7 +129,8 @@ class IntegerRangeIterator
+   bool operator==(const IntegerRangeIterator& other) const {
+     return index_ == other.index_;
+   }
+-  IntegerType operator*() const { return index_; }
++  */
++  value_type operator*() const { return index_; }
+   IntegerRangeIterator& operator++() {
+     ++index_;
+     return *this;
+diff --git a/ortools/linear_solver/linear_solver.cc b/ortools/linear_solver/linear_solver.cc
+index ef4f68560b..4e796d8f08 100644
+--- a/ortools/linear_solver/linear_solver.cc
++++ b/ortools/linear_solver/linear_solver.cc
+@@ -378,7 +378,9 @@ extern MPSolverInterface* BuildHighsInterface(bool mip, MPSolver* const solver);
+ #endif
+ extern MPSolverInterface* BuildBopInterface(MPSolver* const solver);
+ extern MPSolverInterface* BuildGLOPInterface(MPSolver* const solver);
++#if defined(USE_PDLP)
+ extern MPSolverInterface* BuildPdlpInterface(MPSolver* const solver);
++#endif
+ extern MPSolverInterface* BuildSatInterface(MPSolver* const solver);
+ #if defined(USE_SCIP)
+ extern MPSolverInterface* BuildSCIPInterface(MPSolver* const solver);
+@@ -401,8 +403,10 @@ MPSolverInterface* BuildSolverInterface(MPSolver* const solver) {
+       return BuildBopInterface(solver);
+     case MPSolver::GLOP_LINEAR_PROGRAMMING:
+       return BuildGLOPInterface(solver);
++#if defined(USE_PDLP)
+     case MPSolver::PDLP_LINEAR_PROGRAMMING:
+       return BuildPdlpInterface(solver);
++#endif
+     case MPSolver::SAT_INTEGER_PROGRAMMING:
+       return BuildSatInterface(solver);
+ #if defined(USE_CLP) || defined(USE_CBC)
+diff --git a/ortools/linear_solver/pdlp_interface.cc b/ortools/linear_solver/pdlp_interface.cc
+index 166c8082c6..cb2ea00b55 100644
+--- a/ortools/linear_solver/pdlp_interface.cc
++++ b/ortools/linear_solver/pdlp_interface.cc
+@@ -11,6 +11,8 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
++#if defined(USE_PDLP)
++
+ #include <atomic>
+ #include <cstdint>
+ #include <optional>
+@@ -305,3 +307,4 @@ MPSolverInterface* BuildPdlpInterface(MPSolver* const solver) {
+ }
+ 
+ }  // namespace operations_research
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/linear_solver/proto_solver/pdlp_proto_solver.cc b/ortools/linear_solver/proto_solver/pdlp_proto_solver.cc
+index f4e89531d1..c1434a5e23 100644
+--- a/ortools/linear_solver/proto_solver/pdlp_proto_solver.cc
++++ b/ortools/linear_solver/proto_solver/pdlp_proto_solver.cc
+@@ -10,6 +10,7 @@
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
++#if defined(USE_PDLP)
+ 
+ #include "ortools/linear_solver/proto_solver/pdlp_proto_solver.h"
+ 
+@@ -133,3 +134,5 @@ absl::StatusOr<MPSolutionResponse> PdlpSolveProto(
+ }
+ 
+ }  // namespace operations_research
++
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/linear_solver/proto_solver/pdlp_proto_solver.h b/ortools/linear_solver/proto_solver/pdlp_proto_solver.h
+index 8a0ce53136..2195389f33 100644
+--- a/ortools/linear_solver/proto_solver/pdlp_proto_solver.h
++++ b/ortools/linear_solver/proto_solver/pdlp_proto_solver.h
+@@ -10,6 +10,7 @@
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
++#if defined(USE_PDLP)
+ 
+ #ifndef OR_TOOLS_LINEAR_SOLVER_PROTO_SOLVER_PDLP_PROTO_SOLVER_H_
+ #define OR_TOOLS_LINEAR_SOLVER_PROTO_SOLVER_PDLP_PROTO_SOLVER_H_
+@@ -43,3 +44,5 @@ absl::StatusOr<MPSolutionResponse> PdlpSolveProto(
+ }  // namespace operations_research
+ 
+ #endif  // OR_TOOLS_LINEAR_SOLVER_PROTO_SOLVER_PDLP_PROTO_SOLVER_H_
++
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/linear_solver/solve.cc b/ortools/linear_solver/solve.cc
+index 187d451eb5..84947fce99 100644
+--- a/ortools/linear_solver/solve.cc
++++ b/ortools/linear_solver/solve.cc
+@@ -140,8 +140,9 @@ MPModelRequest ReadMipModel(const std::string& input) {
+     model_proto = std::move(result).value();
+   } else if (absl::EndsWith(input, ".mps") ||
+              absl::EndsWith(input, ".mps.gz")) {
+-    QCHECK_OK(glop::MPSReader().ParseFile(input, &model_proto))
+-        << "Error while parsing the mps file '" << input << "'.";
++    auto retval = glop::MpsFileToMPModelProto(input);
++    QCHECK_OK(retval) << "Error while parsing the mps file '" << input << "'.";
++    model_proto = *retval;
+   } else {
+     ReadFileToProto(input, &model_proto);
+     ReadFileToProto(input, &request_proto);
+diff --git a/ortools/lp_data/mps_reader.cc b/ortools/lp_data/mps_reader.cc
+index 806d5f9cde..681b2c477a 100644
+--- a/ortools/lp_data/mps_reader.cc
++++ b/ortools/lp_data/mps_reader.cc
+@@ -39,13 +39,13 @@ class MPSReaderImpl {
+   // MpModelProto for the Data type, but it should be easy to add more.
+   template <class Data>
+   absl::Status ParseFile(const std::string& file_name, Data* data,
+-                         MPSReader::Form form);
++                         MPSReaderForm form);
+ 
+   // Loads instance from string. Useful with MapReduce. Automatically detects
+   // the file's format (free or fixed).
+   template <class Data>
+   absl::Status ParseProblemFromString(const std::string& source, Data* data,
+-                                      MPSReader::Form form);
++                                      MPSReaderForm form);
+ 
+  private:
+   // Number of fields in one line of MPS file.
+@@ -523,19 +523,19 @@ class DataWrapper<MPModelProto> {
+ 
+ template <class Data>
+ absl::Status MPSReaderImpl::ParseFile(const std::string& file_name, Data* data,
+-                                      MPSReader::Form form) {
++                                      MPSReaderForm form) {
+   if (data == nullptr) {
+     return absl::InvalidArgumentError("NULL pointer passed as argument.");
+   }
+ 
+-  if (form == MPSReader::AUTO_DETECT) {
+-    if (ParseFile(file_name, data, MPSReader::FIXED).ok()) {
++  if (form == MPSReaderForm::AUTO_DETECT) {
++    if (ParseFile(file_name, data, MPSReaderForm::FIXED).ok()) {
+       return absl::OkStatus();
+     }
+-    return ParseFile(file_name, data, MPSReader::FREE);
++    return ParseFile(file_name, data, MPSReaderForm::FREE);
+   }
+ 
+-  free_form_ = form == MPSReader::FREE;
++  free_form_ = form == MPSReaderForm::FREE;
+   Reset();
+   DataWrapper<Data> data_wrapper(data);
+   data_wrapper.SetUp();
+@@ -553,15 +553,15 @@ absl::Status MPSReaderImpl::ParseFile(const std::string& file_name, Data* data,
+ template <class Data>
+ absl::Status MPSReaderImpl::ParseProblemFromString(const std::string& source,
+                                                    Data* data,
+-                                                   MPSReader::Form form) {
+-  if (form == MPSReader::AUTO_DETECT) {
+-    if (ParseProblemFromString(source, data, MPSReader::FIXED).ok()) {
++                                                   MPSReaderForm form) {
++  if (form == MPSReaderForm::AUTO_DETECT) {
++    if (ParseProblemFromString(source, data, MPSReaderForm::FIXED).ok()) {
+       return absl::OkStatus();
+     }
+-    return ParseProblemFromString(source, data, MPSReader::FREE);
++    return ParseProblemFromString(source, data, MPSReaderForm::FREE);
+   }
+ 
+-  free_form_ = form == MPSReader::FREE;
++  free_form_ = form == MPSReaderForm::FREE;
+   Reset();
+   DataWrapper<Data> data_wrapper(data);
+   data_wrapper.SetUp();
+@@ -1167,12 +1167,12 @@ absl::Status MPSReaderImpl::AppendLineToError(const absl::Status& status) {
+ 
+ // Parses instance from a file.
+ absl::Status MPSReader::ParseFile(const std::string& file_name,
+-                                  LinearProgram* data, Form form) {
++                                  LinearProgram* data, MPSReaderForm form) {
+   return MPSReaderImpl().ParseFile(file_name, data, form);
+ }
+ 
+ absl::Status MPSReader::ParseFile(const std::string& file_name,
+-                                  MPModelProto* data, Form form) {
++                                  MPModelProto* data, MPSReaderForm form) {
+   return MPSReaderImpl().ParseFile(file_name, data, form);
+ }
+ 
+@@ -1180,13 +1180,13 @@ absl::Status MPSReader::ParseFile(const std::string& file_name,
+ // the file's format (free or fixed).
+ absl::Status MPSReader::ParseProblemFromString(const std::string& source,
+                                                LinearProgram* data,
+-                                               MPSReader::Form form) {
++                                               MPSReaderForm form) {
+   return MPSReaderImpl().ParseProblemFromString(source, data, form);
+ }
+ 
+ absl::Status MPSReader::ParseProblemFromString(const std::string& source,
+                                                MPModelProto* data,
+-                                               MPSReader::Form form) {
++                                               MPSReaderForm form) {
+   return MPSReaderImpl().ParseProblemFromString(source, data, form);
+ }
+ 
+@@ -1194,7 +1194,7 @@ absl::StatusOr<MPModelProto> MpsDataToMPModelProto(
+     const std::string& mps_data) {
+   MPModelProto model;
+   RETURN_IF_ERROR(MPSReaderImpl().ParseProblemFromString(
+-      mps_data, &model, MPSReader::AUTO_DETECT));
++      mps_data, &model, MPSReaderForm::AUTO_DETECT));
+   return model;
+ }
+ 
+@@ -1202,7 +1202,7 @@ absl::StatusOr<MPModelProto> MpsFileToMPModelProto(
+     const std::string& mps_file) {
+   MPModelProto model;
+   RETURN_IF_ERROR(
+-      MPSReaderImpl().ParseFile(mps_file, &model, MPSReader::AUTO_DETECT));
++      MPSReaderImpl().ParseFile(mps_file, &model, MPSReaderForm::AUTO_DETECT));
+   return model;
+ }
+ 
+diff --git a/ortools/lp_data/mps_reader.h b/ortools/lp_data/mps_reader.h
+index 33af74971e..202fdb42fb 100644
+--- a/ortools/lp_data/mps_reader.h
++++ b/ortools/lp_data/mps_reader.h
+@@ -55,6 +55,8 @@ absl::StatusOr<MPModelProto> MpsDataToMPModelProto(const std::string& mps_data);
+ // Parses an MPS model from a file.
+ absl::StatusOr<MPModelProto> MpsFileToMPModelProto(const std::string& mps_file);
+ 
++enum MPSReaderForm { AUTO_DETECT, FREE, FIXED };
++
+ // Implementation class. Please use the 2 functions above.
+ //
+ // Reads a linear program in the mps format.
+@@ -65,22 +67,20 @@ absl::StatusOr<MPModelProto> MpsFileToMPModelProto(const std::string& mps_file);
+ // TODO(user): Remove the MPSReader class.
+ class ABSL_DEPRECATED("Use the direct methods instead") MPSReader {
+  public:
+-  enum Form { AUTO_DETECT, FREE, FIXED };
+-
+   // Parses instance from a file.
+   absl::Status ParseFile(const std::string& file_name, LinearProgram* data,
+-                         Form form = AUTO_DETECT);
++                         MPSReaderForm form = AUTO_DETECT);
+ 
+   absl::Status ParseFile(const std::string& file_name, MPModelProto* data,
+-                         Form form = AUTO_DETECT);
++                         MPSReaderForm form = AUTO_DETECT);
+   // Loads instance from string. Useful with MapReduce. Automatically detects
+   // the file's format (free or fixed).
+   absl::Status ParseProblemFromString(const std::string& source,
+                                       LinearProgram* data,
+-                                      MPSReader::Form form = AUTO_DETECT);
++                                      MPSReaderForm form = AUTO_DETECT);
+   absl::Status ParseProblemFromString(const std::string& source,
+                                       MPModelProto* data,
+-                                      MPSReader::Form form = AUTO_DETECT);
++                                      MPSReaderForm form = AUTO_DETECT);
+ };
+ 
+ }  // namespace glop
+diff --git a/ortools/pdlp/iteration_stats.h b/ortools/pdlp/iteration_stats.h
+index 8e85f04172..0fb6291eba 100644
+--- a/ortools/pdlp/iteration_stats.h
++++ b/ortools/pdlp/iteration_stats.h
+@@ -11,6 +11,8 @@
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
+ 
++#if defined(USE_PDLP)
++
+ #ifndef PDLP_ITERATION_STATS_H_
+ #define PDLP_ITERATION_STATS_H_
+ 
+@@ -114,3 +116,5 @@ void SetRandomProjections(const ShardedQuadraticProgram& sharded_qp,
+ }  // namespace operations_research::pdlp
+ 
+ #endif  // PDLP_ITERATION_STATS_H_
++
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/pdlp/primal_dual_hybrid_gradient.h b/ortools/pdlp/primal_dual_hybrid_gradient.h
+index d5d38c1c5a..c68cfd76c2 100644
+--- a/ortools/pdlp/primal_dual_hybrid_gradient.h
++++ b/ortools/pdlp/primal_dual_hybrid_gradient.h
+@@ -10,6 +10,7 @@
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
++#if defined(USE_PDLP)
+ 
+ #ifndef PDLP_PRIMAL_DUAL_HYBRID_GRADIENT_H_
+ #define PDLP_PRIMAL_DUAL_HYBRID_GRADIENT_H_
+@@ -148,3 +149,5 @@ glop::ProblemSolution ComputeStatuses(const QuadraticProgram& qp,
+ }  // namespace operations_research::pdlp
+ 
+ #endif  // PDLP_PRIMAL_DUAL_HYBRID_GRADIENT_H_
++
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/pdlp/quadratic_program.h b/ortools/pdlp/quadratic_program.h
+index a88e1eabc8..05d41df5b2 100644
+--- a/ortools/pdlp/quadratic_program.h
++++ b/ortools/pdlp/quadratic_program.h
+@@ -10,6 +10,7 @@
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ // See the License for the specific language governing permissions and
+ // limitations under the License.
++#if defined(USE_PDLP)
+ 
+ #ifndef PDLP_QUADRATIC_PROGRAM_H_
+ #define PDLP_QUADRATIC_PROGRAM_H_
+@@ -214,3 +215,5 @@ void CombineRepeatedTripletsInPlace(
+ }  // namespace operations_research::pdlp
+ 
+ #endif  // PDLP_QUADRATIC_PROGRAM_H_
++
++#endif  //  #if defined(USE_PDLP)
+diff --git a/ortools/sat/cp_model_utils.cc b/ortools/sat/cp_model_utils.cc
+index 194a486253..4bca1c61e9 100644
+--- a/ortools/sat/cp_model_utils.cc
++++ b/ortools/sat/cp_model_utils.cc
+@@ -439,6 +439,7 @@ std::string ConstraintCaseName(
+     case ConstraintProto::ConstraintCase::CONSTRAINT_NOT_SET:
+       return "kEmpty";
+   }
++  throw std::logic_error("Unhandled ConstraintCase enum value");
+ }
+ 
+ std::vector<int> UsedVariables(const ConstraintProto& ct) {
+diff --git a/ortools/sat/linear_programming_constraint.cc b/ortools/sat/linear_programming_constraint.cc
+index 532d16caf4..d7084f1244 100644
+--- a/ortools/sat/linear_programming_constraint.cc
++++ b/ortools/sat/linear_programming_constraint.cc
+@@ -2616,7 +2616,8 @@ LinearProgrammingConstraint::HeuristicLpReducedCostBinary(Model* model) {
+   std::vector<int> num_cost_to_zero(num_vars);
+   int num_calls = 0;
+ 
+-  return [=]() mutable {
++  return [this, &num_calls, &num_vars, &cost_to_zero, &num_cost_to_zero,
++          &variables]() mutable {
+     const double kEpsilon = 1e-6;
+ 
+     // Every 10000 calls, decay pseudocosts.
+-- 
+2.41.0
+

sci-libs/or-tools/or-tools-9.6-r1.ebuild

@@ -0,0 +1,83 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION=" Google's Operations Research tools"
+HOMEPAGE="https://developers.google.com/optimization"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE='doc coinor cplex examples express glop glpk java parser python samples +scip static-libs'
+
+DEPEND="coinor? (
+		sci-libs/coinor-utils
+		sci-libs/coinor-osi
+		sci-libs/coinor-clp
+		sci-libs/coinor-cgl
+		sci-libs/coinor-cbc
+	)
+	glpk? ( sci-mathematics/glpk )
+	scip? ( sci-libs/scip )
+	python? ( dev-python/pybind11 )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/Support-for-USE_PDLP-C-23-and-Werror-changes.patch"
+)
+
+# S="${WORKDIR}/${PN}-${PV//./}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CXX=ON
+		-DBUILD_DEPS=OFF
+		-DBUILD_ZLIB=OFF
+		-DBUILD_absl=OFF
+		-DBUILD_GLOP=OFF
+		-DBUILD_FLATZINC=OFF
+		-DBUILD_Protobuf=OFF
+		-DBUILD_re2=OFF
+		-DBUILD_CoinUtils=OFF
+		-DBUILD_Osi=OFF
+		-DBUILD_Clp=OFF
+		-DBUILD_Cgl=OFF
+		-DBUILD_Cbc=OFF
+		-DBUILD_GLPK=OFF
+		-DBUILD_HIGHS=OFF
+		-DBUILD_Eigen3=OFF
+		-DBUILD_SCIP=OFF
+		-DBUILD_DOTNET=OFF
+		-DBUILD_pybind11=OFF
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_PYTHON=$(usex python)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_LP_PARSER=$(usex parser)
+		-DBUILD_SAMPLES=$(usex samples)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_DOC=$(usex doc)
+		-DUSE_COINOR=$(usex coinor)
+		-DUSE_GLPK=$(usex glpk)
+		-DUSE_HIGHS=OFF
+		-DUSE_PDLP=OFF
+		-DUSE_SCIP=$(usex scip)
+		-DUSE_CPLEX=$(usex cplex)
+		-DUSE_XPRESS=$(usex express)
+	)
+
+	#if use pdlp; then
+	#	mycmakeargs+=( -DBUILD_PDLP=OFF )
+	#fi
+
+	if use python; then
+		mycmakeargs+=( -DBUILD_VENV=OFF )
+	fi
+
+	cmake_src_configure
+}

sci-libs/or-tools/or-tools-9.6.ebuild

@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_SINGLE_IMPL=1
 
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+inherit cmake distutils-r1
-
-inherit cmake python-single-r1
 
 DESCRIPTION="Google's Operations Research tools"
 HOMEPAGE="https://developers.google.com/optimization/"
@@ -45,7 +45,6 @@ DEPEND="sci-libs/coinor-cbc
 		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
 		>=dev-python/six-1.5[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 RDEPEND=""
@@ -78,7 +77,7 @@ src_configure() {
 		-DBUILD_pybind11=OFF
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DFETCH_PYTHON_DEPS=OFF
-		-DVENV_USE_SYSTEM_SITE_PACKAGES=ON
+		-DBUILD_VENV=OFF
 	)
 
 	cmake_src_configure

sci-libs/scip/Manifest

@@ -0,0 +1,3 @@
+AUX Enforce-WError-C-C-23-GNUInstallDirs.patch 5713 BLAKE2B 4b4a852a774adcda89fc85c2d45d61cf33c869913a4f8697be2deecc97acc0a83737f3fcd03a97735d6b814617690c666fb90b51405102d2e448e558c477d4cd SHA512 8aef3ae367b29fd03885a181eb8dd33bcbddf090dd5a0b28a272cb717d0501dccf25bd0526e87b70f786f5ec891b18b4b66a5a984936df86994743bd2ef7695e
+DIST scip-8.0.3.tar.gz 9640665 BLAKE2B 55dd535ae7ceb6e35460301892f940f13b198dacefd8974eb90397840a58fae26d9514b872bc7870491cb8bee0cd733aef68ff253c494b122326c1a5c3b71942 SHA512 fc3d04d090f14f2ff0b9ede63d8a26258d0306cd8fccad8acc571fbe1482f93852377d136b4d437f84b654867f9a70f783d0f1805678c2b9e7331e798b11a2f9
+EBUILD scip-8.0.3.ebuild 978 BLAKE2B ff6995187a3e05ab4ba4f938275becbadd31e2dd5736f87ba51a028e95addd809159e66c5a4b5706dec6b0c6ef5195c68fb11801c8cd691df832bdddd717ff7e SHA512 effdcc4f613a91967fa9350b748509dd3273986344bd9b610e3ece43ead2282b500c9f4b7964525a119cbf637db7de5f0b8bc6f968aee53b6cc908a8fcc8b492

sci-libs/scip/files/Enforce-WError-C-C-23-GNUInstallDirs.patch

@@ -0,0 +1,135 @@
+From 0f08136b2dcdc4c68b5ddd01601f813b4da716b9 Mon Sep 17 00:00:00 2001
+From: Amit Prakash Ambasta <amit.prakash.ambasta@gmail.com>
+Date: Fri, 9 Jun 2023 14:45:19 +0530
+Subject: [PATCH] Enforce -WError, C/C++-23, GNUInstallDirs
+
+Signed-off-by: Amit Prakash Ambasta <amit.prakash.ambasta@gmail.com>
+---
+ CMakeLists.txt       |  8 ++++++++
+ src/CMakeLists.txt   | 41 ++++++++++++++++++++++-------------------
+ tests/CMakeLists.txt |  6 +++++-
+ 3 files changed, 35 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index adfa268..bf5042b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,9 +10,15 @@ if(POLICY CMP0091)
+    cmake_policy(SET CMP0091 NEW)
+ endif()
+ 
++set(CMAKE_C_STANDARD 23)
++set(CMAKE_CXX_STANDARD 23)
++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
++
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS_RELEASE}")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} ${CMAKE_CXX_FLAGS_RELEASE}")
+ 
++
+ set(SCIP_VERSION_MAJOR 8)
+ set(SCIP_VERSION_MINOR 0)
+ set(SCIP_VERSION_PATCH 3)
+@@ -39,7 +45,9 @@ set(CPACK_PACKAGE_VERSION_MINOR "${SCIP_VERSION_MINOR}")
+ set(CPACK_PACKAGE_VERSION_PATCH "${SCIP_VERSION_PATCH}")
+ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin")
+ set(CPACK_PACKAGE_CONTACT "http://scipopt.org")
++
+ include(CPack)
++include(GNUInstallDirs)
+ 
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 604badc..6fc4351 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,9 +7,12 @@ function(setLibProperties targetname outputname)
+         MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ endfunction(setLibProperties)
+ 
+-set(CMAKE_C_STANDARD 99)
++set(CMAKE_C_STANDARD 23)
++set(CMAKE_C_EXTENSIONS ON)
+ set(CMAKE_C_STANDARD_REQUIRED on)
+-set(CMAKE_C_EXTENSIONS OFF)
++set(CMAKE_CXX_STANDARD 23)
++set(CMAKE_CXX_EXTENSIONS ON)
++set(CMAKE_CXX_STANDARD_REQUIRED on)
+ 
+ if(NOT WIN32)
+     set(SCIP_COMP_OPTIONS ${SCIP_COMP_OPTIONS} "$<$<COMPILE_LANGUAGE:C>:-D_XOPEN_SOURCE=600>")
+@@ -1096,27 +1099,27 @@ target_include_directories(scip PUBLIC
+ 
+ # set the install rpath to the installed destination
+ set_target_properties(scip PROPERTIES
+-    INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
++    INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}"
+     INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ # install the header files of scip
+-install(FILES ${lpiheaders} DESTINATION include/lpi)
+-install(FILES ${dijkstraheaders} DESTINATION include/dijkstra)
+-install(FILES ${objscipheaders} DESTINATION include/objscip)
+-install(FILES ${scipheaders} ${PROJECT_BINARY_DIR}/scip/config.h ${PROJECT_BINARY_DIR}/scip/scip_export.h DESTINATION include/scip)
+-install(FILES ${tcliqueheaders} DESTINATION include/tclique)
+-install(FILES ${tinycthreadheader} DESTINATION include/tinycthread)
+-install(FILES ${tpiheaders} DESTINATION include/tpi)
+-install(FILES ${xmlheaders} DESTINATION include/xml)
+-install(FILES ${symheaders} DESTINATION include/symmetry)
+-install(FILES ${blockmemshellheader} DESTINATION include/blockmemshell)
++install(FILES ${lpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lpi)
++install(FILES ${dijkstraheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dijkstra)
++install(FILES ${objscipheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/objscip)
++install(FILES ${scipheaders} ${PROJECT_BINARY_DIR}/scip/config.h ${PROJECT_BINARY_DIR}/scip/scip_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/scip)
++install(FILES ${tcliqueheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tclique)
++install(FILES ${tinycthreadheader} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tinycthread)
++install(FILES ${tpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tpi)
++install(FILES ${xmlheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xml)
++install(FILES ${symheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/symmetry)
++install(FILES ${blockmemshellheader} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/blockmemshell)
+ 
+ # install the binary and the library to appropriate locations and add them to an export group
+ install(TARGETS scip libscip EXPORT scip-targets
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
+-        RUNTIME DESTINATION bin
+-        INCLUDES DESTINATION include)
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ # Add all targets to the build-tree export set
+ export(TARGETS scip libscip ${BLISS_TARGET}
+@@ -1156,7 +1159,7 @@ configure_file(${PROJECT_SOURCE_DIR}/scip-config.cmake.in
+ 
+ # install the targets of the scip export group and the config file so that other projects
+ # can link easily against scip
+-install(EXPORT scip-targets DESTINATION lib/cmake/scip)
++install(EXPORT scip-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
+ install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/scip-config.cmake"
+               ${PROJECT_BINARY_DIR}/scip-config-version.cmake
+-        DESTINATION lib/cmake/scip)
++              DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index eb6925d..b71c312 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -43,8 +43,12 @@ include(CTest)
+ #
+ # define the C99 standard for older compilers (gcc < 5.0)
+ #
+-set(CMAKE_C_STANDARD 99)
++set(CMAKE_C_STANDARD 23)
++set(CMAKE_C_EXTENSIONS ON)
+ set(CMAKE_C_STANDARD_REQUIRED on)
++set(CMAKE_CXX_STANDARD 23)
++set(CMAKE_CXX_EXTENSIONS ON)
++set(CMAKE_CXX_STANDARD_REQUIRED on)
+ 
+ #
+ # unit tests depend on the presence of the Criterion framework
+-- 
+2.41.0
+

sci-libs/scip/scip-8.0.3.ebuild

@@ -0,0 +1,45 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SCIP - Solving Constraint Integer Programs"
+HOMEPAGE="https://scipopt.org/"
+SRC_URI="https://github.com/scipopt/${PN}/archive/v${PV//./}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="zuse"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE='ampl ipopt papilo gmp readline static-libs worhp zimpl zlib'
+
+DEPEND="gmp? ( dev-libs/gmp )
+	ipopt? ( sci-libs/ipopt )
+	readline? ( sys-libs/readline )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${PN}-${PV//./}"
+
+PATCHES=(
+	"${FILESDIR}/Enforce-WError-C-C-23-GNUInstallDirs.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DAUTOBUILD=OFF
+		-DBUILD_SHARED=$(usex static-libs OFF ON)
+		-DZLIB=$(usex zlib)
+		-DREADLINE=$(usex readline)
+		-DGMP=$(usex gmp)
+		-DPAPILO=$(usex papilo)
+		-DZIMPL=$(usex zimpl)
+		-DAMPL=$(usex ampl)
+		-DIPOPT=$(usex ipopt)
+		-DWORHP=$(usex worhp)
+	)
+	cmake_src_configure
+}