gentoo resync : 28.04.2018

6 files changed, 28 insertions, 24 deletions

diff --git a/games-arcade/xbubble/Manifest b/games-arcade/xbubble/Manifest
index e818ac957c05..80b4c9ce7f7d 100644
--- a/games-arcade/xbubble/Manifest
+++ b/games-arcade/xbubble/Manifest
@@ -1,7 +1,7 @@
-AUX xbubble-0.5.8-libpng14.patch 415 BLAKE2B 038001e4b7a0ac72d539d7a97441865c042d727184b4a5f8c68d0030c4bd1c7f0bc94bbaacbeae9cc381e44f71bd6255c3956e44bb5deb2211862e11fa01e680 SHA512 9a758ec42807edc205d1c3e6c09f9bd3e392bb44282ae2f5da0627425950a5b12ea10997ac741d81757668b5adf25d94d79db1a3f79555abac9c06c1c908d92a
-AUX xbubble-0.5.8-locale.patch 248 BLAKE2B efe2ef604304c201ae68bdc09e609ba32f69521d9d8f960d7584c6a3997eaa3fbbeee58829447b2f5f9c4d2a0e3eb38d893872d6b9d385d389aab6944174afb0 SHA512 e2fde258a87cb6fc8a7df44d243d56b8b0096be08b59fb0f7180a52c7ec351e09aa43c7cbbc4defe0b3124e1bdfb7089ddfb2b758191c7d2101e14e81813fc2e
-AUX xbubble-0.5.8-png15.patch 694 BLAKE2B e099913cbf031a5d3031d3a58a8ceb6af5eaba9fda0479cf77cf26dd1911823c1796691336cee59b45c852606df9dbf8e8754f9ef8f7cf8639d1e72f64bbd73b SHA512 59be981cc9d4a472d1fce41e28454a82b0b95f0e71ef71530ff256024fc88efeebd4bdb97922c4993dbdef8fbaaaf6c2a203bbc59e25cad8ba0abb9b9f069774
-AUX xbubble-0.5.8-xpaths.patch 200 BLAKE2B 6b991229692f7705f46897f053de8e191079d345bc48fe97c948d9784025ce6dc0d96fc7bb963090435949d1133dc69a37d6542c07d3f254639ff75b9169c312 SHA512 a65c8660c7bfbe8cd149505a8dbeec437547263092ff396acc6bc95599634f5af9abe29bd830603df3577d07ccb13f728bcf073f427f2fcd20a9e6815a5289c4
+AUX xbubble-0.5.8-libpng14.patch 419 BLAKE2B 0111cee77be12e9eb12714aec7c79276c7b316bb47344104e6a171863dd60ef56c287fe460f89552ea448cb26498dffd46d4f4b0ba2b27a2416868390b58bcca SHA512 65e011385081d93ef4d633298726fd1783cc75505610bd54609fdadb7d390366a040856cfddca6444ecaaafb97b6cae69156e6ad96235eb01487680ffe34dd29
+AUX xbubble-0.5.8-locale.patch 252 BLAKE2B ed7312a3e4cd175dd45c3c1e7f8a0b8fc69a8bbd1d7889f722e024cddfa38e6ad82388160e5e03c064d3a60b3c77fcfb15f229c51a35d46b59056544d910e7be SHA512 0154b666cc21496304ed7fab382980e67bc7429ff74bbb5e92cdf2ed42db265b51e4fead878a6d96899eed58e4e5a35af0b2316178bb95ecbb2780fe01947014
+AUX xbubble-0.5.8-png15.patch 698 BLAKE2B 4481e2bf43876e043bc15dc6fff24a931f138628afa252db9e4eaf8a17899fbe2d8bcf8493780163f1c6ee9d1efb077e2240fb7ae4cc950ba40f6766eaa0ed77 SHA512 13f993dbd9e209de6fc13e6f2d656a95e285acec28058d3049f5b4019600a12848ac52e766781ee33273b60b57794897135d57298ae65bdc7348dbddc66a7440
+AUX xbubble-0.5.8-xpaths.patch 204 BLAKE2B 795352b16d86bf722041bba0fa047c12bf20108e175acd58bc30efc6a437387aa31ed97809ef7bf3d937aa205ae05b31776ec925e1025b348fba0af7c0625e4c SHA512 dd6854ef5ca24fa2bc89c3239d79fa0b122525776f4a3df8581566178ac139031abf4b46cea07cca8bbd1a0bbddf2227f20d6a2e4075dc68e7542018fcb69bfd
 DIST xbubble-0.5.8.tar.gz 5544359 BLAKE2B d52d5fd59c795087d6208656227e696b76424a34aa2dee8aced4a63f5105d7b9e95177a63ae71187c0ba07b6a58464c8ecb40b5252980971e9b3dc3799e0717a SHA512 132052d8e57218a2991ce0a0383f69f8818deafbf56046acaa3bc1c8ed7f31e5fb6b9b045df11eb3eaf77a8347b16ad663bb0f727823995e5df6d3adfcb75df2
-EBUILD xbubble-0.5.8.ebuild 1105 BLAKE2B 5184f422abb018d6347b0af297c0ca24959f6ac3b546408bf3dc87f83718a3235c329e00490ecfddfb70726b1793450cf94ea0ee069e6ecb760bb24d7a3b8406 SHA512 c62420995d53483a1783a386d676d55e6cb8c00c41d9043a189bc38057c44c59bf0ed67b86bfb99306132a3e59f8c840938eb93ecec2ca131e2b750f3ee0fdb7
+EBUILD xbubble-0.5.8-r1.ebuild 1095 BLAKE2B bad7066d4966047dabeff7c5bc49421def0b9e69486d3df928f8dadcaa3a9119f094465047a1e2bbaeef525acdcc19a76789e91c36f922f84331fb9fe4791a0d SHA512 bb6f43667345d1aa0c67146f7b959817315bb6e22d75790d2fbf558e6d3c5e8b8bd4be0ceda6a23c517806b7fdff1fb790fc0d7f08a95ccee7e15d47edbf5f63
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
index ad689e29d739..4fe12672db65 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=308731
 
---- src/loadpng.c
-+++ src/loadpng.c
+--- a/src/loadpng.c
++++ b/src/loadpng.c
 @@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha
    }
    /* ensure that we opened a PNG file */
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
index a83d36fbd911..99c03b0c82af 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
@@ -1,5 +1,5 @@
---- src/gettext.h.orig	2008-10-07 12:01:37.000000000 -0400
-+++ src/gettext.h	2008-10-07 12:01:45.000000000 -0400
+--- a/src/gettext.h.orig	2008-10-07 12:01:37.000000000 -0400
++++ b/src/gettext.h	2008-10-07 12:01:45.000000000 -0400
 @@ -24,6 +24,7 @@
  
  /* Get declarations of GNU message catalog functions.  */
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
index 3a0a7d360efb..bbbae5c31076 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
@@ -1,5 +1,5 @@
---- src/loadpng.c.old	2011-09-14 09:58:40.503566961 +0200
-+++ src/loadpng.c	2011-09-14 10:03:39.708531447 +0200
+--- a/src/loadpng.c.old	2011-09-14 09:58:40.503566961 +0200
++++ b/src/loadpng.c	2011-09-14 10:03:39.708531447 +0200
 @@ -73,7 +73,7 @@
      return NULL;
    }
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
index c3dfa83cb5e3..4db0b8f10ccf 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
@@ -1,8 +1,8 @@
 the x_libraries variable isnt always defined
 http://bugs.gentoo.org/92688
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -4511,3 +4511,5 @@
  fi
 +if test x"$x_libraries" != x; then
diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
index b884d4631f12..67c8f575299f 100644
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="a Puzzle Bobble clone similar to Frozen-Bubble"
+DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble"
 HOMEPAGE="http://www.nongnu.org/xbubble/"
 SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.tar.gz"
 
@@ -13,16 +13,21 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXt
-	media-libs/libpng:0
-	nls? ( virtual/libintl )"
+	media-libs/libpng:0=
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
+
 DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-xpaths.patch \
 		"${FILESDIR}"/${P}-locale.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
@@ -36,12 +41,11 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
 	default
 	newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
 	make_desktop_entry ${PN} XBubble
-	prepgamesdirs
 }