gentoo resync : 18.08.2019

3 files changed, 29 insertions, 32 deletions

diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest
index 5395a1f7d8ea..04412a0c79d6 100644
--- a/games-misc/c++robots/Manifest
+++ b/games-misc/c++robots/Manifest
@@ -1,4 +1,4 @@
-AUX proper-coding.patch 1081 BLAKE2B 4c7c3b77e2079a90ac195918e50e2408bb81632f930e9ef547cf09c234db2514db0651247ef6e271a58102400c7054dcbb1f141aea12a80f07805ce06a8c2762 SHA512 cb9fa8f26a9e4a0820d8810f6133d0cd9e0903bc7c01ad8ba07da2f5e40117e574406fa0b89b57c60a7ad535f8fcf1fc6f89f72d84fc524d8d8ddbe8a760305e
-DIST c++robots.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3
-EBUILD c++robots-0-r1.ebuild 614 BLAKE2B a1cede661ecdd0bde0ea388030f15b5e0b2eaf2c4460eb547abb6e13be3da85874436c443830a4728ff0b518486e0a192b0998a58b2bdd12fadc474b06629a1b SHA512 6ef1085c4fc7aed24eab7a521369becbb774e07a475618c13bd8eb57bf71cf824081c0ab87775410864c5f7873190a0adf4fa15648e63f8a336c6d2ad89351c0
+AUX c++robots-0-fix-build-system.patch 1145 BLAKE2B 2c2dfd3f20bad3776696f3f69c0075cd393723bccf1c50e470e6bca6b0b5668d39db50df6762e1e082a0e14e5b21a2f7fa57486c677f1c7c20fab1ce58938f9d SHA512 ccc4038a568e9ee782cf9765a163571d2b1f92ae9e4caea78d869fbe7fbbf5936125a47bfa03ab854ea4598b44fd995696e66ff0fdd0dee1691c122e0caf96a7
+DIST c++robots-0.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3
+EBUILD c++robots-0-r1.ebuild 513 BLAKE2B ba11effbd01203068acfe37e0f251252a79234392a8b641668b396d15b0fcc0d422eeee72a50a1d972bd8e56399fc9b4a9136f1c0abff8acef3ce7c94f8d7964 SHA512 fb2ac0cc87f37c024fbc5e62719ae0e46d05867adba3f7a57a1cb1c21779435cbee5b0ceb5204cfe26d54e39e318a2bc48f8742b004b6fe8eb542d78325f7e37
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/c++robots/c++robots-0-r1.ebuild b/games-misc/c++robots/c++robots-0-r1.ebuild
index bb398f5ac30a..06fad1c7d3c5 100644
--- a/games-misc/c++robots/c++robots-0-r1.ebuild
+++ b/games-misc/c++robots/c++robots-0-r1.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament"
 HOMEPAGE="http://www.gamerz.net/c++robots/"
-SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="static"
 
 S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-PATCHES=(
-	"${FILESDIR}/proper-coding.patch"
-)
-
-src_compile() {
-	local myldflags="${LDFLAGS}"
-	use static && myldflags="${myldflags} -static"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}"
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
 	dobin combat cylon target tracker
-	dodoc README
+	einstalldocs
 }
diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch
index 93b87c1c1da5..ece48ff1c407 100644
--- a/games-misc/c++robots/files/proper-coding.patch
+++ b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch
@@ -1,8 +1,7 @@
---- c++robots.orig/Makefile
-+++ c++robots/Makefile
-@@ -1,38 +1,37 @@
- CFLAGS=-g
-+LDFLAGS=
+--- a/Makefile
++++ b/Makefile
+@@ -1,38 +1,35 @@
+-CFLAGS=-g
  PROGRAMS=combat 
  ROBOTS=cylon tracker target
  
@@ -13,39 +12,41 @@
  clean:
  	rm -f $(PROGRAMS) $(ROBOTS) *.o core
  
- combat:	combat.o 
+-combat:	combat.o 
 -	$(CC) $(CFLAGS) -o $@ combat.o -lm
-+	$(CXX) -o $@ $(LDFLAGS) combat.o -lm
++combat: combat.o
++	$(CXX) $(LDFLAGS) -o $@ combat.o -lm
  
- combat.o:	combat.c 
+-combat.o:	combat.c 
 -	$(CC) $(CFLAGS) -c combat.c
-+	$(CXX) $(CXXFLAGS) -c combat.c
++combat.o: combat.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c combat.c
  
  robots.o: robots.C robots.h
 -	g++ -c robots.C
-+	$(CXX) $(CXXFLAGS) -c robots.C
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c robots.C
  
  cylon: cylon.o robots.o
 -	g++ -static -o $@ cylon.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) cylon.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ cylon.o robots.o
  
  cylon.o: cylon.c robots.h
 -	g++ -c cylon.c
-+	$(CXX) $(CXXFLAGS) -c cylon.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cylon.c
  
  tracker: tracker.o robots.o
 -	g++ -static -o $@ tracker.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) tracker.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ tracker.o robots.o
  
  tracker.o: tracker.c robots.h
 -	g++ -c tracker.c
-+	$(CXX) $(CXXFLAGS) -c tracker.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c tracker.c
  
  target: target.o robots.o
 -	g++ -static -o $@ target.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) target.o robots.o 
++	$(CXX) $(LDFLAGS) -o $@ target.o robots.o
  
  target.o: target.c robots.h
 -	g++ -c target.c
-+	$(CXX) $(CXXFLAGS) -c target.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c target.c