summaryrefslogtreecommitdiff
path: root/sci-chemistry/prekin
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/prekin')
-rw-r--r--sci-chemistry/prekin/Manifest7
-rw-r--r--sci-chemistry/prekin/files/6.51.081122-Makefile.patch2
-rw-r--r--sci-chemistry/prekin/files/6.51.081122-overflow.patch2
-rw-r--r--sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch34
-rw-r--r--sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild9
5 files changed, 43 insertions, 11 deletions
diff --git a/sci-chemistry/prekin/Manifest b/sci-chemistry/prekin/Manifest
index 8ef0a2f31be5..c08768e2c0fb 100644
--- a/sci-chemistry/prekin/Manifest
+++ b/sci-chemistry/prekin/Manifest
@@ -1,5 +1,6 @@
-AUX 6.51.081122-Makefile.patch 1456 BLAKE2B 769c5237659ddc6abcbeea88d620993b7c52f77ee4b12a8bb200e452b0e5dd8fe41ba2c18056439998ba7d2dea90351e2fc7997cc71e5ec447e128e3c1535b62 SHA512 96b8cda8fc71b2e72c0e8e0a70560a7928456fe81aaa40810a8bcbe77835a7242e8e0d39fac3258e5848a4e4ac14bf9d7dfd4dff8385eb983f359a9f85af9838
-AUX 6.51.081122-overflow.patch 1156 BLAKE2B 86c70ec89564972a451d23a41863969e31b2d0b866c0282728625fe200928aaf87bec7751e8df3fefbce6c2d4f0a21aba13b1d117247ab6b2b14c7d1db2e45b8 SHA512 fe0ff6e3432177653d29ef51ef3a767dc3872fc0a5350c786b3623b6b4d63866fbfbaf4369676feb545766cac5620b209bd87e92c0ecf2280bb39470e7dd5f7b
+AUX 6.51.081122-Makefile.patch 1381 BLAKE2B 9242edf05c881b113aae1d7dbbf45a267ca14e66ce958ef557e04270517666b781bcbf90f1ed869357378aeb19e6821d91de97c4a847eb4d6354c24e63ce8fbb SHA512 90f6ba58bdaea6469689ef4f3820f08876517f31d19a48741cbed7b492e19175e67c205216f5fcc4c2b48a2312e3d0fd29f1b28213788c2c7ea71b09740beaf6
+AUX 6.51.081122-overflow.patch 1097 BLAKE2B 86ca19e5f7a69fc1f92b0cfb4c8b90133f83ffdb3e520584ff0a3ab1e089b08d07305aeb1c4833871eeddb03ebbe2b60058d98aae48c53ceb126832b90eec006 SHA512 1446960d662da4f940c5cfe0344f2be2429366d11715e9e1562926c17f3e85315e7224e916881ad9ae9edd6ff7082005424cc3edcb75f0ddecef9d2e535c5b4a
+AUX prekin-6.51.081122-fno-common.patch 878 BLAKE2B 36e979d8850cf82e1cae475bfa488c2063c62bcf67d57831701381256000f5e4b8925a408d31e6a8c7c1a5e036a2507ce93b5d8bf850457a17ab22788e1803bb SHA512 8e46242b91981b96d4964a1c3d657e71d34d1ef118994e5075dd4eb238dc68809ab8dbd8fe328bfb72fe6bcc5701261cac75f57c970b4655306e58b345705855
DIST prekin.6.51.081122.src.tgz 350756 BLAKE2B 657706e83d06be74f2565abb4db1c886c19247b736200cf309cc143f71c7f47e4c85d869b286ec3e250ecb0d714e1454044836001aa6b883513d9149683bb320 SHA512 9a41f30a9de955c78ee5685807482b2b073705643cceb53bf57eaf7c0c4753dc88fa8dc19f09d4c8a07124c3c3c73716f29126860ae37ff4dd6fb6178b829d1f
-EBUILD prekin-6.51.081122-r1.ebuild 934 BLAKE2B c24b0ffb0d9e7ef0fb1a7519cc7eb8d126f0ebb3b4a9754ae7966cc9d6f9415b293f74ebe5617a3e141a34793d1f35dfbe0e980cf4f9b353b3828d4cfd922204 SHA512 1ad9797f5778a892f6e604ab43973f06b18c30acdb9570b0613b1de730dfa2e51ce449426d58ae83613ed5bfb9fb2f05b27913c4e53764b92a34b062f1e5f395
+EBUILD prekin-6.51.081122-r1.ebuild 970 BLAKE2B 06ad6cd657cbf747e650b4b1244c675d3ad61f3f28a4a6ca576d105b38bcd2b65cc2ea5443de85d76d111370b72be466216f2a7b474bdf6c4d1acc619da929e1 SHA512 04027d1533809555de1cf2842c31b7c75eab8a6e73ccd971ee54d48d056623a87b8f9850adb7fd515e34e0e51624ad2f95d4be187ee04e34ca4d7f8aa36221e9
MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
index 5fd9d00d9b06..b562f27e51d3 100644
--- a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
+++ b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.linux b/Makefile.linux
-index 65a021a..3daacd8 100755
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -1,15 +1,15 @@
diff --git a/sci-chemistry/prekin/files/6.51.081122-overflow.patch b/sci-chemistry/prekin/files/6.51.081122-overflow.patch
index 27bc01d61a52..1c6ded314315 100644
--- a/sci-chemistry/prekin/files/6.51.081122-overflow.patch
+++ b/sci-chemistry/prekin/files/6.51.081122-overflow.patch
@@ -1,5 +1,3 @@
-diff --git a/PKIN.h b/PKIN.h
-index 6cb6670..c9c6b89 100755
--- a/PKIN.h
+++ b/PKIN.h
@@ -533,8 +533,8 @@ EXTERN float xnext,ynext,znext,onext,Bnext,Uvalnext;
diff --git a/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch b/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch
new file mode 100644
index 000000000000..207d30152027
--- /dev/null
+++ b/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/707310
+--- a/PKININIT.c
++++ b/PKININIT.c
+@@ -65,6 +65,8 @@ void writeversiontooutput(void); /*041011*/
+ void writechangestooutput(void); /*040215*/
+ void writecmdhelptooutput(void); /*040425*/
+
++extern int Lribbonnew;
++
+ static char* prekinchanges[] =
+ {"\r"
+ ,"020514 Cbeta:Superpos,NB:Prekin,IOmage\r"
+--- a/PKINRIBB.c
++++ b/PKINRIBB.c
+@@ -6,6 +6,8 @@
+ #define PKINRIBB
+ #include "PKINRIBB.h"
+ #undef PKINRIBB
++
++extern int Lribbonnew;
+
+ /*{{{--NOTE-- version, etc. */
+ /*051025 for now, just work with one model, and let prekin's levels==sections*/
+--- a/PKINRIBB.h
++++ b/PKINRIBB.h
+@@ -5,7 +5,7 @@
+ #define PKINRIBB extern
+ #endif
+
+-PKINRIBB int Lribbonnew; /*051025 new ribbon structures: PKINRIBB*/
++extern int Lribbonnew; /*051025 new ribbon structures: PKINRIBB*/
+
+ #define CORDER 4 /*order of the B-spline defined here*/
+
diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index db0c34eca49b..d6f5e98ced6b 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,6 @@ EAPI=6
inherit toolchain-funcs
MY_P=${PN}.${PV}
-
DESCRIPTION="Prepares molecular kinemages from PDB-format coordinate files"
HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
@@ -19,15 +18,17 @@ IUSE="X"
RDEPEND="
x11-libs/libXext
x11-libs/libXmu
- x11-libs/libX11
x11-libs/libXt
+ x11-libs/libX11
X? ( >=x11-libs/motif-2.3:0= )"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
PATCHES=(
"${FILESDIR}"/${PV}-Makefile.patch
"${FILESDIR}"/${PV}-overflow.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_configure() {