gentoo resync : 27.03.2018

7 files changed, 47 insertions, 37 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index bb23071044e5..1ca07c56979b 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index d2e84e5c1a63..e57fd5ee697f 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1,6 +1,6 @@
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
-EBUILD freeorion-0.4.7.1-r2.ebuild 1704 BLAKE2B c5d08ca40e8b09f9088b6844b6a59078979263dee6a4348226badf6c8f3c2b4cb05adf81657c06bf671af0d158b8aecbab241d7611bf637f8d5bdf242b5adceb SHA512 68e486dbea799805372215266835804e0d21f4b71870457bc401aa9d627a0820683fd50586a21705e670e24d83338a703c4ebc3427c71d7ecfdda08dfcfd5e55
+EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
 EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
-EBUILD freeorion-9999.ebuild 1704 BLAKE2B c5d08ca40e8b09f9088b6844b6a59078979263dee6a4348226badf6c8f3c2b4cb05adf81657c06bf671af0d158b8aecbab241d7611bf637f8d5bdf242b5adceb SHA512 68e486dbea799805372215266835804e0d21f4b71870457bc401aa9d627a0820683fd50586a21705e670e24d83338a703c4ebc3427c71d7ecfdda08dfcfd5e55
+EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
index 59dd595f13e8..8d750687b353 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r2.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
-	media-libs/glew:*
+	media-libs/glew:=
 	media-libs/libsdl2
 	>=media-libs/libogg-1.1.3
 	media-libs/libpng:0
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 59dd595f13e8..8d750687b353 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
 	media-libs/freealut
 	media-libs/freetype
-	media-libs/glew:*
+	media-libs/glew:=
 	media-libs/libsdl2
 	>=media-libs/libogg-1.1.3
 	media-libs/libpng:0
diff --git a/games-strategy/maxr/Manifest b/games-strategy/maxr/Manifest
index ee2c4cd14233..aafb56707478 100644
--- a/games-strategy/maxr/Manifest
+++ b/games-strategy/maxr/Manifest
@@ -1,3 +1,3 @@
-DIST maxr-0.2.8.tar.gz 14738324 BLAKE2B 1e0e224cf823e3f9632a28124e9a78c46d6d417894c2df8137a3876b0143c35fb5cf63d2668f947da3e65d3317863fa686c3c7b28a31f38d8bd39ae7739124fb SHA512 22fec9ca773ea68f2639f3cb034ed271a926f99b9b17547bbbdf12a3b47ee445ab311b0766b0656c71b88a258165590431e189e695ef1a86e0fb3b799d1eaa80
-EBUILD maxr-0.2.8.ebuild 673 BLAKE2B a64c446096bafa3be56b07383460749da23142233bbfb44a85d5592554f0e3343d79e24965ea4cedef33c07b1207fdd8c15ac777feb47668f9b91ce7dbd00235 SHA512 17a7421c0ea9031ced42d01e3a4c85af59caba755a96fbf5b80714a0a6b932235946bc91577827f206b49d3484bea9e53261e35ac756178b2290473677eb89c4
+DIST maxr-0.2.9.tar.gz 14847180 BLAKE2B eac99b06f84a2559a6ba601396a43b98014ccea2339bd5f7b8327d000d5a5ddf032c2a1fd1c0bec9e3be16e95e170acf93bc99438400d92eb637c2fa68ebcfed SHA512 8c92d85edf152b1730a8b9e1047d41687cfac816ea854e1ec0b5068a650d399cd3cfc4c47593a2eb83604fd649a05ba649763251104fd70d49bb1cb33d4f58fc
+EBUILD maxr-0.2.9.ebuild 905 BLAKE2B db4edad18201fac4f21235931ad0b7ed569021266c88d33c1a31950c91b6769c752dcb07d9686a6eec5e4e332ed49716d3a58cf621d07917662fc0ac3b7e3618 SHA512 ebb1b7ae8ece72014567df38551ff5e53f98ffa6dae86d1457651f55bcd45d5f8156708284f183b5a2545e88b1394e32ce252e559dec9375f6ae47d26b802c8f
 MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-strategy/maxr/maxr-0.2.8.ebuild b/games-strategy/maxr/maxr-0.2.8.ebuild
deleted file mode 100644
index b183ec9420f9..000000000000
--- a/games-strategy/maxr/maxr-0.2.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Mechanized Assault and Exploration Reloaded"
-HOMEPAGE="http://www.maxr.org/"
-SRC_URI="http://www.maxr.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dogamesbin src/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data/*
-	dodoc ABOUT CHANGELOG
-	doicon data/maxr.png
-	make_desktop_entry maxr "Mechanized Assault and Exploration Reloaded"
-	prepgamesdirs
-}
diff --git a/games-strategy/maxr/maxr-0.2.9.ebuild b/games-strategy/maxr/maxr-0.2.9.ebuild
new file mode 100644
index 000000000000..624345a06b30
--- /dev/null
+++ b/games-strategy/maxr/maxr-0.2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils
+
+DESCRIPTION="Mechanized Assault and Exploration Reloaded"
+HOMEPAGE="http://www.maxr.org/"
+SRC_URI="http://www.maxr.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated"
+
+RDEPEND="media-libs/libsdl2[video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DMAXR_BUILD_DEDICATED_SERVER=$(usex dedicated)
+		-DCMAKE_BUILD_TYPE=Release
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 128 data/${PN}.png
+	make_desktop_entry ${PN} "Mechanized Assault and Exploration Reloaded"
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }