gentoo auto-resync : 18:10:2024 - 04:04:23

3 files changed, 8 insertions, 105 deletions

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 76e5c78f437b..e540122ad8fe 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -3,6 +3,5 @@ DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c503043
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
 DIST molmol_256.png 22668 BLAKE2B c7d75b8e0d738b48790bea25e21ec60d57a8181253518c70d6f18d93c64eef3c9acf90213fdbdf2dde272e85a04a6442e4e4a9c375829f369380d88c9c0ca57c SHA512 5e7975f54a7462161dc630ee973e9a8126b9c120e0d8d6b62007384c970ce39792e52300edc25dc7a85209845801d749d9ecba02899f3e18b18f5a5fdbc28a97
-EBUILD molmol-2k_p2-r8.ebuild 2284 BLAKE2B fa9954fca3dd8b52450beb1c0901abc71743672d7a76e2daa2bb05f52280ecf7dec5c401da24ce3e72f429cb69b27738117e33d41b49a96836b1b407efef67f0 SHA512 d813743572479b5eb0ed4181d42743402c4bd0a5a8e012f32bad03c4be68f38329722b749abc91845ba9c25642b19f5e2c4b5578ed9d3f7d03beaabbaa3345f5
-EBUILD molmol-2k_p2-r9.ebuild 2313 BLAKE2B fecc271cadf3eb73478b1adc674a6d369ee7bbb05c38e10ae78ebbc886782962f7c33ea07ef4d065e643ee7f5a71e99801f72c290cb7ab437833141dcfe80a99 SHA512 d173ed8f60c833485bf639fa8fc0ace5ff1ae46316be319d2cd1feb5f5201484ed9e8bba46054dfc91303d71051b52d4fa943638ecf6b843514fa9585bc421a5
+EBUILD molmol-2k_p2-r9.ebuild 2562 BLAKE2B b197c856d551f1b634efe0d978a297362c9d1260029cc7ecc2644fc3a3ce6bde20a7000f3aa2f4056b34454b17f357103f74535315d2f530483ae72a051ae96e SHA512 7668a27c2962fdaa40e96f55e48bcd3307cf6d146bfeba6f27bc0ae8e924e0dcc7853bee3a6a57b861de2868fa220a7ba071e1944e44364519b2f60b4ff46b4a
 MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
deleted file mode 100644
index 59bedaf2593d..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit desktop toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-
-# Original page dead
-#HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-HOMEPAGE="
-	http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html
-	http://pjf.net/science/molmol.html
-"
-SRC_URI="
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
-	ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz
-	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2
-	https://dev.gentoo.org/~pacho/${PN}/${PN}_256.png
-"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		(
-			media-libs/mesa[X(+)]
-			x11-libs/libGLw
-		)
-		media-libs/mesa[motif(-),X(+)]
-	)
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-	MAKEOPTS="${MAKEOPTS} -j1" #880621
-}
-
-src_prepare() {
-	default
-
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	eapply "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	eapply "${WORKDIR}"/patches/ldflags.patch
-	eapply "${WORKDIR}"/patches/opengl.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s|ksh|sh|" \
-		-e "s|^MOLMOLHOME.*|MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\"|" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s|^MCFLAGS.*|MCFLAGS = ${CFLAGS}|" \
-		-e "s|^CC.*|CC = $(tc-getCC)|" \
-		-i "${S}"/makedef || die
-
-	eapply "${WORKDIR}"/patches/cast.patch
-	eapply -p0 "${WORKDIR}"/patches/libpng15.patch
-
-	# patch from fink
-	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	eapply "${WORKDIR}"/patches/${P}-fink.patch
-
-	eapply "${WORKDIR}"/patches/wild.patch
-	tc-export AR
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	doexe src/main/molmol
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	make_desktop_entry "${PN}" MOLMOL
-	newicon "${DISTDIR}/${PN}_256.png" "${PN}.png"
-
-	einstalldocs
-	dodoc HISTORY
-}
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
index 14378809c07a..9a63d1dbb20d 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
@@ -52,7 +52,6 @@ PATCHES=(
 
 pkg_setup() {
 	MMDIR="/usr/$(get_libdir)/molmol"
-	MAKEOPTS="${MAKEOPTS} -j1" #880621
 }
 
 src_prepare() {
@@ -85,6 +84,13 @@ src_prepare() {
 
 	eapply "${WORKDIR}"/patches/wild.patch
 	tc-export AR
+
+	# Parallel build fails (#880621) and cannot be disabled by MAKEOPTS
+	# (#880621, #941488).
+	find . -name Makefile -exec sed -i -e "1i .NOTPARALLEL:" {} + || die
+	# Try to drop the ugly hardcoded sleep now that make is really
+	# serial
+	sed -i -e 's/sleep 2/sleep 0/g' makedef || die
 }
 
 src_install() {