gentoo resync : 02.05.2018

7 files changed, 73 insertions, 72 deletions

diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
index 1502c209c0cb..886ec33ffad3 100644
--- a/games-puzzle/icebreaker/Manifest
+++ b/games-puzzle/icebreaker/Manifest
@@ -1,7 +1,7 @@
-AUX icebreaker-1.9.6-gentoo.patch 8571 BLAKE2B 0b2fe5a4c370a994646a4b6951cdc2f6e2216746550eaf094971429f3a5d8ebbd4520e3d961ce72c5cdd041c97de3c14fdac73e2d887dc2cf73bdcac78335cde SHA512 11eead6a2c01b45b9ee18d761ca6ddd3fc565f046e03ac32a270232e90251470abf9b02cb179fabd734432ae0d5330f524cc6ce07ff975b9f330f6c6f0d0e0ca
-AUX icebreaker-1.9.6-ldflags.patch 870 BLAKE2B e76dfab6a28b607fe0e9c2953735c38364bfd935e3a6737639ce79064899b3d61e46b46d56233f60fcc45481fcbeedaf302e044bc5e75605877124ae347b3307 SHA512 5f3a2788cad993e625b8a6f848b2b839d07b257dd8c401e2699683a585175d686c25c69b7b477d4062db6fec9f03730c53c90dd92e9854070f9fdd6d17d7cdbf
-AUX icebreaker-1.9.6-ovfl.patch 695 BLAKE2B 4fbce0ef21e060dde1bae921b661706a7ca977a04084e861c25f698174115a3cf9ac7ba6fc33af7efc63370625ce440bd3e3c4d58526dbce9b87caef22b16f33 SHA512 0875ed515da7f03e49bb7ccaf58c7dfcbd03574c2742e54da248423c0c8bd4257f2d7ce9f2fd3aac6d00336fd23bdb131fdb1a9398e31600f6bddbd23e513c1e
-AUX icebreaker-1.9.6-parallell-install.patch 1183 BLAKE2B 666ccf94d47b1e8e614009e8d5b67eb0c67d7fbb5eb40bc33b520230a8e5a90410f6316b9dd2d4fd6453331007120f0f3ed62cb4bdb9817ca4026c8a563794e5 SHA512 7eeaa07111ee6443f9ebcb3b0bd55dccb1ed6ca3137df2b5c407dcc696c5946bc7643847d0d347761e4e8311871788cf9120a615da715e602f27af077858cfc7
+AUX icebreaker-1.9.6-gentoo.patch 8599 BLAKE2B b572190c99b2d3d27cebf80751df57d6c80e36189d95e98c11987232ce630668d1158fa2bdb62d09e584a48d42e1cc1618cd607661809b4972e558ce796843a4 SHA512 36685c3a0534305d13385f88b259ece8befdeb1115c0e5958ec2edde5cb3502b213c4b7b2f39a8a2183bab94385b0c2e678346b4175f1a1aa057269b011a6a1c
+AUX icebreaker-1.9.6-ldflags.patch 874 BLAKE2B e888051b968e3139f21a4a912e8dbeb891d9c93bbe96d1a9ceb5a3d5690eb2ae4f74d7afe9aca3892011341d034f2648e41f8ee5bfc5d6ad392add8d3ea85457 SHA512 1c27aa4373744f3a5d59643d36a950aa50377b5ef26fec988754d66860dc3f262bb46e82e40cf4222abb000f0a7ab4aac03d9508e55536212fa5eb7d1a0f5e5f
+AUX icebreaker-1.9.6-ovfl.patch 699 BLAKE2B 9203cb2007abe94d6746512c1bdeca9a0163fda87c443ce9ca4b99a0a435d5553ed972ea368f7717912ec8c9c994f3471f14f187be336738dee6ee70de95c2f8 SHA512 49dae47f4f4d446fbdcb0f5faaa6ff01ecacd695d0af01e10f70001245680116e83aa78b2a9cb4fa80e0641e4cb02c5fc09c0fa87cc79207aa5c5d4dca5f0658
+AUX icebreaker-1.9.6-parallell-install.patch 1187 BLAKE2B 52c23882a6a1f6c265232effed850f34caebdbc8c63e15268e3f1a6fe42c604c5a9ca7d2c20eaee22c896733f7d77752ce7f75e30fdc49664954e302ea4034e5 SHA512 d315283c5e0605e4cddaebc1d891b72a86cd0e6f27693864896ac6557fd4c0f9e748e648b11ae8682d6d47ad9ff0f4c9d63fd4dde09e621886a70828001b8327
 DIST icebreaker-1.9.6.tgz 137333 BLAKE2B 3fdfde734f868493313a2a7b018582f79d6140fa71c1802a27b558d2973968eb9cc01efb55c0b5a45d95cd4d1bc94b66f74809a82853d6d8c0ce1b7bf767e362 SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b
-EBUILD icebreaker-1.9.6.ebuild 1077 BLAKE2B 1f4755180f454020836538466b1cc6b509ca69d157fdebe6b79e0978c18590fb81c11b7d743d57e2c0711d53e03a3c066452be5fa65a0484f0c5ba32e64882b1 SHA512 8a6562e7f03886ee3a364c48679a01c930f63d35527c41ad847875bc9d008b9bef6d709622339572fe921d9e81bf6190b18318f6941de1e07ee41415e91df9da
+EBUILD icebreaker-1.9.6-r1.ebuild 963 BLAKE2B 7e603e75245f247bc1f4f0312228891a585fbc791dfb09da804af15741c03ee66acbd7f991b36d4a190057c8216890eb6b22991c1aa3329b32ac0c5631f38e17 SHA512 2a65988b2199477a930771f03b0a2c215e6e7844c87ace0a2499358c9e8f0a0789c8db658f8963a4f93a82d87b021c0cb2324661163cb04322447ed0cf1e7e0b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
index d6e16a6c39a6..846d5b4141bc 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
@@ -1,5 +1,5 @@
---- dialog.c
-+++ dialog.c
+--- a/dialog.c
++++ b/dialog.c
 @@ -279,10 +279,10 @@ PopupReturnType popuphighscores()
  
  	for (i=0;i<HISCORENUM;i++)
@@ -22,8 +22,8 @@
  	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf);		
  	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!");		
  	
---- menu.c
-+++ menu.c
+--- a/menu.c
++++ b/menu.c
 @@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu()
  
  	if (strlen(commandline.theme)>0)
@@ -57,8 +57,8 @@
  			}
  			else // right or middle or scroll back
  			{
---- hiscore.c
-+++ hiscore.c
+--- a/hiscore.c
++++ b/hiscore.c
 @@ -72,7 +72,7 @@
  	// make sure all entries are zeroed out to start.
  	for (i=0;i<HISCORENUM;i++)
@@ -102,8 +102,8 @@
  		hival[i]=temphiscoreval[arrayindex[i]];
  	}
  }
---- line.c
-+++ line.c
+--- a/line.c
++++ b/line.c
 @@ -30,8 +30,9 @@
  
  Line createline(int linenum)
@@ -115,8 +115,8 @@
  	switch (linenum)
  	{
  		case 1: 
---- options.c
-+++ options.c
+--- a/options.c
++++ b/options.c
 @@ -66,7 +66,7 @@
  	options.autopause=AUTOPAUSEOFF;	
  	options.difficulty=NORMAL;
@@ -171,8 +171,8 @@
  			}	
  		}
  		else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0)
---- penguin.c
-+++ penguin.c
+--- a/penguin.c
++++ b/penguin.c
 @@ -40,8 +40,9 @@
  
  Penguin createpenguinxy(int x, int y)
@@ -184,8 +184,8 @@
  	switch (random() % 4)
  	{
  		case 0:
---- themes.c
-+++ themes.c
+--- a/themes.c
++++ b/themes.c
 @@ -183,7 +183,7 @@
  
  	foundcolor.spritetransparent = 0;
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
index 44ef9bdf8631..93b40fc67687 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-10-11 12:20:01.274684641 -0400
-+++ Makefile	2010-10-11 12:22:02.256897083 -0400
+--- a/Makefile.orig	2010-10-11 12:20:01.274684641 -0400
++++ b/Makefile	2010-10-11 12:22:02.256897083 -0400
 @@ -1,5 +1,3 @@
 -CC=gcc
 -
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
index 03050be548fb..5e8ffc01d8d2 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
@@ -1,5 +1,5 @@
---- menu.c.old	2013-06-24 22:09:11.606750080 +0200
-+++ menu.c	2013-06-24 22:25:51.635735351 +0200
+--- a/menu.c.old	2013-06-24 22:09:11.606750080 +0200
++++ b/menu.c	2013-06-24 22:25:51.635735351 +0200
 @@ -522,7 +522,7 @@
  		{ // "random", at the end/beginning of the list
  			
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
index de388d9b5758..419262791d98 100644
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-19 10:26:18.000000000 +0200
-+++ Makefile	2010-10-19 10:38:28.000000000 +0200
+--- a/Makefile.old	2010-10-19 10:26:18.000000000 +0200
++++ b/Makefile	2010-10-19 10:38:28.000000000 +0200
 @@ -196,26 +196,30 @@
  themes-install: install-themes
  
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..f064951fac68
--- /dev/null
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Trap and capture penguins on Antarctica"
+HOMEPAGE="http://www.mattdm.org/icebreaker/"
+SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-parallell-install.patch
+	"${FILESDIR}"/${P}-ovfl.patch
+)
+
+src_compile() {
+	emake \
+		OPTIMIZE="${CFLAGS}" \
+		prefix=/usr \
+		bindir=/usr/bin \
+		datadir=/usr/share \
+		highscoredir="/var"
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		bindir="${D}/usr/bin" \
+		datadir="${D}/usr/share" \
+		highscoredir="${D}/var" install
+
+	newicon ${PN}_48.bmp ${PN}.bmp
+	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
+	einstalldocs
+}
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
deleted file mode 100644
index 449e0864f626..000000000000
--- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Trap and capture penguins on Antarctica"
-HOMEPAGE="http://www.mattdm.org/icebreaker/"
-SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-parallell-install.patch \
-		"${FILESDIR}"/${P}-ovfl.patch
-}
-
-src_compile() {
-	emake \
-		OPTIMIZE="${CFLAGS}" \
-		prefix=/usr \
-		bindir="${GAMES_BINDIR}" \
-		datadir="${GAMES_DATADIR}" \
-		highscoredir="${GAMES_STATEDIR}"
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		bindir="${D}${GAMES_BINDIR}" \
-		datadir="${D}${GAMES_DATADIR}" \
-		highscoredir="${D}${GAMES_STATEDIR}" install
-	newicon ${PN}_48.bmp ${PN}.bmp
-	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
-	dodoc ChangeLog README* TODO
-	prepgamesdirs
-}