Adding metadata

10 files changed, 25 insertions, 21 deletions

diff --git a/dev-lang/python/python-3.10.12.ebuild b/dev-lang/python/python-3.10.12-r1.ebuild
index 4589c9780c93..3b4ae66ac352 100644
--- a/dev-lang/python/python-3.10.12.ebuild
+++ b/dev-lang/python/python-3.10.12-r1.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	app-alternatives/awk
 	virtual/pkgconfig
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.10.13.ebuild b/dev-lang/python/python-3.10.13-r1.ebuild
index 4589c9780c93..3b4ae66ac352 100644
--- a/dev-lang/python/python-3.10.13.ebuild
+++ b/dev-lang/python/python-3.10.13-r1.ebuild
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	app-alternatives/awk
 	virtual/pkgconfig
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.11.6.ebuild b/dev-lang/python/python-3.11.6-r1.ebuild
index 09f65354f7e5..5abede872bc2 100644
--- a/dev-lang/python/python-3.11.6.ebuild
+++ b/dev-lang/python/python-3.11.6-r1.ebuild
@@ -73,11 +73,11 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
-	valgrind? ( dev-util/valgrind )
+	valgrind? ( dev-debug/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
diff --git a/dev-lang/python/python-3.11.7.ebuild b/dev-lang/python/python-3.11.7-r1.ebuild
index 09f65354f7e5..5abede872bc2 100644
--- a/dev-lang/python/python-3.11.7.ebuild
+++ b/dev-lang/python/python-3.11.7-r1.ebuild
@@ -73,11 +73,11 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
-	valgrind? ( dev-util/valgrind )
+	valgrind? ( dev-debug/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( sec-keys/openpgp-keys-python )
diff --git a/dev-lang/python/python-3.12.0.ebuild b/dev-lang/python/python-3.12.0-r1.ebuild
index 5fff77e92669..bfc5e5998270 100644
--- a/dev-lang/python/python-3.12.0.ebuild
+++ b/dev-lang/python/python-3.12.0-r1.ebuild
@@ -79,11 +79,11 @@ DEPEND="
 		dev-python/ensurepip-setuptools
 		dev-python/ensurepip-wheel
 	)
-	valgrind? ( dev-util/valgrind )
+	valgrind? ( dev-debug/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
diff --git a/dev-lang/python/python-3.12.1.ebuild b/dev-lang/python/python-3.12.1-r1.ebuild
index 9fc1722d4d28..d9bca685e94e 100644
--- a/dev-lang/python/python-3.12.1.ebuild
+++ b/dev-lang/python/python-3.12.1-r1.ebuild
@@ -30,7 +30,7 @@ LICENSE="PSF-2"
 SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
-	bluetooth build debug +ensurepip examples gdbm libressl libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind
+	bluetooth build debug +ensurepip examples gdbm libressl libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind
 "
 RESTRICT="!test? ( test )"
 
@@ -79,11 +79,11 @@ DEPEND="
 		dev-python/ensurepip-setuptools
 		dev-python/ensurepip-wheel
 	)
-	valgrind? ( dev-util/valgrind )
+	valgrind? ( dev-debug/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	app-alternatives/awk
 	virtual/pkgconfig
 	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
@@ -219,11 +219,6 @@ src_configure() {
 	append-flags -fwrapv
 	filter-flags -malign-double
 
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
 	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
 	# PKG_CONFIG needed for cross.
 	tc-export CXX PKG_CONFIG
@@ -287,17 +282,26 @@ src_configure() {
 		--with-libc=
 		--enable-loadable-sqlite-extensions
 		--without-ensurepip
+		--without-lto
 		--with-system-expat
 		--with-platlibdir=lib
 		--with-pkg-config=yes
 		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
 
 		$(use_with debug assertions)
-		$(use_with lto)
 		$(use_enable pgo optimizations)
 		$(use_with readline readline "$(usex libedit editline readline)")
 		$(use_with valgrind)
 	)
+
+	# https://bugs.gentoo.org/700012
+	if tc-is-lto; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+		myeconfargs+=(
+			--with-lto
+		)
+	fi
+
 	# Force-disable modules we don't want built.
 	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
 	cat > Modules/Setup.local <<-EOF || die
diff --git a/dev-lang/python/python-3.8.17.ebuild b/dev-lang/python/python-3.8.17-r1.ebuild
index a50ebdfc8fa9..707be6ebe554 100644
--- a/dev-lang/python/python-3.8.17.ebuild
+++ b/dev-lang/python/python-3.8.17-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )"
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	virtual/pkgconfig
 	verify-sig? ( app-crypt/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
diff --git a/dev-lang/python/python-3.8.18.ebuild b/dev-lang/python/python-3.8.18-r1.ebuild
index 743da5a514a0..b6134bf15213 100644
--- a/dev-lang/python/python-3.8.18.ebuild
+++ b/dev-lang/python/python-3.8.18-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )"
 BDEPEND="
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	virtual/pkgconfig
 	verify-sig? ( app-crypt/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
diff --git a/dev-lang/python/python-3.9.17.ebuild b/dev-lang/python/python-3.9.17-r1.ebuild
index 63c552c8ed80..53000a865b66 100644
--- a/dev-lang/python/python-3.9.17.ebuild
+++ b/dev-lang/python/python-3.9.17-r1.ebuild
@@ -67,7 +67,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	app-alternatives/awk
 	virtual/pkgconfig
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.9.18.ebuild b/dev-lang/python/python-3.9.18-r1.ebuild
index 63c552c8ed80..53000a865b66 100644
--- a/dev-lang/python/python-3.9.18.ebuild
+++ b/dev-lang/python/python-3.9.18-r1.ebuild
@@ -67,7 +67,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	app-alternatives/awk
 	virtual/pkgconfig
-	sys-devel/autoconf-archive
+	dev-build/autoconf-archive
 	verify-sig? ( sec-keys/openpgp-keys-python )
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"