| 1 |
commit: 95b10c044dae2fd990b0c122fcdf49f1f6554582 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 18 11:41:01 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 18 11:41:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b10c04 |
| 7 |
|
| 8 |
games-misc/c++robots: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
games-misc/c++robots/Manifest | 2 +- |
| 14 |
games-misc/c++robots/c++robots-0-r1.ebuild | 22 ++++++--------- |
| 15 |
...ng.patch => c++robots-0-fix-build-system.patch} | 33 +++++++++++----------- |
| 16 |
3 files changed, 27 insertions(+), 30 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest |
| 19 |
index 7af5f1ae7ba..92d1f38d073 100644 |
| 20 |
--- a/games-misc/c++robots/Manifest |
| 21 |
+++ b/games-misc/c++robots/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST c++robots.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3 |
| 24 |
+DIST c++robots-0.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3 |
| 25 |
|
| 26 |
diff --git a/games-misc/c++robots/c++robots-0-r1.ebuild b/games-misc/c++robots/c++robots-0-r1.ebuild |
| 27 |
index bb398f5ac30..06fad1c7d3c 100644 |
| 28 |
--- a/games-misc/c++robots/c++robots-0-r1.ebuild |
| 29 |
+++ b/games-misc/c++robots/c++robots-0-r1.ebuild |
| 30 |
@@ -1,30 +1,26 @@ |
| 31 |
-# Copyright 1999-2016 Gentoo Foundation |
| 32 |
+# Copyright 1999-2019 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
-EAPI=6 |
| 36 |
+EAPI=7 |
| 37 |
+ |
| 38 |
+inherit toolchain-funcs |
| 39 |
|
| 40 |
DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament" |
| 41 |
HOMEPAGE="http://www.gamerz.net/c++robots/" |
| 42 |
-SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz" |
| 43 |
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz" |
| 44 |
|
| 45 |
LICENSE="BSD" |
| 46 |
SLOT="0" |
| 47 |
KEYWORDS="~x86" |
| 48 |
-IUSE="static" |
| 49 |
|
| 50 |
S=${WORKDIR}/${PN} |
| 51 |
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) |
| 52 |
|
| 53 |
-PATCHES=( |
| 54 |
- "${FILESDIR}/proper-coding.patch" |
| 55 |
-) |
| 56 |
- |
| 57 |
-src_compile() { |
| 58 |
- local myldflags="${LDFLAGS}" |
| 59 |
- use static && myldflags="${myldflags} -static" |
| 60 |
- emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}" |
| 61 |
+src_configure() { |
| 62 |
+ tc-export CXX |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
dobin combat cylon target tracker |
| 67 |
- dodoc README |
| 68 |
+ einstalldocs |
| 69 |
} |
| 70 |
|
| 71 |
diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch |
| 72 |
similarity index 53% |
| 73 |
rename from games-misc/c++robots/files/proper-coding.patch |
| 74 |
rename to games-misc/c++robots/files/c++robots-0-fix-build-system.patch |
| 75 |
index 93b87c1c1da..ece48ff1c40 100644 |
| 76 |
--- a/games-misc/c++robots/files/proper-coding.patch |
| 77 |
+++ b/games-misc/c++robots/files/c++robots-0-fix-build-system.patch |
| 78 |
@@ -1,8 +1,7 @@ |
| 79 |
---- c++robots.orig/Makefile |
| 80 |
-+++ c++robots/Makefile |
| 81 |
-@@ -1,38 +1,37 @@ |
| 82 |
- CFLAGS=-g |
| 83 |
-+LDFLAGS= |
| 84 |
+--- a/Makefile |
| 85 |
++++ b/Makefile |
| 86 |
+@@ -1,38 +1,35 @@ |
| 87 |
+-CFLAGS=-g |
| 88 |
PROGRAMS=combat |
| 89 |
ROBOTS=cylon tracker target |
| 90 |
|
| 91 |
@@ -13,39 +12,41 @@ |
| 92 |
clean: |
| 93 |
rm -f $(PROGRAMS) $(ROBOTS) *.o core |
| 94 |
|
| 95 |
- combat: combat.o |
| 96 |
+-combat: combat.o |
| 97 |
- $(CC) $(CFLAGS) -o $@ combat.o -lm |
| 98 |
-+ $(CXX) -o $@ $(LDFLAGS) combat.o -lm |
| 99 |
++combat: combat.o |
| 100 |
++ $(CXX) $(LDFLAGS) -o $@ combat.o -lm |
| 101 |
|
| 102 |
- combat.o: combat.c |
| 103 |
+-combat.o: combat.c |
| 104 |
- $(CC) $(CFLAGS) -c combat.c |
| 105 |
-+ $(CXX) $(CXXFLAGS) -c combat.c |
| 106 |
++combat.o: combat.c |
| 107 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c combat.c |
| 108 |
|
| 109 |
robots.o: robots.C robots.h |
| 110 |
- g++ -c robots.C |
| 111 |
-+ $(CXX) $(CXXFLAGS) -c robots.C |
| 112 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c robots.C |
| 113 |
|
| 114 |
cylon: cylon.o robots.o |
| 115 |
- g++ -static -o $@ cylon.o robots.o |
| 116 |
-+ $(CXX) -o $@ $(LDFLAGS) cylon.o robots.o |
| 117 |
++ $(CXX) $(LDFLAGS) -o $@ cylon.o robots.o |
| 118 |
|
| 119 |
cylon.o: cylon.c robots.h |
| 120 |
- g++ -c cylon.c |
| 121 |
-+ $(CXX) $(CXXFLAGS) -c cylon.c |
| 122 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c cylon.c |
| 123 |
|
| 124 |
tracker: tracker.o robots.o |
| 125 |
- g++ -static -o $@ tracker.o robots.o |
| 126 |
-+ $(CXX) -o $@ $(LDFLAGS) tracker.o robots.o |
| 127 |
++ $(CXX) $(LDFLAGS) -o $@ tracker.o robots.o |
| 128 |
|
| 129 |
tracker.o: tracker.c robots.h |
| 130 |
- g++ -c tracker.c |
| 131 |
-+ $(CXX) $(CXXFLAGS) -c tracker.c |
| 132 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c tracker.c |
| 133 |
|
| 134 |
target: target.o robots.o |
| 135 |
- g++ -static -o $@ target.o robots.o |
| 136 |
-+ $(CXX) -o $@ $(LDFLAGS) target.o robots.o |
| 137 |
++ $(CXX) $(LDFLAGS) -o $@ target.o robots.o |
| 138 |
|
| 139 |
target.o: target.c robots.h |
| 140 |
- g++ -c target.c |
| 141 |
-+ $(CXX) $(CXXFLAGS) -c target.c |
| 142 |
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c target.c |
Archives