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

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

2 files changed, 34 insertions, 18 deletions

diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest
index d4822fb56e4e..b987e93c369f 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 41b041609f2f..a09bfe07847b 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
 }