gentoo resync : 20.12.2017

10 files changed, 97 insertions, 12 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index b6c48bae2b6c..bf1846bd329e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index d0fea7af4ce1..b66132ad9ea1 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-klotski-3.22.1.tar.xz 1420512 BLAKE2B a3b4656da81ef97301180b4508fd106fcee39318420b7533daea48c57a530502c2d2c08f2a0f874de57ecc735ed641fd05668b9cdd9b5ee46febe4323a869f49 SHA512 18ff2d4f728a0328cb4d640f21b469879960a5a8b0ecdecb76ad021aaa1abc0f179f7d68d8f48c5af4dc57f59e9028fb2b795db05cb1875ea406d86959cf349a
 DIST gnome-klotski-3.22.2.tar.xz 1423652 BLAKE2B 0233c800d1c43b99358d6a5e787c605ff54d408340e3a42f43a1007f23108afc50f063b807aa5c18322943b76fb86a51fa9f3d85d2e0c68586ebbf107161d6f0 SHA512 2899f5ec1da545b5c42f30148c5a3a8b1043744df938aae0b69099144cad55a5dba93168138812e723414006dc86663379299ab4971d7b4da4da8fa2c04fef42
 EBUILD gnome-klotski-3.22.1.ebuild 679 BLAKE2B e053cd4f1e56bbf7bdc5b08be5a300d012d80d187c2ab4f4a879272efc503097ff563acc71e40806bd370b90e39538903e90ec4c54fd343e671668d6c2e1ca06 SHA512 c7a3f662954f9a8898ef590e154d67dfb38ff6eed2642c39e60009e236b913bba79a48cad5a9e3741c1165f10956f2d1ab98835b8177a338c7df3f2373dc34b2
-EBUILD gnome-klotski-3.22.2.ebuild 680 BLAKE2B 73fe9bff1489f4a92d0b7c86fc1790549f862be432051d28116d6af54333511d374df8337666cf74a56aa5ec3c4e44e53b2113885a150951608314ec6ecc4e1d SHA512 d95bdde8e8948a7a7dc3691465441edd5033a2859dbc17c67ad693998575a188ea5a3bd4c3e48c9d9bef3c0dd0e6a96997a0abadcad123f0aa1501a3c27ba970
+EBUILD gnome-klotski-3.22.2.ebuild 679 BLAKE2B e053cd4f1e56bbf7bdc5b08be5a300d012d80d187c2ab4f4a879272efc503097ff563acc71e40806bd370b90e39538903e90ec4c54fd343e671668d6c2e1ca06 SHA512 c7a3f662954f9a8898ef590e154d67dfb38ff6eed2642c39e60009e236b913bba79a48cad5a9e3741c1165f10956f2d1ab98835b8177a338c7df3f2373dc34b2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.2.ebuild
index fd00a9dac514..dd197140a48b 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.22.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.22.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
 LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index f277fddfeb88..b4a880743deb 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,5 +1,5 @@
 DIST hitori-3.22.3.tar.xz 462592 BLAKE2B c80a3c8c7b1f76c3570956eab68862d8e5ae10df4b2795d7150ec57f71a9fd803210b37bdfc02b15ee8ef839ace61ba69fcbb9b454dda3011724d51c9872f151 SHA512 a79e8f8f5e0ca4d202184fc301ddda44e2606ca911b9b3910e50f8ad218cd5047b8749e9c9798f970a107682c7f4fc49475be126c06cdd4a6914e1fa831ed7d5
 DIST hitori-3.22.4.tar.xz 471136 BLAKE2B e9581f9588ab307fba781b3907c1e5d5a34db462a9fa050cf6b2438efbae76ed74fc69623de28a2ec59c4340f487df68156dee453a314adab7cb6846edc347ef SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a
 EBUILD hitori-3.22.3.ebuild 555 BLAKE2B 00ee8a59a0735d72bc6a4a5b4e005b9d272da3514044cd1501a05fec43b640a8835bf109237e27904727dabb5fda085baf891ce3603d0f37b26ad646fb8d1ac2 SHA512 5644692be1b2d64887746c951d85065832af2a36273f60619f29d159b527a2a7431c633c35e6fdcdb5b07c9ed2cb0cbdbb3182fe4058b766eef781b539960dc0
-EBUILD hitori-3.22.4.ebuild 556 BLAKE2B c88753065ce4d96f98268f872780f5d6e1f0727dfdb676a0750f6b5204f09e03b9f49abd5e2437e8b99b5353e9125d2f137c68d4bfa021be0b9353460d3fbc31 SHA512 5318ed38d5832ac64cdd333ab23010f28d8c64d7b5f0d4c4450d5afb42cfa7e3b6a828a52e08c46270e82f13e293e420cfc1b19049ef27cb92d0f9f7c94dd56b
+EBUILD hitori-3.22.4.ebuild 555 BLAKE2B 00ee8a59a0735d72bc6a4a5b4e005b9d272da3514044cd1501a05fec43b640a8835bf109237e27904727dabb5fda085baf891ce3603d0f37b26ad646fb8d1ac2 SHA512 5644692be1b2d64887746c951d85065832af2a36273f60619f29d159b527a2a7431c633c35e6fdcdb5b07c9ed2cb0cbdbb3182fe4058b766eef781b539960dc0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
index 5f828369077a..aa2927ffbd30 100644
--- a/games-puzzle/hitori/hitori-3.22.4.ebuild
+++ b/games-puzzle/hitori/hitori-3.22.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 # gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 637ae512f753..0e5f1f9edcfb 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -1,6 +1,8 @@
 AUX pingus-0.7.6-echo-e.patch 489 BLAKE2B 4268205c1c12bc5e8d4a4fb44b49b15b460763a10056a0720b28c25e76a23a0fa8568ca8163195f6ab531084fdd25c53c78d6caf8e7301123621cff58f39e10c SHA512 eb9f2859dcd68b2c1158499435a4742062069cb148e6658396c36fed6b1bba7589d9fbace40c25052e6d42a2b05cdca49561be45053dd9716ee9d9f41a5ab612
-AUX pingus-0.7.6-gcc47.patch 1242 BLAKE2B 2321f7451751359839fd100cf95e29ff4de1adab0d01b020d4db7dd9d9e36351193698b31a60bff6a46e91a96d355c9339b4db9bf5488f4801feb3d062f312e3 SHA512 998aa2c9547fe82775442b8f234d07724642e342d7ccea724726c9210559b1cc8ea5e19d51c7d0bbf61b523cb83fa198596b25e6c6e1ce9882d75d73b9d67f68
-AUX pingus-0.7.6-noopengl.patch 388 BLAKE2B 721dadd62e699db7de96ba01fb96015beedde857181a9aecfc4f82aa5bdc75d0be865ba0aa0e2bcec56fd5eb535b52ccbe234669995da637f325cc97844bb256 SHA512 431226d068ffdadf33cd1b73c86e2e2e43de3def166c42cd0592b58e0025f842f579bafa4532f45acf05f4490189d26c679a4b0bcf4f16818aea307b2efe5eb2
+AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0e2ea7c00a0738915a92fd3dd4b5f51fe6dac3f7bd0cb84fea72f68f9e8edbac398b4d067dd7be2ff76560bb7be SHA512 7be7935ad664cde7c78d4363eef7391783ea868f096fc9dd03ce3e3eaaab69a839da5cb569449c106eae1779c41d9850f1a5683542bea4bf5cb98570f9d18e7d
+AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
+AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
+EBUILD pingus-0.7.6-r1.ebuild 1253 BLAKE2B 25eed15f964e23218a4b4630f983363905ca979bd52095313bf4ba03315bb452e85881cd7753983864abf17de6ffb01dbd6ee021bfd612bd3f4c06d07d1aa3ee SHA512 25be9d4a2ac75ecf92ed0e98246d040d3ead20e3fccb8e8066e9c2254779225085629ead3f2663eb4090ef2bb6d3bbfb9590d29a35d03cbf7234eff1e4732878
 EBUILD pingus-0.7.6.ebuild 1226 BLAKE2B edbf7d1ab7eb2c771478fbf96c5c7a8d5448ea80a4bee4bc1a565e2ee452c68050e76b4d286daec1b84c56f30c1520a5e7c586677ee1ec13619dc314fdbb5ae4 SHA512 8546fc592c8dc7462b64535b70572ff45e828efb6e05b5dac4c059921c0428c998feba6a80e0788925e957a557c2beadfbbae6908379eacd145286d2a731606c
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
index b1397da31f68..3c1cac5589e4 100644
--- a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
@@ -1,5 +1,5 @@
---- src/pingus/pingus_main.cpp.orig	2012-07-08 14:02:40.343767438 +0200
-+++ src/pingus/pingus_main.cpp	2012-07-08 14:02:54.062768168 +0200
+--- a/src/pingus/pingus_main.cpp
++++ b/src/pingus/pingus_main.cpp
 @@ -465,7 +465,7 @@
  void
  PingusMain::print_greeting_message()
@@ -9,8 +9,8 @@
    greeting += "!";
    std::cout <<  greeting << std::endl;
    for (unsigned int i = 0; i < greeting.length(); ++i)
---- src/pingus/screens/pingus_menu.cpp.orig	2012-07-08 14:03:05.549768782 +0200
-+++ src/pingus/screens/pingus_menu.cpp	2012-07-08 14:03:17.015769393 +0200
+--- a/src/pingus/screens/pingus_menu.cpp
++++ b/src/pingus/screens/pingus_menu.cpp
 @@ -153,7 +153,7 @@
                           gc.get_height()/2 - 280));
  
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
new file mode 100644
index 000000000000..bf04ccd047cc
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
@@ -0,0 +1,21 @@
+From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 30 Jan 2017 15:41:53 +0000
+Subject: [PATCH] Add missing header for std::function and std::bind
+
+---
+ src/pingus/screens/demo_session.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
+index e3ec49a2c..f887e50f0 100644
+--- a/src/pingus/screens/demo_session.cpp
++++ b/src/pingus/screens/demo_session.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <algorithm>
+ #include <iostream>
++#include <functional>
+ 
+ #include "engine/gui/gui_manager.hpp"
+ #include "engine/gui/surface_button.hpp"
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
index e474ef7376e5..6d1af794b032 100644
--- a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
+++ b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
@@ -1,5 +1,5 @@
---- src/engine/display/display.cpp.orig	2012-06-30 00:30:13.043995049 -0400
-+++ src/engine/display/display.cpp	2012-06-30 00:30:28.194501544 -0400
+--- a/src/engine/display/display.cpp
++++ b/src/engine/display/display.cpp
 @@ -28,6 +28,7 @@
  #include "engine/display/delta/delta_framebuffer.hpp"
  #include "engine/display/null_framebuffer.hpp"
diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..968fa1f3342a
--- /dev/null
+++ b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="http://pingus.seul.org/"
+SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl music"
+
+RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noopengl.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-echo-e.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+	default
+	strip-flags
+}
+
+src_compile() {
+	escons \
+		CXX="$(tc-getCXX)" \
+		CCFLAGS="${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		with_opengl=$(usex opengl 1 0)
+}
+
+src_install() {
+	emake install-exec install-data \
+		DESTDIR="${D}" \
+		PREFIX="/usr"
+	doman doc/man/pingus.6
+	doicon data/images/icons/pingus.svg
+	make_desktop_entry ${PN} Pingus
+	dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}