summaryrefslogtreecommitdiff
path: root/sci-chemistry
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/Manifest.gzbin10185 -> 10186 bytes
-rw-r--r--sci-chemistry/molmol/Manifest4
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2-r6.ebuild21
3 files changed, 12 insertions, 13 deletions
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index d4465e2e3894..1decbab67aee 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
Binary files differ
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index 299a35b080d6..b72f6ab6f2b2 100644
--- a/sci-chemistry/molmol/Manifest
+++ b/sci-chemistry/molmol/Manifest
@@ -1,6 +1,6 @@
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
-EBUILD molmol-2k_p2-r6.ebuild 2255 BLAKE2B 9d316bf74d9e0055349d024e54b5c8ffe0a7b313c69be4cf895fc436f2e36de4a26bfe3b5243d1b6a92719058f12db36c7fe553b63841329e2d382c4c48ad80b SHA512 c0e54e06f617bc0468f43185c5cecd92cfc2117d9c643f2d163e9165a0f858310afed0b633bd1ed1b5e698871cd3095f125c89a0123ceb7eab0f109f999c36fc
+DIST molmol_256.png 22668 BLAKE2B c7d75b8e0d738b48790bea25e21ec60d57a8181253518c70d6f18d93c64eef3c9acf90213fdbdf2dde272e85a04a6442e4e4a9c375829f369380d88c9c0ca57c SHA512 5e7975f54a7462161dc630ee973e9a8126b9c120e0d8d6b62007384c970ce39792e52300edc25dc7a85209845801d749d9ecba02899f3e18b18f5a5fdbc28a97
+EBUILD molmol-2k_p2-r6.ebuild 2284 BLAKE2B 5b2e9555d316a85cf99546aee3eb95ff891f2de01a118ba346ddaa5498cdbfcb6b4ccd285e2e7a364502d77526e713d3b684e45eb9cf7a4ae2e7cf8bac5ab692 SHA512 b8c1811927337f96a4c97abb68ea18dec5eefd9fc3c3e141cb7b1d49523a7b575646dc5749e1929c56fd7f436422c46ec4b3386bd774624ab64f6dee3e4ea6d7
MISC metadata.xml 272 BLAKE2B 531e98b72776bbe9126811b70943add0f6f43141b01cb75b17ac2c8d1cfb6a9b349022fd411894d2b8eeb0612a73db10aed4ba71f9624bd6dbd172a05fca2c76 SHA512 04f5575703aaaa95e575460ae3de428d3da173b3b741ab52b4aad31e381fef78b325f49f99622ec26a65024437759ea013fc525bd63ee553003c71afcc40d10c
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
index 6667565a9c08..9972c4783b7b 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r6.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit desktop prefix toolchain-funcs
+EAPI=8
+inherit desktop toolchain-funcs
MY_PV="${PV/_p/.}.0"
MY_P="${PN}-${MY_PV}"
@@ -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