1 |
commit: b19dba60abee604ae0ed4751742895dbd022df74 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 30 11:44:45 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 30 11:45:50 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19dba60 |
7 |
|
8 |
sci-chemistry/molmol: Install .desktop file, update ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
sci-chemistry/molmol/Manifest | 1 + |
14 |
sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 51 +++++++++++++++++++---------- |
15 |
2 files changed, 34 insertions(+), 18 deletions(-) |
16 |
|
17 |
diff --git a/sci-chemistry/molmol/Manifest b/sci-chemistry/molmol/Manifest |
18 |
index d4822fb56e4..b987e93c369 100644 |
19 |
--- a/sci-chemistry/molmol/Manifest |
20 |
+++ b/sci-chemistry/molmol/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST molmol-2k.2.0-doc.tar.gz 1062297 BLAKE2B 082d4eea5544bab52ffc1ff6364c50304348f76759dd3125cd74d02e629383d4a566f28ac77ab89ecf5e17a82617b8f61525e6f454689840b27899827399d866 SHA512 131f747a5762859398ebe9b676a07df56c82c8864ecc035ec914f1dea74dafcd67f87993421dfe5899c640470c7e1e1ef03ae262b04a9b360ae329eb19a331fe |
23 |
DIST molmol-2k.2.0-src.tar.gz 1088805 BLAKE2B cd649604f6ee491d3a4485391ecdaa48dc1bc4bcd82865cd4a01ca460a6653f8cbba636050bfab9027b9b95dbefa28a8deeff7065b9b461f518001242af4a849 SHA512 6ab01a6fd3d19752634a2cf22919a20e43d195768bd4bdacd5f0bbe016c3058c94915bad4c7fa64dcd86576be39cad0ae112cb62f5e69ffb10041518101e7a9b |
24 |
DIST molmol-patches.tbz2 17528 BLAKE2B b91270a980f290edc169be00639e86b3272281c9fe237750f5778eab1605ed482c09bdaf90660a5edf74bd04b3e31adc755e77e39aea6c75d88b6db9bf47a6d6 SHA512 bd94baf0a378f40f854f396963edd9b9e4afc5c56462ee6f8b68889290afdb4c5d9b10878aa5619d0a70153453fe6ee8e7540064522c6db0291ae9162bba9287 |
25 |
+DIST molmol.png 509 BLAKE2B 981217602d128da2eb3765ca07580ed58164a4aa8c2d3e016cd54d9f5133418a7c87bbf0f8a83bcbd5d60ad568bf4938ce680eea315716166592e37f815b5aab SHA512 233d3be0c2e2759a8b064b4cf3708f96817f34eb2a397d5122b26a902864a0f1dca1762f8bcc6981cd030e2644cbedef9eb20c7756016fcf27565e3ed586c271 |
26 |
|
27 |
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild |
28 |
index 41b041609f2..a09bfe07847 100644 |
29 |
--- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild |
30 |
+++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild |
31 |
@@ -1,39 +1,48 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Copyright 1999-2019 Gentoo Authors |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
-EAPI=5 |
37 |
- |
38 |
-inherit eutils multilib prefix toolchain-funcs |
39 |
+EAPI=7 |
40 |
+inherit desktop prefix toolchain-funcs |
41 |
|
42 |
MY_PV="${PV/_p/.}.0" |
43 |
MY_P="${PN}-${MY_PV}" |
44 |
|
45 |
DESCRIPTION="Publication-quality molecular visualization package" |
46 |
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html" |
47 |
+ |
48 |
+# Original page dead |
49 |
+#HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html" |
50 |
+HOMEPAGE=" |
51 |
+ http://www.csb.yale.edu/userguides/graphics/molmol/molmol_descrip.html |
52 |
+ http://pjf.net/science/molmol.html |
53 |
+" |
54 |
SRC_URI=" |
55 |
ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz |
56 |
ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz |
57 |
- https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2" |
58 |
+ https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2 |
59 |
+ https://dev.gentoo.org/~pacho/${PN}/${PN}.png |
60 |
+" |
61 |
|
62 |
LICENSE="molmol" |
63 |
SLOT="0" |
64 |
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
65 |
IUSE="" |
66 |
|
67 |
-DEPEND=" |
68 |
+RDEPEND=" |
69 |
|| ( |
70 |
( media-libs/mesa |
71 |
x11-libs/libGLw ) |
72 |
media-libs/mesa[motif] ) |
73 |
- media-libs/libpng:0 |
74 |
+ media-libs/libpng:0= |
75 |
media-libs/tiff:0 |
76 |
sys-libs/zlib |
77 |
virtual/glu |
78 |
virtual/jpeg:0 |
79 |
x11-libs/libXpm |
80 |
x11-libs/motif:0 |
81 |
- x11-apps/xdpyinfo" |
82 |
-RDEPEND="${DEPEND}" |
83 |
+ x11-apps/xdpyinfo |
84 |
+" |
85 |
+DEPEND="${RDEPEND}" |
86 |
+BDEPEND="" |
87 |
|
88 |
S="${WORKDIR}" |
89 |
|
90 |
@@ -44,12 +53,14 @@ pkg_setup() { |
91 |
} |
92 |
|
93 |
src_prepare() { |
94 |
+ default |
95 |
+ |
96 |
rm -rf tiff* |
97 |
# Patch from http://pjf.net/science/molmol.html, where src.rpm is provided |
98 |
- epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff |
99 |
+ eapply "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff |
100 |
|
101 |
- epatch "${WORKDIR}"/patches/ldflags.patch |
102 |
- epatch "${WORKDIR}"/patches/opengl.patch |
103 |
+ eapply "${WORKDIR}"/patches/ldflags.patch |
104 |
+ eapply "${WORKDIR}"/patches/opengl.patch |
105 |
|
106 |
ln -s makedef.lnx "${S}"/makedef || die |
107 |
|
108 |
@@ -62,14 +73,14 @@ src_prepare() { |
109 |
-e "s:^CC.*:CC = $(tc-getCC):" \ |
110 |
-i "${S}"/makedef || die |
111 |
|
112 |
- epatch "${WORKDIR}"/patches/cast.patch |
113 |
- epatch "${WORKDIR}"/patches/libpng15.patch |
114 |
+ eapply "${WORKDIR}"/patches/cast.patch |
115 |
+ eapply -p0 "${WORKDIR}"/patches/libpng15.patch |
116 |
|
117 |
# patch from fink |
118 |
# fixes numerous bad bracings and hopefully the OGL bug 429974 |
119 |
- epatch "${WORKDIR}"/patches/${P}-fink.patch |
120 |
+ eapply "${WORKDIR}"/patches/${P}-fink.patch |
121 |
|
122 |
- epatch "${WORKDIR}"/patches/wild.patch |
123 |
+ eapply "${WORKDIR}"/patches/wild.patch |
124 |
tc-export AR |
125 |
} |
126 |
|
127 |
@@ -81,5 +92,9 @@ src_install() { |
128 |
insinto ${MMDIR} |
129 |
doins -r auxil help macros man setup tips |
130 |
|
131 |
- dodoc HISTORY README |
132 |
+ make_desktop_entry "${PN}" |
133 |
+ doicon "${DISTDIR}/${PN}.png" |
134 |
+ |
135 |
+ einstalldocs |
136 |
+ dodoc HISTORY |
137 |
} |