[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/xyza2pipe/, sci-chemistry/xyza2pipe/files/

[Justin Lecher]

commit:     fc4bd834a6be6f6ed37e572a91d9cc8eb78be3f9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 18:37:35 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 18:59:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4bd834

sci-chemistry/xyza2pipe: Bump EAPI to 6

drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/xyza2pipe/Manifest                   |   1 -
 .../xyza2pipe/files/20101129-gentoo.patch          | 152 ---------------------
 sci-chemistry/xyza2pipe/xyza2pipe-20101129.ebuild  |  27 ----
 sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild  |  12 +-
 4 files changed, 7 insertions(+), 185 deletions(-)

diff --git a/sci-chemistry/xyza2pipe/Manifest b/sci-chemistry/xyza2pipe/Manifest
index e724f9fb0d3..f04d406e115 100644
--- a/sci-chemistry/xyza2pipe/Manifest
+++ b/sci-chemistry/xyza2pipe/Manifest
@@ -1,2 +1 @@
-DIST xyza2pipe-20101129.tgz 67301 SHA256 3ef853ee6df8eac521a6670d12278b4b5854919aba5d6519d65c73dadc776695 SHA512 19744d88be04afc8049b38179e96aab9ecd72daf8c6aa99cb21ab6a63d1da440f301bba274cff6ae3f9f4c2eec311294e1fe212bec63c81b22349c698609c1c3 WHIRLPOOL dfacea33e37d09d09d073bdab5e363f403ad1aaa81e9a0311769de57e7b06d12b5edce7362a6bd9bd3c667f089b8138ab699e75a8c8093df81b4fa1de270c72f
 DIST xyza2pipe-20121001.tgz 61002 SHA256 c2e2d83dc6f0424afe519aa0ba83922f1c6d1b90933edf5d62722ac56af3b1de SHA512 b64abf46a8d7f3530eecaeec3bc8b143600c6823174a22727868087c2f7f17af0b538a0521e3a29806dc608b003948a1e31296ab395bc3c0089c5dc7a391d855 WHIRLPOOL fec47032811c81709d996712b938ed315e67435d72ae91c1ce2a01546c62eae4868d7e430585cd4f1830e158a8a994e23af02e6f23a897d44f98a81b2889baac

diff --git a/sci-chemistry/xyza2pipe/files/20101129-gentoo.patch b/sci-chemistry/xyza2pipe/files/20101129-gentoo.patch
deleted file mode 100644
index 11586ee4f81..00000000000
--- a/sci-chemistry/xyza2pipe/files/20101129-gentoo.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7e00197..b078f06 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,10 +4,11 @@
- #  Last modified: Jun/30/2010
- #
- 
--CFLAGS		= -O3 -lm
-+CFLAGS		?= -O3 
-+LIBS			=-lm
- 
- TARGETS		= xyza2pipe ucsf2pipe nv2pipe xeasy2pipe azara2pipe vnmr2pipe xwnmr2pipe\
--		pipe2xyza pipe2ucsf pipe2nv pipe2xeasy pipe2azara\
-+		pipe2xyza pipe2ucsf-olivia pipe2nv pipe2xeasy pipe2azara-olivia \
- 		pipe2proj add2pipe adducsf2pipe addnv2pipe addxeasy2pipe addazara2pipe addvnmr2pipe addxwnmr2pipe
- 
- OBJECTS_C	= checklabel.o checkxyza.o cnvhdr.o\
-@@ -60,86 +61,90 @@ clean:
- 	rm -f $(TARGETS) addxyza2pipe
- 
- .o:
--	$(CC) $< -c -o $@ $(CFLAGS)
-+	$(CC) $(CFLAGS) $< -c -o $@
- 
- xyza2pipe: $(OBJECTS_C) $(OBJECTS_XP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- pipe2xyza: $(OBJECTS_C) $(OBJECTS_PX)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- ucsf2pipe: $(OBJECTS_C) $(OBJECTS_UP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
--pipe2ucsf: $(OBJECTS_C) $(OBJECTS_PU)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+pipe2ucsf-olivia: $(OBJECTS_C) $(OBJECTS_PU)
-+	$(CC) $(CFLAGS) $(LDFLAGS) pipe2ucsf.c $^ -o $@ \
-+	$(LIBS)
- 
- nv2pipe: $(OBJECTS_C) $(OBJECTS_NP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- pipe2nv: $(OBJECTS_C) $(OBJECTS_PN)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- xeasy2pipe: $(OBJECTS_C) $(OBJECTS_EP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- pipe2xeasy: $(OBJECTS_C) $(OBJECTS_PE)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- azara2pipe: $(OBJECTS_C) $(OBJECTS_AP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
--pipe2azara: $(OBJECTS_C) $(OBJECTS_PA)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+pipe2azara-olivia: $(OBJECTS_C) $(OBJECTS_PA)
-+	$(CC) $(CFLAGS) $(LDFLAGS) pipe2azara.c $^ -o $@ \
-+	$(LIBS)
- 
- vnmr2pipe: $(OBJECTS_C) $(OBJECTS_VP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- xwnmr2pipe: $(OBJECTS_C) $(OBJECTS_BP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- pipe2proj: $(OBJECTS_C) $(OBJECTS_PJ)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- add2pipe: $(OBJECTS_C) $(OBJECTS_DXP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 	rm -f addxyza2pipe
- 	ln -s add2pipe addxyza2pipe
- 
- adducsf2pipe: $(OBJECTS_C) $(OBJECTS_DUP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- addnv2pipe: $(OBJECTS_C) $(OBJECTS_DNP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- addxeasy2pipe: $(OBJECTS_C) $(OBJECTS_DEP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- addazara2pipe: $(OBJECTS_C) $(OBJECTS_DAP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- addvnmr2pipe: $(OBJECTS_C) $(OBJECTS_DVP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
- 
- addxwnmr2pipe: $(OBJECTS_C) $(OBJECTS_DBP)
--	$(CC) $@.c $^ -o $@ \
--	$(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $@.c $^ -o $@ \
-+	$(LIBS)
-+
-+install: $(TARGETS)
-+	install -d $(DESTDIR)/usr/bin
-+	install $(TARGETS) $(DESTDIR)/usr/bin/

diff --git a/sci-chemistry/xyza2pipe/xyza2pipe-20101129.ebuild b/sci-chemistry/xyza2pipe/xyza2pipe-20101129.ebuild
deleted file mode 100644
index eda076304f9..00000000000
--- a/sci-chemistry/xyza2pipe/xyza2pipe-20101129.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Cross conversion environment of NMR spectra"
-HOMEPAGE="http://fermi.pharm.hokudai.ac.jp/olivia/api/index.php/Xyza2pipe_src"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="olivia"
-IUSE=""
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-	dodoc README FEEDBACK || die
-}

diff --git a/sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild b/sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
index a6fd740b65e..033619474de 100644
--- a/sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
+++ b/sci-chemistry/xyza2pipe/xyza2pipe-20121001.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Cross conversion environment of NMR spectra"
 HOMEPAGE="http://fermi.pharm.hokudai.ac.jp/olivia/api/index.php/Xyza2pipe_src"
@@ -16,10 +16,12 @@ IUSE=""
 
 S="${WORKDIR}"/${PN}
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
 	tc-export CC
-	mkdir bin
+	mkdir bin || die
 }
 
 src_install() {