public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/
Date: Sun, 20 Nov 2022 09:30:21 +0000 (UTC)	[thread overview]
Message-ID: <1668936507.f64c963b6f2f03927cc19ffd163c5d0d7b893d6d.pacho@gentoo> (raw)

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


             reply	other threads:[~2022-11-20  9:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-20  9:30 Pacho Ramos [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-17 13:58 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/molmol/ 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-09-01  1:00 Sam James
2021-11-18 23:50 Georgy Yakovlev
2019-05-30 11:45 Pacho Ramos
2019-05-30 11:45 Pacho Ramos
2017-12-12 18:39 Thomas Deutschmann
2017-10-29 10:01 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1668936507.f64c963b6f2f03927cc19ffd163c5d0d7b893d6d.pacho@gentoo \
    --to=pacho@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox