gentoo auto-resync : 19:11:2023 - 23:08:59

4 files changed, 57 insertions, 20 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 67f7553a5188..38552df69103 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 4fd880427dd1..a5df38ef7673 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -28,6 +28,6 @@ DIST ghc-bin-9.0.2-r4-x86_64-pc-linux-gnu.gpkg.tar 123955200 BLAKE2B b1f45eea658
 DIST ghc-bin-9.2.8-i686-pc-linux-gnu.gpkg.tar 105441280 BLAKE2B 76d5fdb846d91d37b0b5706f1efbdd2833aac2d926fb4036845e36470fcfc6ad0143c492908c6cc5190dc3951c647e0584956395fca51b8f357b365ad23b496a SHA512 c19819bc4d8f1208fa28acc054cbb2d490b2b1c55bf55f8d4069474b4d58c931ff1999b593000b7f0b5b7169e6b71ad26d5d0d3480d8ecdbcc5e2c58116ec3d5
 DIST ghc-bin-9.2.8-x86_64-pc-linux-gnu.gpkg.tar 85432320 BLAKE2B ab649a6da5120720fc388dc98685a796415f7e2d664de17887f5bdadf5c9fe6192c4a6ac1bdbbe6e635ebf77b56e1f195367444e6febe01db32e38897dad5cb9 SHA512 fb868c87714aae791b4c19eaf3780707000ff61b240daebbfe2331d5e992dd20376060239df9aaf3daa54266eb10ad7a365804a09a5f6e9b1f5ee80717a16a17
 DIST process-1.6.16.0.tar.gz 87354 BLAKE2B 8c2977d6801faef8825ed35f058a6207a518f72eb87ac3144f630bc028f4753cefb9ed4d3fc29185438bcb4f38d33f5a45aebec6a8101e4cdc1b3570ada2e5dc SHA512 1663f2746a05a5a4c29d249db54eaa49edbbadfe8d189eab02276c3f6f3d6b84c81cc4333318c42c7a7265638402cb13276f08aeea134a7f5dd98da050a34341
-EBUILD ghc-9.0.2-r4.ebuild 30923 BLAKE2B 3c14d5e3911bb7c2dc23bc8759b55b6131a486ace796eaa7695f60eb8b31dd61334c5ee8f616e2ecb67f114becfb9126b547d251a7d7695161e88321b9c12c28 SHA512 b74b690bf17e7ed765ec606771f967ac62f93311b380ad602f52fdae18c2ebc7b88f2a7b8186d32ca9e74f39f025ae4764b5e5ddd7b2e240f69f16660648cdc2
-EBUILD ghc-9.2.8.ebuild 32019 BLAKE2B c1810f5913e1c3c1ed9d2c00082f03af75d1e01c509e3181162322a5e4d36cd6780eeb88dbb49049f03e62e5d50a85f1c1e943945ac9ff5484ab574cb17d6ac6 SHA512 c026aa11bb1dc93d3801a8087b7ff2efa4f24923f6d39269f69b2ac5b240d13f7ef5a831bb069d8070656003b33665257a51761b73638d39cb7f44d128272d1f
+EBUILD ghc-9.0.2-r4.ebuild 31290 BLAKE2B 33018a18d66a6986e7891ccd7da1dc9be4ee2c6a650e13691c2b2ec41f72be5b5869dbc46f368ac0be164340c8a8e579299a8abc6b877d29a9cd9569e62ff2de SHA512 82a815e1afd9d79b7f8a7e549df3f9167d40b5b830338857959ed682fc4b1b861ac56e39c358ee79154e079072bc892017aee55364bec9d19d9489cb63177254
+EBUILD ghc-9.2.8.ebuild 32211 BLAKE2B bffc235c05d4366ab162e3500c20da39ae87c18945f0b2d9cb733a9125cfd58ddb2f669a993931b278a107d00d38640d8fc7b6b02f1e4a2f4d56baf5b26376c7 SHA512 db43dd63924bfe8233aa86261d102bb9953b87b4f434ebd4a2037b058c4a29f219d1d0bdbaefd57f754077131f54c0bbfd5640ed128af26cf907cac70d0da58b
 MISC metadata.xml 1172 BLAKE2B 88b5e4af0e8c0e3335185f2c5469837a43ee87e6fc598242f29aced9bb8a3c330139978c564eb4ca503101934917e8406e9400dffd2eeaf7cd9983e8dc96105e SHA512 b03bb932efa54be0d55be591850064fcc967c8d77afdded255be91794544d47bdbbbd2959103cb739f6ec57b8571a955352e965ee1540a9854235a963b218bd3
diff --git a/dev-lang/ghc/ghc-9.0.2-r4.ebuild b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
index 140c6cdfed30..a02446080d36 100644
--- a/dev-lang/ghc/ghc-9.0.2-r4.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
@@ -161,19 +161,28 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
+		>=dev-libs/libxslt-1.1.2
+	)
+	!ghcbootstrap? (
+		${PREBUILT_BINARY_DEPENDS}
+	)
+	test? (
+		${PYTHON_DEPS}
+	)
 "
 
 needs_python() {
 	# test driver is written in python
 	use test && return 0
+	use doc && return 0
 	return 1
 }
 
@@ -187,6 +196,13 @@ REQUIRED_USE="
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
+python_check_deps() {
+	if use doc; then
+		python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+	fi
+}
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
@@ -629,6 +645,10 @@ src_prepare() {
 
 src_configure() {
 	if ! use binary; then
+		# No upstream LTO support. bug #855596
+		filter-lto
+		append-flags -fno-strict-aliasing
+
 		# initialize build.mk
 		echo '# Gentoo changes' > mk/build.mk
 
diff --git a/dev-lang/ghc/ghc-9.2.8.ebuild b/dev-lang/ghc/ghc-9.2.8.ebuild
index 8fffbe2cca4b..2b6f84b93c7f 100644
--- a/dev-lang/ghc/ghc-9.2.8.ebuild
+++ b/dev-lang/ghc/ghc-9.2.8.ebuild
@@ -170,19 +170,28 @@ RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-text/docbook-xml-dtd:4.2
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets
-		dev-python/sphinx
-		dev-python/sphinx-rtd-theme
-		>=dev-libs/libxslt-1.1.2 )
-	!ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
-	test? ( ${PYTHON_DEPS} )
+		>=dev-libs/libxslt-1.1.2
+	)
+	!ghcbootstrap? (
+		${PREBUILT_BINARY_DEPENDS}
+	)
+	test? (
+		${PYTHON_DEPS}
+	)
 "
 
 needs_python() {
 	# test driver is written in python
 	use test && return 0
+	use doc && return 0
 	return 1
 }
 
@@ -196,6 +205,13 @@ REQUIRED_USE="
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
+python_check_deps() {
+	if use doc; then
+		python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
+	fi
+}
+
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
@@ -563,9 +579,6 @@ src_prepare() {
 				# UPDATE ME for ghc-7
 				mkdir "${WORKDIR}"/ghc-bin-installer || die
 				pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
-				use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
-				use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
-				use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
 				use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
 				popd > /dev/null
 
@@ -656,13 +669,13 @@ src_prepare() {
 		# However, the patch is difficult to apply and our versions of GHC don't
 		# have the update, so we symlink to the system version instead.
 		if use doc; then
-			local rtd_theme_dir="$(dirname $(python -c "import sphinx_rtd_theme; print(sphinx_rtd_theme.__file__)"))"
+			local python_str="import sphinx_rtd_theme; print(sphinx_rtd_theme.__file__)"
+			local rtd_theme_dir="$(dirname $("${EPYTHON}" -c "$python_str"))"
 			local orig_rtd_theme_dir="${S}/docs/users_guide/rtd-theme"
 
-			ebegin "Replacing bundled rtd-theme with dev-python/sphinx-rtd-theme"
+			einfo "Replacing bundled rtd-theme with dev-python/sphinx-rtd-theme"
 			rm -r "${orig_rtd_theme_dir}" || die
 			ln -s "${rtd_theme_dir}" "${orig_rtd_theme_dir}" || die
-			eend 0
 		fi
 
 		# mingw32 target
@@ -680,6 +693,10 @@ src_prepare() {
 
 src_configure() {
 	if ! use binary; then
+		# No upstream LTO support. bug #855596
+		filter-lto
+		append-flags -fno-strict-aliasing
+
 		# initialize build.mk
 		echo '# Gentoo changes' > mk/build.mk