gentoo resync : 22.01.2021

5 files changed, 14 insertions, 82 deletions

diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
index 388e17d48c63..85651a00de3d 100644
--- a/games-action/clanbomber/Manifest
+++ b/games-action/clanbomber/Manifest
@@ -1,6 +1,3 @@
-AUX clanbomber-2.1.1-automake112.patch 373 BLAKE2B 1ab75583820147ea9e61293b46ab7e8e4eadd2c8b2ff2438543878d980f1f15fc6ec61c8c2d6b2f8aff48dcbe39088a25066896060147cc37744a0d8cc343a01 SHA512 65b4ea53e098daea63f5cf5cb5da98bfa712e16f8346a38f06389329b80c3180f68da1b08bec422b712bd79e5911480094f6a6f446673022e10846b4995aa755
-AUX clanbomber-2.1.1-boost150.patch 1140 BLAKE2B 9e398fb8a6c40df8f6e5d604c34c9ed268143d096a1f90dccc8942bdd5492b59ce6ced3c1a26fa5ab72ed8ee5bf2aefd590ced38166cb1a6726e34c6ab8a8d7f SHA512 cdd0b5ca38d6cee6f4e8afbccca956fb0dd8d2b84aef714cd2c8499a6b53e62016c51d58d389adcde95dd06b08b7b749428677d414ef792123d04e6cc8493806
-AUX clanbomber-2.1.1-gcc6.patch 408 BLAKE2B a8e542f845cb1ff06ea9fc3ae19346a61a7ff0a450719fd95b9ee532ad0fe6f1434626553f5ac9a815e91ae798cad891f7ef37ac9a2848ff814eaa0f8b4360c6 SHA512 8f51ea2b0b9dc7323710b7a5e91b3622ac728f035c19d7e5c01731d87f0cce3f5c6d54905f42811f46b0a68e899aad0ad23d099039b9fa329c7245e27e2fadfd
-DIST clanbomber-2.1.1.tar.lzma 2070392 BLAKE2B ba6e183a5469a30949a4441f9f40df8f87271c741110ddcc17f584f0f59564a041e5b74214b53ccddbae7df46ffc573a866e1089db0a782e7c73dda1c2d4ac6f SHA512 b2d634c20d60cd7c080263a8ebea931bd623342c32380494c0076441021719135ca7861e0467e0c71cd46bb4ed85d3ce364dbfa2c8399eaf058f62f294a21c32
-EBUILD clanbomber-2.1.1-r1.ebuild 1140 BLAKE2B 8523e57f860752d2383428752795daec71a2726c1901ab1d92251a659d35f513cee8afbcc51d9497fc939e6b6c4078815c5eec0f5a94e9aeea5eb51d1272ee3b SHA512 ddb8593ec63f1ba04dfd954e5bd394685ad28c5ca91483415a8a82e27316527845521ceb078b5d8914eb2f0b59f284b7024f5334fca8b60520ad37637164da01
+DIST clanbomber-2.2.0.tar.xz 2118672 BLAKE2B fd384d01552231fb3d823b07a1248c6ca0d1c5bb5f7f8d7dae3a71387d457d789c2dfabb69817233fac95699b9bd96e52846e736de8c55735bb67be7edb5b158 SHA512 307921d118286dcfd29ce96e0a35dfdc389dae6bd71a7dfd088311f611a75b167c1018542b5dc59c26bfb808a985011f6691c297cc8dd472da0fe5e005a401d5
+EBUILD clanbomber-2.2.0.ebuild 1007 BLAKE2B f8d0159e1a9fa401fb8c20151dc1af8fb0e42d3a3096655dec4479a5922485d8dfd34149d120e09b8b651dead12537edfec6f9d0284c65197816b67c63ef368f SHA512 21c77a4ac41feaeda27d73d1f2a08662e0b0e45f3ff0a41b41a09d6f7a6659aea531dab21eae221e8e286a7df8a040e60d80da6734c4f1af66d32f67876bd27d
 MISC metadata.xml 755 BLAKE2B 6d1d3b5426723f6b8f98d4fb59a2bc098323f34bb1b0ad99b7296debdd3e216075fc4ee8b38c29ff78e1cdb0dfb877d205f14a97ba66348a3dde51afa5255245 SHA512 b46a19a5ba071d38cc18c23019d0077893ac8f1303aba357343afe129ad4f7f6e3b194f765485945712cef788291c93a105ba59c9e94dc507937d9f78f28b387
diff --git a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild b/games-action/clanbomber/clanbomber-2.2.0.ebuild
index b6f4ba83831f..4458ddf64950 100644
--- a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.2.0.ebuild
@@ -1,37 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Bomberman-like multiplayer game"
 HOMEPAGE="https://savannah.nongnu.org/projects/clanbomber/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.lzma"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	dev-libs/boost
+	dev-libs/boost:=
 	media-fonts/dejavu
 	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog ChangeLog.hg IDEAS NEWS QUOTES README TODO )
 
-PATCHES=(
-		"${FILESDIR}"/${P}-automake112.patch
-		"${FILESDIR}"/${P}-boost150.patch
-		"${FILESDIR}"/${P}-gcc6.patch
-)
-
 src_prepare() {
 	default
 	sed -i -e 's/menuentry//' src/Makefile.am || die
@@ -40,9 +34,11 @@ src_prepare() {
 
 src_install() {
 	default
+
 	newicon src/pics/cup2.png ${PN}.png
 	make_desktop_entry ${PN}2 ClanBomber2
-	rm -f "${D}/usr/share/${PN}/fonts/DejaVuSans-Bold.ttf" || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+
+	rm "${ED}/usr/share/${PN}/fonts/DejaVuSans-Bold.ttf" || die
+	dosym ../../fonts/dejavu/DejaVuSans-Bold.ttf \
 		/usr/share/${PN}/fonts/DejaVuSans-Bold.ttf
 }
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch b/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
deleted file mode 100644
index 5fce5be335aa..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2012-11-15 09:35:24.682199511 +0100
-+++ b/configure.ac	2012-11-15 09:36:02.367839076 +0100
-@@ -2,7 +2,7 @@
- AC_PREREQ([2.63])
- AC_INIT([ClanBomber], [2.1.1], [rsl@members.fsf.org])
- #AM_INIT_AUTOMAKE([-Wall -Werror foreign])#foreign is for NEWS COPYING ETC
--AM_INIT_AUTOMAKE([dist-lzma -Wall -Werror])
-+AM_INIT_AUTOMAKE([-Wall])
- 
- 
- #CXXFLAGS="-O6 -g3"
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch b/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
deleted file mode 100644
index f3e67666a22d..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/MapEntry.cpp	2012-11-15 10:55:40.123259605 +0100
-+++ b/src/MapEntry.cpp	2012-11-15 10:57:35.217379211 +0100
-@@ -50,7 +50,7 @@
-   enabled = true;
- 
-   // extract map name
--  map_name = filename.stem();
-+  map_name = filename.stem().string();
- 
-   // is the file writable?
-   if (access(path / filename, W_OK) == 0) {
---- a/src/Map.cpp	2012-11-15 10:52:56.884424228 +0100
-+++ b/src/Map.cpp	2012-11-15 10:54:16.334992079 +0100
-@@ -116,7 +116,7 @@
-     for (boost::filesystem::directory_iterator dir_iter(path);
-          dir_iter != end_iter; dir_iter++) {
-       if (dir_iter->path().extension() == ".map") {
--        map_list.push_back(new MapEntry(path, dir_iter->filename()));
-+        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
-       }
-     }
-   }
-@@ -126,7 +126,7 @@
-     for (boost::filesystem::directory_iterator dir_iter(path);
-          dir_iter != end_iter; dir_iter++) {
-       if (dir_iter->path().extension() == ".map") {
--        map_list.push_back(new MapEntry(path, dir_iter->filename()));
-+        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
-       }
-     }
-   }
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch b/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
deleted file mode 100644
index 714e9de85fa2..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Credits.h
-+++ b/src/Credits.h
-@@ -47,7 +47,7 @@
- 	int   speed;
- 	bool  stopped;
-  private:
--	static const float yoffset_start = 50;
-+	static const float yoffset_start;
- 	static const int normal_speed = 40;
- 	static const int text_height = 40;
- 	
---- a/src/Credits.cpp
-+++ b/src/Credits.cpp
-@@ -273,3 +273,5 @@
-       (*draw_list_iter)->show();
-     }
- }
-+
-+const float Credits::yoffset_start = 50;