app-cdr/gaffitter: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
new file mode 100644 (file)
index 0000000..df7d99b
--- /dev/null
+++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
@@ -0,0 +1,32 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,28 +6,14 @@
+                         optimizers/BestFit.cc optimizers/Split.cc \
+                         util/CmdLineParser.cc
+ 
+-INCLUDES = -I/usr/local/include -I.
+-CXX = g++
+-CXXFLAGS = -O3 -Wno-long-long $(INCLUDES)
+-LIBPATH = 
+-LIBS = 
+-LDFLAGS = $(LIBPATH) $(LIBS)
+-
+ ###########################################################################
+ 
+ OBJS = $(CPPFILES:.cc=.o)
+ 
+-.SUFFIXES: .o .cc 
+-
+-.cc.o:
+-      @echo $<:
+-      $(CXX) $(CXXFLAGS) -c $*.cc -o $*.o
+-
+ default: gaffitter 
+ 
+ 
+-gaffitter: $(OBJS) gaffitter.cc Params.h
+-      $(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS)
++gaffitter: $(OBJS) Params.h
+ ###########################################################################
+ 
+ objs: $(OBJS) 

diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
index 185ce7a34e7afd961a59cf5aba1417db902d77f0..f3f46c1d5e98c772ede7b077114fe7887983fe3d 100644 (file)
--- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
+++ b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -10,29 +10,35 @@ SCRIPTS="scripts-${SV}"
 
 DESCRIPTION="Genetic Algorithm File Fitter"
 HOMEPAGE="http://gaffitter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-       scripts? (
-       mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
+SRC_URI="
+       mirror://sourceforge/${PN}/${P}.tar.bz2
+       scripts? ( mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="scripts"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6.0-fix-build-system.patch )
+
 src_prepare() {
-       sed -i  -e "/^INCLUDES\ =.*/d" \
-               -e "s/^CXXFLAGS\ =.*/CXXFLAGS\ =\ ${CXXFLAGS} ${LDFLAGS}/" \
-               -e "s/^CXX\ =.*/CXX\ =\ $(tc-getCXX)/" src/Makefile || die "sed failed"
+       default
+
        if use scripts; then
                sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
        fi
 }
 
+src_configure() {
+       tc-export CXX
+}
+
 src_install() {
-       dobin src/gaffitter || die "dobin failed"
+       dobin src/gaffitter
+       einstalldocs
+
        if use scripts; then
-               dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-** || die
-               dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-* || die
+               dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-**
+               dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-*
        fi
-       dodoc AUTHORS README || die "dodoc failed"
 }