[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2017-10-29 10:01 Sergei Trofimovich
  0 siblings, 0 replies; 13+ messages in thread
From: Sergei Trofimovich @ 2017-10-29 10:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c5ae4130285541de88d470fc3d29e58c45975933
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 29 10:01:25 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 10:01:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ae4130

sci-chemistry/molmol: stable 2k_p2-r5 for ppc, bug #630350

Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="ppc"

 sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 23720c5be51..16e8b855360 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2017-12-12 18:39 Thomas Deutschmann
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Deutschmann @ 2017-12-12 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     24babe4563e245483b68f5ae908dce37d77c3d9a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 18:00:47 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 18:39:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24babe45

sci-chemistry/molmol: x86 stable (bug #630350)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index d788caa2005..4a8052d2f4b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2019-05-30 11:45 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2019-05-30 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b19dba60abee604ae0ed4751742895dbd022df74
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 11:44:45 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu May 30 11:45:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19dba60

sci-chemistry/molmol: Install .desktop file, update ebuild

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/Manifest               |  1 +
 sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 51 +++++++++++++++++++----------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index d4822fb56e4..b987e93c369 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,3 +1,4 @@
 DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c50304348f76759dd3125cd74d02e629383d4a566f28ac77ab89ecf5e17a82617b8f61525e6f454689840b27899827399d866 SHA512 131f747a5762859398ebe9b676a07df56c82c8864ecc035ec914f1dea74dafcd67f87993421dfe5899c640470c7e1e1ef03ae262b04a9b360ae329eb19a331fe
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
+DIST molmol.png 509 BLAKE2B 981217602d128da2eb3765ca07580ed58164a4aa8c2d3e016cd54d9f5133418a7c87bbf0f8a83bcbd5d60ad568bf4938ce680eea315716166592e37f815b5aab SHA512 233d3be0c2e2759a8b064b4cf3708f96817f34eb2a397d5122b26a902864a0f1dca1762f8bcc6981cd030e2644cbedef9eb20c7756016fcf27565e3ed586c271

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 41b041609f2..a09bfe07847 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,39 +1,48 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs
+EAPI=7
+inherit desktop prefix toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
+
+# 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/~soap/distfiles/${PN}-patches.tbz2
+	https://dev.gentoo.org/~pacho/${PN}/${PN}.png
+"
 
 LICENSE="molmol"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="
+RDEPEND="
 	|| (
 		(	media-libs/mesa
 			x11-libs/libGLw )
 		media-libs/mesa[motif] )
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	media-libs/tiff:0
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
 	x11-libs/libXpm
 	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
+	x11-apps/xdpyinfo
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
 
 S="${WORKDIR}"
 
@@ -44,12 +53,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	rm -rf tiff*
 	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
+	eapply "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
 
-	epatch "${WORKDIR}"/patches/ldflags.patch
-	epatch "${WORKDIR}"/patches/opengl.patch
+	eapply "${WORKDIR}"/patches/ldflags.patch
+	eapply "${WORKDIR}"/patches/opengl.patch
 
 	ln -s makedef.lnx "${S}"/makedef || die
 
@@ -62,14 +73,14 @@ src_prepare() {
 		-e "s:^CC.*:CC = $(tc-getCC):" \
 		-i "${S}"/makedef || die
 
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
+	eapply "${WORKDIR}"/patches/cast.patch
+	eapply -p0 "${WORKDIR}"/patches/libpng15.patch
 
 	# patch from fink
 	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
+	eapply "${WORKDIR}"/patches/${P}-fink.patch
 
-	epatch "${WORKDIR}"/patches/wild.patch
+	eapply "${WORKDIR}"/patches/wild.patch
 	tc-export AR
 }
 
@@ -81,5 +92,9 @@ src_install() {
 	insinto ${MMDIR}
 	doins -r auxil help macros man setup tips
 
-	dodoc HISTORY README
+	make_desktop_entry "${PN}"
+	doicon "${DISTDIR}/${PN}.png"
+
+	einstalldocs
+	dodoc HISTORY
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2019-05-30 11:45 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2019-05-30 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f0ff54647d14b0eba9dc436cb5dba50e9a170e74
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 11:45:41 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu May 30 11:45:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ff5464

sci-chemistry/molmol: Drop old

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r2.ebuild | 80 ---------------------------
 sci-chemistry/molmol/molmol-2k_p2-r3.ebuild | 84 ----------------------------
 sci-chemistry/molmol/molmol-2k_p2-r4.ebuild | 86 -----------------------------
 3 files changed, 250 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
deleted file mode 100644
index 888c738d4f1..00000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.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"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild
deleted file mode 100644
index 22f3e6a03bd..00000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.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"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-
-	# patch from fink
-	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
deleted file mode 100644
index 26a29492218..00000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib prefix toolchain-funcs
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.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"
-
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	|| (
-		(	media-libs/mesa
-			x11-libs/libGLw )
-		media-libs/mesa[motif] )
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	x11-libs/libXpm
-	x11-libs/motif:0
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	MMDIR="/usr/$(get_libdir)/molmol"
-}
-
-src_prepare() {
-	rm -rf tiff*
-	# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
-	epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff
-
-	epatch "${WORKDIR}"/patches/prefix.patch
-	eprefixify molmol
-
-	epatch "${WORKDIR}"/patches/ldflags.patch
-
-	ln -s makedef.lnx "${S}"/makedef || die
-
-	sed \
-		-e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
-		-i "${S}"/molmol || die
-	sed \
-		-e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-i "${S}"/makedef || die
-
-	epatch "${WORKDIR}"/patches/cast.patch
-	epatch "${WORKDIR}"/patches/libpng15.patch
-
-	# patch from fink
-	# fixes numerous bad bracings and hopefully the OGL bug 429974
-	epatch "${WORKDIR}"/patches/${P}-fink.patch
-
-	tc-export AR
-}
-
-src_install() {
-	dobin molmol
-
-	exeinto ${MMDIR}
-	newexe src/main/molmol molmol.lnx
-	insinto ${MMDIR}
-	doins -r auxil help macros man setup tips
-
-	dodoc HISTORY README
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2021-11-18 23:50 Georgy Yakovlev
  0 siblings, 0 replies; 13+ messages in thread
From: Georgy Yakovlev @ 2021-11-18 23:50 UTC (permalink / raw
  To: gentoo-commits

commit:     32112960bf28f08a2acc4836cded996b858584c9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 23:45:00 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 23:50:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32112960

sci-chemistry/molmol: de-stabilize for ~ppc, bug #823768

Bug: https://bugs.gentoo.org/823768
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
index 074130cf13dd..5d2719c05a3c 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2022-09-01  1:00 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-09-01  1:00 UTC (permalink / raw
  To: gentoo-commits

commit:     50e9a895d6664b30065fc1d805ff0b5f9ffc491f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 00:53:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 00:54:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e9a895

sci-chemistry/molmol: fix MissingUseDepDefault

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{molmol-2k_p2-r5.ebuild => molmol-2k_p2-r6.ebuild}      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
similarity index 93%
rename from sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
rename to sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
index 5d2719c05a3c..6667565a9c08 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,14 +29,17 @@ IUSE=""
 
 RDEPEND="
 	|| (
-		(	media-libs/mesa[X(+)]
-			x11-libs/libGLw )
-		media-libs/mesa[motif,X(+)] )
+		(
+			media-libs/mesa[X(+)]
+			x11-libs/libGLw
+		)
+		media-libs/mesa[motif(-),X(+)]
+	)
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	sys-libs/zlib
 	virtual/glu
-	virtual/jpeg:0
 	x11-libs/libXpm
 	x11-libs/motif:0
 	x11-apps/xdpyinfo


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2022-11-20  9:30 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2022-11-20  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     ff25a16f8a98e006b1a388ca91576821b2339427
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 09:29:50 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 09:29:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff25a16f

sci-chemistry/molmol: Drop unused eclass

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
index a24bf6f47176..9972c4783b7b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit desktop prefix toolchain-funcs
+inherit desktop toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
 MY_P="${PN}-${MY_PV}"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2022-11-20  9:30 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2022-11-20  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     f64c963b6f2f03927cc19ffd163c5d0d7b893d6d
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 09:28:24 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 09:28:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64c963b

sci-chemistry/molmol: Fix sed usage

And provide an icon with higher resolution

Closes: https://bugs.gentoo.org/710876
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/Manifest               |  2 +-
 sci-chemistry/molmol/molmol-2k_p2-r6.ebuild | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index b987e93c369f..917a0546bb34 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,4 +1,4 @@
 DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c50304348f76759dd3125cd74d02e629383d4a566f28ac77ab89ecf5e17a82617b8f61525e6f454689840b27899827399d866 SHA512 131f747a5762859398ebe9b676a07df56c82c8864ecc035ec914f1dea74dafcd67f87993421dfe5899c640470c7e1e1ef03ae262b04a9b360ae329eb19a331fe
 DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b
 DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287
-DIST molmol.png 509 BLAKE2B 981217602d128da2eb3765ca07580ed58164a4aa8c2d3e016cd54d9f5133418a7c87bbf0f8a83bcbd5d60ad568bf4938ce680eea315716166592e37f815b5aab SHA512 233d3be0c2e2759a8b064b4cf3708f96817f34eb2a397d5122b26a902864a0f1dca1762f8bcc6981cd030e2644cbedef9eb20c7756016fcf27565e3ed586c271
+DIST molmol_256.png 22668 BLAKE2B c7d75b8e0d738b48790bea25e21ec60d57a8181253518c70d6f18d93c64eef3c9acf90213fdbdf2dde272e85a04a6442e4e4a9c375829f369380d88c9c0ca57c SHA512 5e7975f54a7462161dc630ee973e9a8126b9c120e0d8d6b62007384c970ce39792e52300edc25dc7a85209845801d749d9ecba02899f3e18b18f5a5fdbc28a97

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
index 6667565a9c08..a24bf6f47176 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit desktop prefix toolchain-funcs
 
 MY_PV="${PV/_p/.}.0"
@@ -19,7 +19,7 @@ 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}.png
+	https://dev.gentoo.org/~pacho/${PN}/${PN}_256.png
 "
 
 LICENSE="molmol"
@@ -49,10 +49,9 @@ BDEPEND=""
 
 S="${WORKDIR}"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 pkg_setup() {
 	MMDIR="/usr/$(get_libdir)/molmol"
+	MAKEOPTS="${MAKEOPTS} -j1" #880621
 }
 
 src_prepare() {
@@ -68,12 +67,12 @@ src_prepare() {
 	ln -s makedef.lnx "${S}"/makedef || die
 
 	sed \
-		-e "s:ksh:sh:" \
-		-e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR};MOLMOLDEV=\"Motif/OpenGL\":" \
+		-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):" \
+		-e "s|^MCFLAGS.*|MCFLAGS = ${CFLAGS}|" \
+		-e "s|^CC.*|CC = $(tc-getCC)|" \
 		-i "${S}"/makedef || die
 
 	eapply "${WORKDIR}"/patches/cast.patch
@@ -95,8 +94,8 @@ src_install() {
 	insinto ${MMDIR}
 	doins -r auxil help macros man setup tips
 
-	make_desktop_entry "${PN}"
-	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry "${PN}" MOLMOL
+	newicon "${DISTDIR}/${PN}_256.png" "${PN}.png"
 
 	einstalldocs
 	dodoc HISTORY


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2022-12-16  1:40 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-12-16  1:40 UTC (permalink / raw
  To: gentoo-commits

commit:     1088bfc752dc815e26beb87eda09c50c05e417ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:31:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 01:38:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1088bfc7

sci-chemistry/molmol: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../molmol/{molmol-2k_p2-r6.ebuild => molmol-2k_p2-r8.ebuild}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
similarity index 98%
rename from sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
rename to sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
index 9972c4783b7b..ab04c60e4271 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r8.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
 		media-libs/mesa[motif(-),X(+)]
 	)
 	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
+	media-libs/libpng:=
+	media-libs/tiff:=
 	sys-libs/zlib
 	virtual/glu
 	x11-libs/libXpm


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2024-05-18 10:57 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2024-05-18 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9fda8b094fc31aaa3b93b0ae10a74847dc457ce2
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 10:56:46 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 18 10:56:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fda8b09

sci-chemistry/molmol: Fix pkgcheck warnings

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r9.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
index 818fc5df9fa5..29769cede153 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
@@ -21,11 +21,11 @@ SRC_URI="
 	https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2
 	https://dev.gentoo.org/~pacho/${PN}/${PN}_256.png
 "
+S="${WORKDIR}"
 
 LICENSE="molmol"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	|| (
@@ -45,9 +45,6 @@ RDEPEND="
 	x11-apps/xdpyinfo
 "
 DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc14-fix.patch


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2024-07-11 11:35 Jakov Smolić
  0 siblings, 0 replies; 13+ messages in thread
From: Jakov Smolić @ 2024-07-11 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     5689cb08ae3beb89267c2e4ed3e84ab5e6b5da7c
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 11 11:21:16 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jul 11 11:35:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5689cb08

sci-chemistry/molmol: Stabilize 2k_p2-r9 amd64, #935856

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
index 29769cede153..14378809c07a 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r9.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"
 
 LICENSE="molmol"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	|| (


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2024-10-17 13:58 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2024-10-17 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d0bc75131f367e36e87e7561fd489ef939763927
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 13:55:56 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 13:58:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bc7513

sci-chemistry/molmol: Really disable parallel build

Enforce the disabling of parallel build, this also allows to drop the ugly
upstream delays to make it build.

Closes: https://bugs.gentoo.org/880621
Closes: https://bugs.gentoo.org/941488
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r9.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
@ 2024-10-17 13:58 Pacho Ramos
  0 siblings, 0 replies; 13+ messages in thread
From: Pacho Ramos @ 2024-10-17 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     07f203f861ec85f0f2afec85341e6a247f95e914
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 13:57:13 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 13:58:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f203f8

sci-chemistry/molmol: drop 2k_p2-r8

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-chemistry/molmol/molmol-2k_p2-r8.ebuild | 102 ----------------------------
 1 file changed, 102 deletions(-)

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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-10-17 13:58 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-30 11:45 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2024-10-17 13:58 Pacho Ramos
2024-10-17 13:58 Pacho Ramos
2024-07-11 11:35 Jakov Smolić
2024-05-18 10:57 Pacho Ramos
2022-12-16  1:40 Sam James
2022-11-20  9:30 Pacho Ramos
2022-11-20  9:30 Pacho Ramos
2022-09-01  1:00 Sam James
2021-11-18 23:50 Georgy Yakovlev
2019-05-30 11:45 Pacho Ramos
2017-12-12 18:39 Thomas Deutschmann
2017-10-29 10:01 Sergei Trofimovich

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