gentoo resync : 30.12.2017

3 files changed, 52 insertions, 13 deletions

diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
index 9d0493251652..df7ee06231c9 100644
--- a/app-cdr/gaffitter/Manifest
+++ b/app-cdr/gaffitter/Manifest
@@ -1,4 +1,5 @@
+AUX gaffitter-0.6.0-fix-build-system.patch 713 BLAKE2B f4faa44bd548d8a806a18e4a86a336c64f045e9bb82f1a4fbe657346e45865ab78e3c28b582a2a43e95a0561cbe2bafd626d1130d73044bcb114546b5eca466b SHA512 72724f2c638ad93d5a10991a1f0b674a2977b6b8a97956cfc08db456dad5775ca35e1fe49848a103ab0a335351a40ce792613263adcba2df7985f48b109ef3b2
 DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
 DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
-EBUILD gaffitter-0.6.0-r1.ebuild 1011 BLAKE2B 76254cbfedbfbaa89d4787eeb6a5b0ac7b32f801a816812d5ed4eebbe068823f155a9f5a5afc9e174dbc7a1f0ac1fb75666b6046cc58336ccc3f6d85d3503cab SHA512 1ccafc7e2114a2dd06a1bf192d7fa936f8588bd523342a25b47a72ce6e737150409d950d6ea76ddc9ff4b60b0545301d7034a3b829c7b4db32ca2caea99caac1
+EBUILD gaffitter-0.6.0-r1.ebuild 882 BLAKE2B 251e65386c7ff36d5fe8fe3e100b7ea19f983a44a8f1ffbaeb7f4088e4538aff21124ae8d676b3b785071100ce0a0e9cbe9f88d2531512937d522f18064173b0 SHA512 7457798f7c242fd904e47391d76d44fc6de3c962574487fedb90a031029bde84785e6c9af8f8a60eac27bb586febc761c588783d659f08432a360c76b98d8bf9
 MISC metadata.xml 433 BLAKE2B 12c8e3692c80100cfa835c65e6609b2d104075fb687bc8b5a48f018570c70e476d102bedcbb713223d093b0843360488842ec3ed23ac4ed4054da704b90f51d3 SHA512 d1fcf8060649dbf5ee3fcfd24a4ac29167e0d4ae34529de8cfefb260a28ffbae476ce393a6a5c6cedf0283ce73f79acedbe5567a2cb9402017209a5048900a2e
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
index 000000000000..df7d99b9c31e
--- /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 185ce7a34e7a..f3f46c1d5e98 100644
--- 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"
 }