| 1 |
commit: a26637ce3fd8098a5c4b842d1eeb250129aefb59 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Fri Jan 29 11:39:55 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Fri Jan 29 11:39:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a26637ce |
| 7 |
|
| 8 |
sci-chemistry/chimera-bin: add version 1.15 |
| 9 |
|
| 10 |
also fix the symlink to freetype and add dependency on python2_7 |
| 11 |
|
| 12 |
Closes: https://github.com/gentoo/sci/issues/1046 |
| 13 |
Closes: https://github.com/gentoo/sci/issues/1045 |
| 14 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 15 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 16 |
|
| 17 |
sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild | 22 +++++++++++++++------- |
| 18 |
...era-bin-1.14.ebuild => chimera-bin-1.15.ebuild} | 22 +++++++++++++++------- |
| 19 |
2 files changed, 30 insertions(+), 14 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild |
| 22 |
index 7b00f46d5..4b277862d 100644 |
| 23 |
--- a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild |
| 24 |
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild |
| 25 |
@@ -1,12 +1,14 @@ |
| 26 |
-# Copyright 1999-2020 Gentoo Authors |
| 27 |
+# Copyright 1999-2021 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=7 |
| 31 |
|
| 32 |
-inherit eutils |
| 33 |
+PYTHON_COMPAT=( python2_7 ) |
| 34 |
+ |
| 35 |
+inherit desktop xdg python-any-r1 |
| 36 |
|
| 37 |
DESCRIPTION="An extensible Molecular Modelling System" |
| 38 |
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera" |
| 39 |
+HOMEPAGE="https://www.cgl.ucsf.edu/chimera/" |
| 40 |
SRC_URI="chimera-${PV}-linux_x86_64.bin" |
| 41 |
|
| 42 |
SLOT="0" |
| 43 |
@@ -42,19 +44,21 @@ RDEPEND=" |
| 44 |
x11-libs/libXrender |
| 45 |
x11-libs/libSM |
| 46 |
x11-libs/libXt |
| 47 |
- x11-libs/libGLw" |
| 48 |
+ x11-libs/libGLw |
| 49 |
+ ${PYTHON_DEPS} |
| 50 |
+" |
| 51 |
|
| 52 |
S="${WORKDIR}" |
| 53 |
|
| 54 |
-RESTRICT="fetch strip" |
| 55 |
+RESTRICT="fetch mirror strip" |
| 56 |
|
| 57 |
QA_PREBUILT="opt/.*" |
| 58 |
|
| 59 |
pkg_nofetch() { |
| 60 |
elog "Please visit" |
| 61 |
- elog "http://www.cgl.ucsf.edu/chimera/download.html" |
| 62 |
+ elog "https://www.cgl.ucsf.edu/chimera/download.html" |
| 63 |
elog "or" |
| 64 |
- elog "http://www.cgl.ucsf.edu/chimera/olddownload.html" |
| 65 |
+ elog "https://www.cgl.ucsf.edu/chimera/olddownload.html" |
| 66 |
elog "and download ${A} into your DISTDIR" |
| 67 |
} |
| 68 |
|
| 69 |
@@ -80,6 +84,10 @@ src_install() { |
| 70 |
exeinto /opt/bin/ |
| 71 |
doexe "${T}"/chimera |
| 72 |
|
| 73 |
+ # point the symlink to the correct location |
| 74 |
+ rm "${ED}/opt/chimera-bin/include/ft2build.h" |
| 75 |
+ dosym ../../../usr/include/freetype2/ft2build.h opt/chimera-bin/include/ft2build.h |
| 76 |
+ |
| 77 |
make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon |
| 78 |
|
| 79 |
if use prefix; then |
| 80 |
|
| 81 |
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild |
| 82 |
similarity index 75% |
| 83 |
copy from sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild |
| 84 |
copy to sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild |
| 85 |
index 7b00f46d5..4b277862d 100644 |
| 86 |
--- a/sci-chemistry/chimera-bin/chimera-bin-1.14.ebuild |
| 87 |
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.15.ebuild |
| 88 |
@@ -1,12 +1,14 @@ |
| 89 |
-# Copyright 1999-2020 Gentoo Authors |
| 90 |
+# Copyright 1999-2021 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
EAPI=7 |
| 94 |
|
| 95 |
-inherit eutils |
| 96 |
+PYTHON_COMPAT=( python2_7 ) |
| 97 |
+ |
| 98 |
+inherit desktop xdg python-any-r1 |
| 99 |
|
| 100 |
DESCRIPTION="An extensible Molecular Modelling System" |
| 101 |
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera" |
| 102 |
+HOMEPAGE="https://www.cgl.ucsf.edu/chimera/" |
| 103 |
SRC_URI="chimera-${PV}-linux_x86_64.bin" |
| 104 |
|
| 105 |
SLOT="0" |
| 106 |
@@ -42,19 +44,21 @@ RDEPEND=" |
| 107 |
x11-libs/libXrender |
| 108 |
x11-libs/libSM |
| 109 |
x11-libs/libXt |
| 110 |
- x11-libs/libGLw" |
| 111 |
+ x11-libs/libGLw |
| 112 |
+ ${PYTHON_DEPS} |
| 113 |
+" |
| 114 |
|
| 115 |
S="${WORKDIR}" |
| 116 |
|
| 117 |
-RESTRICT="fetch strip" |
| 118 |
+RESTRICT="fetch mirror strip" |
| 119 |
|
| 120 |
QA_PREBUILT="opt/.*" |
| 121 |
|
| 122 |
pkg_nofetch() { |
| 123 |
elog "Please visit" |
| 124 |
- elog "http://www.cgl.ucsf.edu/chimera/download.html" |
| 125 |
+ elog "https://www.cgl.ucsf.edu/chimera/download.html" |
| 126 |
elog "or" |
| 127 |
- elog "http://www.cgl.ucsf.edu/chimera/olddownload.html" |
| 128 |
+ elog "https://www.cgl.ucsf.edu/chimera/olddownload.html" |
| 129 |
elog "and download ${A} into your DISTDIR" |
| 130 |
} |
| 131 |
|
| 132 |
@@ -80,6 +84,10 @@ src_install() { |
| 133 |
exeinto /opt/bin/ |
| 134 |
doexe "${T}"/chimera |
| 135 |
|
| 136 |
+ # point the symlink to the correct location |
| 137 |
+ rm "${ED}/opt/chimera-bin/include/ft2build.h" |
| 138 |
+ dosym ../../../usr/include/freetype2/ft2build.h opt/chimera-bin/include/ft2build.h |
| 139 |
+ |
| 140 |
make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon |
| 141 |
|
| 142 |
if use prefix; then |
Archives