summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-09-16 22:16:25 +0200
committerDavid Seifert <soap@gentoo.org>2020-09-16 22:16:25 +0200
commitedf208c731f127baeda79fecafe9834628d81c2c (patch)
treecf6906f34a568cf9ec0efa73989bbf9c8beaba96
parentsys-block/fwdl: Port to EAPI 7 (diff)
downloadgentoo-edf208c731f127baeda79fecafe9834628d81c2c.tar.gz
gentoo-edf208c731f127baeda79fecafe9834628d81c2c.tar.bz2
gentoo-edf208c731f127baeda79fecafe9834628d81c2c.zip
sci-chemistry/suitename: Port to EAPI 7
Closes: https://bugs.gentoo.org/742020 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--sci-chemistry/suitename/files/suitename-0.3.070628-Wimplicit-function-declaration.patch33
-rw-r--r--sci-chemistry/suitename/files/suitename-0.3.070628-makefile.patch29
-rw-r--r--sci-chemistry/suitename/suitename-0.3.070628.ebuild25
3 files changed, 74 insertions, 13 deletions
diff --git a/sci-chemistry/suitename/files/suitename-0.3.070628-Wimplicit-function-declaration.patch b/sci-chemistry/suitename/files/suitename-0.3.070628-Wimplicit-function-declaration.patch
new file mode 100644
index 00000000000..762715abdd4
--- /dev/null
+++ b/sci-chemistry/suitename/files/suitename-0.3.070628-Wimplicit-function-declaration.patch
@@ -0,0 +1,33 @@
+--- a/suitename.c
++++ b/suitename.c
+@@ -25,7 +25,7 @@
+ /*0.2.070628 triage reports zeta-1, epsilon-1, delta-1,... Ltriage codes */
+
+ /****main()*******************************************************************/
+-main(int argc, char** argv)
++int main(int argc, char** argv)
+ {
+ int LOK=1,ibin=0,jclst=0;
+ char sour[32];
+--- a/suiteninit.c
++++ b/suiteninit.c
+@@ -9,6 +9,8 @@
+ #include "suiteninpt.h"
+ #include "suitenout.h"
+
++#include <ctype.h>
++
+ /****initializations()********************************************************/
+ int initializations(void)
+ {
+--- a/suitenutil.c
++++ b/suitenutil.c
+@@ -6,6 +6,8 @@
+
+ #include "suiteninit.h"
+
++#include <ctype.h>
++
+ /****vector7ab()**************************************************************/
+ void vector7ab(float* atob, float* a, float* b)
+ {
diff --git a/sci-chemistry/suitename/files/suitename-0.3.070628-makefile.patch b/sci-chemistry/suitename/files/suitename-0.3.070628-makefile.patch
new file mode 100644
index 00000000000..b4766d4238d
--- /dev/null
+++ b/sci-chemistry/suitename/files/suitename-0.3.070628-makefile.patch
@@ -0,0 +1,29 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -1,24 +1,14 @@
+ # suitename
+
+-ifeq ($(MAKECMDGOALS),debug)
+-CFLAGS = -g
+-else
+-CFLAGS =
+-endif
+-
+-LIBS = -lm
++LDLIBS = -lm
+
+ # ---------------------------------------------------------------------
+
+-OBJS = suitename.o suitenscrt.o suiteninit.o suiteninpt.o suitenout.o suitenutil.o
++OBJS = suitenscrt.o suiteninit.o suiteninpt.o suitenout.o suitenutil.o
+
+ # ---------------------------------------------------------------------
+ HEADERS = suitename.h suitenscrt.h suitenutil.h suiteninit.h suiteninpt.h suitenout.h
+ suitename: $(OBJS)
+- cc -o suitename $(CFLAGS) $(OBJS) $(LIBS)
+-
+-debug: $(OBJS)
+- cc -o suitename $(CFLAGS) $(OBJS) $(LIBS)
+
+ clean:
+ rm -f *.o
diff --git a/sci-chemistry/suitename/suitename-0.3.070628.ebuild b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
index 8441770df5c..2243ccf61e5 100644
--- a/sci-chemistry/suitename/suitename-0.3.070628.ebuild
+++ b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit toolchain-funcs
@@ -11,26 +11,25 @@ DESCRIPTION="The ROC RNA Ontology nomenclature and conformer-list development"
HOMEPAGE="http://kinemage.biochem.duke.edu/software/suitename.php"
SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
+LICENSE="richardson"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="richardson"
-IUSE=""
-S="${WORKDIR}"/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
-src_prepare() {
+src_configure() {
tc-export CC
- cp Makefile.linux Makefile || die
- sed \
- -e 's:cc:${CC}:g' \
- -e "s:-o:${LDFLAGS} -o:g" \
- -i Makefile || die
}
src_compile() {
- emake CFLAGS="${CFLAGS}"
+ emake -f Makefile.linux
}
src_install() {
- dobin ${PN}
+ dobin suitename
}