1 |
commit: 4af58d4365b1c323106e4fcf0c07266d1438a63a |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 2 20:52:26 2020 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 2 20:52:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af58d43 |
7 |
|
8 |
sci-chemistry/autodock: Stop relying on python2 |
9 |
|
10 |
Also remove false positive configure warnings (#670690) and fix typo at |
11 |
install time (#543270) |
12 |
|
13 |
Closes: https://bugs.gentoo.org/543270 |
14 |
Closes: https://bugs.gentoo.org/670690 |
15 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
16 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
17 |
|
18 |
sci-chemistry/autodock/autodock-4.2.6.ebuild | 68 +++++++++++++--------- |
19 |
.../files/autodock-4.2.6-buildsystem.patch | 12 ++-- |
20 |
2 files changed, 46 insertions(+), 34 deletions(-) |
21 |
|
22 |
diff --git a/sci-chemistry/autodock/autodock-4.2.6.ebuild b/sci-chemistry/autodock/autodock-4.2.6.ebuild |
23 |
index 6cfe76fbbfd..b4dce2e439b 100644 |
24 |
--- a/sci-chemistry/autodock/autodock-4.2.6.ebuild |
25 |
+++ b/sci-chemistry/autodock/autodock-4.2.6.ebuild |
26 |
@@ -1,38 +1,56 @@ |
27 |
-# Copyright 1999-2019 Gentoo Authors |
28 |
+# Copyright 1999-2020 Gentoo Authors |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
|
31 |
-EAPI=5 |
32 |
+EAPI=7 |
33 |
|
34 |
-PYTHON_COMPAT=( python2_7 ) |
35 |
+# Tests require python2 |
36 |
+#PYTHON_COMPAT=( python2_7 ) |
37 |
|
38 |
-inherit autotools eutils python-any-r1 versionator |
39 |
+inherit autotools readme.gentoo-r1 #python-any-r1 |
40 |
|
41 |
MY_PN="autodocksuite" |
42 |
MY_P="${MY_PN}-${PV}" |
43 |
|
44 |
DESCRIPTION="A suite of automated docking tools" |
45 |
HOMEPAGE="http://autodock.scripps.edu/" |
46 |
-SRC_URI="http://autodock.scripps.edu/downloads/autodock-registration/tars/dist$(delete_all_version_separators)/${MY_P}-src.tar.gz" |
47 |
+SRC_URI="http://autodock.scripps.edu/downloads/autodock-registration/tars/dist$(ver_rs 1- '')/${MY_P}-src.tar.gz" |
48 |
|
49 |
LICENSE="GPL-2" |
50 |
SLOT="0" |
51 |
KEYWORDS="~amd64 ~x86" |
52 |
-IUSE="examples openmp test" |
53 |
-RESTRICT="!test? ( test )" |
54 |
+ |
55 |
+IUSE="examples openmp" #test |
56 |
+#RESTRICT="!test? ( test )" |
57 |
+ |
58 |
+# False positives caused by nested configure scripts |
59 |
+QA_CONFIGURE_OPTIONS=".*" |
60 |
|
61 |
RDEPEND="" |
62 |
-DEPEND="test? ( ${PYTHON_DEPS} )" |
63 |
+DEPEND="" |
64 |
+#DEPEND="test? ( ${PYTHON_DEPS} )" |
65 |
|
66 |
S="${WORKDIR}/src" |
67 |
|
68 |
+DISABLE_AUTOFORMATTING="yes" |
69 |
+DOC_CONTENTS=" |
70 |
+The AutoDock development team requests all users to fill out the |
71 |
+registration form at: |
72 |
+ |
73 |
+http://autodock.scripps.edu/downloads/autodock-registration |
74 |
+ |
75 |
+The number of unique users of AutoDock is used by Prof. Arthur J. |
76 |
+Olson and the Scripps Research Institude to support grant |
77 |
+applications. |
78 |
+" |
79 |
+ |
80 |
PATCHES=( |
81 |
"${FILESDIR}"/${P}-buildsystem.patch |
82 |
) |
83 |
|
84 |
src_prepare() { |
85 |
- local i |
86 |
+ default |
87 |
|
88 |
- epatch "${PATCHES[@]}" |
89 |
+ local i |
90 |
|
91 |
sed \ |
92 |
-e "s/\tcsh/\tsh/" \ |
93 |
@@ -58,15 +76,15 @@ src_compile() { |
94 |
emake -C autogrid |
95 |
} |
96 |
|
97 |
-src_test() { |
98 |
- elog "Testing autodock" |
99 |
- cd "${S}/autodock/Tests" || die |
100 |
- cp ../*.dat . || die |
101 |
- ${EPYTHON} test_autodock4.py || die "AutoDock tests failed." |
102 |
- einfo "Testing autogrid" |
103 |
- cd "${S}/autogrid/Tests" || die |
104 |
- ${EPYTHON} test_autogrid4.py || die "AutoGrid tests failed." |
105 |
-} |
106 |
+#src_test() { |
107 |
+# elog "Testing autodock" |
108 |
+# cd "${S}/autodock/Tests" || die |
109 |
+# cp ../*.dat . || die |
110 |
+# ${EPYTHON} test_autodock4.py || die "AutoDock tests failed." |
111 |
+# einfo "Testing autogrid" |
112 |
+# cd "${S}/autogrid/Tests" || die |
113 |
+# ${EPYTHON} test_autogrid4.py || die "AutoGrid tests failed." |
114 |
+#} |
115 |
|
116 |
src_install() { |
117 |
if use openmp; then |
118 |
@@ -79,7 +97,7 @@ src_install() { |
119 |
insinto /usr/share/${PN} |
120 |
doins -r \ |
121 |
autodock/{AD4_parameters.dat,AD4_PARM99.dat} \ |
122 |
- $(usex examples "autodoc/EXAMPLES" "") |
123 |
+ $(usex examples "autodock/EXAMPLES" "") |
124 |
|
125 |
DOCS=( |
126 |
RELEASENOTES |
127 |
@@ -88,15 +106,9 @@ src_install() { |
128 |
autodock/USERGUIDES/AutoDock4.2_UserGuide.pdf |
129 |
) |
130 |
einstalldocs |
131 |
+ readme.gentoo_create_doc |
132 |
} |
133 |
|
134 |
pkg_postinst() { |
135 |
- elog "The AutoDock development team requests all users to fill out the" |
136 |
- elog "registration form at:" |
137 |
- echo |
138 |
- elog "\thttp://autodock.scripps.edu/downloads/autodock-registration" |
139 |
- echo |
140 |
- elog "The number of unique users of AutoDock is used by Prof. Arthur J." |
141 |
- elog "Olson and the Scripps Research Institude to support grant" |
142 |
- elog "applications." |
143 |
+ readme.gentoo_print_elog |
144 |
} |
145 |
|
146 |
diff --git a/sci-chemistry/autodock/files/autodock-4.2.6-buildsystem.patch b/sci-chemistry/autodock/files/autodock-4.2.6-buildsystem.patch |
147 |
index ae44ffeb315..443dfcd868c 100644 |
148 |
--- a/sci-chemistry/autodock/files/autodock-4.2.6-buildsystem.patch |
149 |
+++ b/sci-chemistry/autodock/files/autodock-4.2.6-buildsystem.patch |
150 |
@@ -1,11 +1,11 @@ |
151 |
- src/autodock/Makefile.am | 6 +++--- |
152 |
- src/autogrid/Makefile.am | 4 ++-- |
153 |
+ a/autodock/Makefile.am | 6 +++--- |
154 |
+ b/autogrid/Makefile.am | 4 ++-- |
155 |
2 files changed, 5 insertions(+), 5 deletions(-) |
156 |
|
157 |
diff --git a/src/autodock/Makefile.am b/src/autodock/Makefile.am |
158 |
index 799a3c4..911897b 100644 |
159 |
---- a/src/autodock/Makefile.am |
160 |
-+++ b/src/autodock/Makefile.am |
161 |
+--- a/autodock/Makefile.am |
162 |
++++ b/autodock/Makefile.am |
163 |
@@ -459,7 +459,8 @@ endif |
164 |
|
165 |
BUILT_SOURCES = $(autodock4_SOURCES) default_parameters.h |
166 |
@@ -28,8 +28,8 @@ index 799a3c4..911897b 100644 |
167 |
|
168 |
diff --git a/src/autogrid/Makefile.am b/src/autogrid/Makefile.am |
169 |
index b531099..b78b380 100644 |
170 |
---- a/src/autogrid/Makefile.am |
171 |
-+++ b/src/autogrid/Makefile.am |
172 |
+--- a/autogrid/Makefile.am |
173 |
++++ b/autogrid/Makefile.am |
174 |
@@ -94,9 +94,9 @@ autogrid4_SOURCES = main.cpp \ |
175 |
BUILT_SOURCES = default_parameters.h |