gentoo resync : 02.05.2018

4 files changed, 238 insertions, 18 deletions

diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index 4713a979e1fe..8e94145345ed 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,4 +1,5 @@
-AUX gnurobbo-0.66-underlink.patch 854 BLAKE2B 97a2dfb7c331623650524c0148e836dd414a9cf5e5997e2f6bfbcb6ed9af661b8e498c840c4b3764aa2961b7017876dfb124567759333c242c455cb2a2f74241 SHA512 ceb1b173aec2302de8639cd150cae038e14454bf82cdd2389c2c6a183c17e74090c1e1af9023a54d8d53e233ddb996b1ecb73403caba2962508e2f791012b355
+AUX gnurobbo-0.66-hardening.patch 6763 BLAKE2B ffaf88e59d8843da40e9b5d5860483e9670f47a77c709df1fd9274e2f0693dca30a2e0aaf0440c9f867189761b99e4f9071286be66724362def98404cb438c80 SHA512 8a755d2b0815736c9a872d716af619fd899c426a2da0d7f77f5a7954ef866ed568bfc4324620cb9ca3bede1a36b28bada24ac780e8377c3010914f60ae41b737
+AUX gnurobbo-0.66-underlink.patch 858 BLAKE2B b3ddef3a919afd45c5d949d5f48cecaaea1c013e1924fffd8ce17e32c407562c9054059696db92750322d9378b900ce8432cc30741d0c43b86b5c6b8dd407e4c SHA512 b2053326e1e06cc780647f0c40452729430dd7d0c641406719ce48ba5159e7dd160efc9c892de9424f50ac43386cd6f2a598558e604c34be41a3ccf15d937375
 DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c
-EBUILD gnurobbo-0.66.ebuild 962 BLAKE2B cf05fdfe5771a6a295988c25e11856c087e2cbff913ec87d7dbeda7829fba7493f67abeeeec9f2faed443016679a133e79d8a14c463efc0cd27d1ee83a524797 SHA512 64cf6fb4fab1e171dbb9024148df1eb2ea64eb3634482e6c11a07a7093ec4c92457f201d9baf47296da1c7c6c7d75cc590d7d5bb95c5b12b6a6e3d409071e3d6
+EBUILD gnurobbo-0.66-r1.ebuild 910 BLAKE2B 8b6e1f9b6d9a76d23a64a3a60231fb28763b6669a9d4ef861fdd8e31d85fead9f77650c263c82682a9cfef2e7bdb392f8ee16858a5335358b9a95133ef7cc78d SHA512 c59070e20efad3ccf4716bfc66408c059a25215517605b6d3b4defd4bbd221b025b772b40cb34b3e01a267117e3c5d10402df74285ac4bf94834ba77e54d054e
 MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch
new file mode 100644
index 000000000000..c1502aca4290
--- /dev/null
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-hardening.patch
@@ -0,0 +1,220 @@
+Index: konstruktor.c
+===================================================================
+--- a/konstruktor.c	(Revision 412)
++++ b/konstruktor.c	(Arbeitskopie)
+@@ -247,7 +247,7 @@
+     else if (level.w == 32 && level.h == 31)
+ 	gsize = 1;
+     inforedraw = 1;
+-    sprintf(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer);
++    strcpy(infostring, txt_konstruktor_Welcome_to_GNU_Robbo_Designer);
+     robbo.keys = k_count_obj(KEY);	/* count keys on a map */
+     robbo.bullets = k_count_obj(BULLET) * 9;	/* count bullets */
+     game_area.redraw = REDRAW_EVERYTHING;
+@@ -688,7 +688,7 @@
+ 		create_object(nx, ny, BOMB2);
+ 	    switch (K_icons[selected].game_obj) {
+ 	    case GROUND:
+-		sprintf(infostring, txt_konstruktor_Ground);
++		strcpy(infostring, txt_konstruktor_Ground);
+ 		break;
+ 	    case STOP:
+ 		sprintf(infostring, "%s (%d %s)",
+@@ -745,7 +745,7 @@
+ 			txt_konstruktor_on_map);
+ 		break;
+ 	    case EMPTY_FIELD:
+-		sprintf(infostring, txt_konstruktor_Empty_Field);
++		strcpy(infostring, txt_konstruktor_Empty_Field);
+ 		break;
+ 	    case BUTTERFLY:
+ 		sprintf(infostring, "%s (%d %s)",
+@@ -783,9 +783,9 @@
+ 	    case WALL:
+ 		board[nx][ny].state = wallnumber;
+ 		if (wallnumber != 3)
+-		    sprintf(infostring, txt_konstruktor_Wall);
++		    strcpy(infostring, txt_konstruktor_Wall);
+ 		else
+-		    sprintf(infostring, txt_konstruktor_Black_Wall);
++		    strcpy(infostring, txt_konstruktor_Black_Wall);
+ //		    game_area.redraw=REDRAW_EVERYTHING;
+ 		break;
+ 	    case TELEPORT:
+@@ -905,7 +905,7 @@
+ 		break;
+ 	    case K_RELOAD:
+ 		if (cnt == lastselected) {
+-		    sprintf(infostring, txt_konstruktor_Level_reloaded);
++		    strcpy(infostring, txt_konstruktor_Level_reloaded);
+ 		    clear_screen();
+ 		    level_init();
+ 		    konstruktor_viewport_init();
+@@ -923,7 +923,7 @@
+ 		    k_redraw_all();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Reload_level_select_again_to_reload);
+ 		    lastclick = 50;
+ 		};
+@@ -1048,7 +1048,7 @@
+ 		inforedraw = 1;
+ 		break;
+ 	    case EMPTY_FIELD:
+-		sprintf(infostring, txt_konstruktor_Empty_Field);
++		strcpy(infostring, txt_konstruktor_Empty_Field);
+ 		inforedraw = 1;
+ 		break;
+ 	    case WALL:
+@@ -1055,9 +1055,9 @@
+ 		if (cnt == selected)
+ 		    wallnumber = (wallnumber + 1) % 10;
+ 		if (wallnumber != 3)
+-		    sprintf(infostring, txt_konstruktor_Wall);
++		    strcpy(infostring, txt_konstruktor_Wall);
+ 		else
+-		    sprintf(infostring, txt_konstruktor_Black_Wall);
++		    strcpy(infostring, txt_konstruktor_Black_Wall);
+ 		inforedraw = 1;
+ 		break;
+ 	    case K_LASER:
+@@ -1078,7 +1078,7 @@
+ 		    teleportnr = (teleportnr % 11) + 1;
+ 		break;
+ 	    case GROUND:
+-		sprintf(infostring, txt_konstruktor_Ground);
++		strcpy(infostring, txt_konstruktor_Ground);
+ 		inforedraw = 1;
+ 		break;
+ 	    case BIRD:
+@@ -1101,16 +1101,16 @@
+ 	    direction = (direction + 1) % 4;
+ 	    switch (direction) {
+ 	        case 0:
+-	        sprintf(infostring, txt_konstruktor_Direction_right);
++	        strcpy(infostring, txt_konstruktor_Direction_right);
+ 	        break;
+ 	        case 1:
+-	        sprintf(infostring, txt_konstruktor_Direction_down);
++	        strcpy(infostring, txt_konstruktor_Direction_down);
+ 	        break;
+ 	        case 2:
+-	        sprintf(infostring, txt_konstruktor_Direction_left);
++	        strcpy(infostring, txt_konstruktor_Direction_left);
+ 	        break;
+ 	        case 3:
+-	        sprintf(infostring, txt_konstruktor_Direction_up);
++	        strcpy(infostring, txt_konstruktor_Direction_up);
+ 	        break;
+ 		}
+ 		inforedraw = 1;
+@@ -1119,13 +1119,13 @@
+ 		ltype = (ltype + 1) % 3;
+ 		switch (ltype) {
+ 		case 0:
+-		    sprintf(infostring, txt_konstruktor_Laser_Gun);
++		    strcpy(infostring, txt_konstruktor_Laser_Gun);
+ 		    break;
+ 		case 1:
+-		    sprintf(infostring, txt_konstruktor_Blaster_Gun);
++		    strcpy(infostring, txt_konstruktor_Blaster_Gun);
+ 		    break;
+ 		case 2:
+-		    sprintf(infostring, txt_konstruktor_Regular_Gun);
++		    strcpy(infostring, txt_konstruktor_Regular_Gun);
+ 		    break;
+ 		}
+ 		inforedraw = 1;
+@@ -1136,16 +1136,16 @@
+ 		movable = (rmstate & 1);
+ 	    switch (rmstate) {
+ 	        case 0:
+-	        sprintf(infostring, txt_konstruktor_Fixed);
++	        strcpy(infostring, txt_konstruktor_Fixed);
+ 	        break;
+ 	        case 1:
+-	        sprintf(infostring, txt_konstruktor_Moveable);
++	        strcpy(infostring, txt_konstruktor_Moveable);
+ 	        break;
+ 	        case 2:
+-	        sprintf(infostring, txt_konstruktor_Rotating);
++	        strcpy(infostring, txt_konstruktor_Rotating);
+ 	        break;
+ 	        case 3:
+-	        sprintf(infostring, txt_konstruktor_Moveable_Rotating);
++	        strcpy(infostring, txt_konstruktor_Moveable_Rotating);
+ 	        break;
+ 		}
+ 		inforedraw = 1;
+@@ -1152,7 +1152,7 @@
+ 		break;
+ 	    case K_INSERT:
+ 		if (lastselected == cnt) {
+-		    sprintf(infostring, txt_konstruktor_Level_created);
++		    strcpy(infostring, txt_konstruktor_Level_created);
+ 		    insert = 1;
+ 		    /*
+ 		     * Clear board 
+@@ -1176,7 +1176,7 @@
+ 		    cnt = -1;
+ 
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_New_level_select_again_to_create);
+ 		    lastclick = 50;
+ 		}
+@@ -1187,7 +1187,7 @@
+ 		 * Clear board 
+ 		 */
+ 		if (lastselected == cnt) {
+-		    sprintf(infostring, txt_konstruktor_Level_cleared);
++		    strcpy(infostring, txt_konstruktor_Level_cleared);
+ 		    robbo.screws = 0;
+ 		    robbo.keys = 0;
+ 		    robbo.bullets = 0;	/* Thunor: I added this as it was missing */
+@@ -1206,7 +1206,7 @@
+ 		    clear_entire_board();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Clear_level_select_again_to_clear);
+ 		    lastclick = 50;
+ 		}
+@@ -1215,9 +1215,9 @@
+ 	    case K_SAVE:
+ 		if (lastselected == cnt) {
+ 		    if (insert == 1)
+-			sprintf(infostring, txt_konstruktor_New_level_appended_to_pack);
++			strcpy(infostring, txt_konstruktor_New_level_appended_to_pack);
+ 		    else
+-			sprintf(infostring, txt_konstruktor_Changes_saved);
++			strcpy(infostring, txt_konstruktor_Changes_saved);
+ 		    cnt = -1;
+ 
+ 		    k_save_map();
+@@ -1228,10 +1228,10 @@
+ 		    lastclick = 50;
+ 
+ 		    if (insert == 1)
+-			sprintf(infostring,
++			strcpy(infostring,
+ 				txt_konstruktor_Save_select_again_to_save_new_level);
+ 		    else
+-			sprintf(infostring,
++			strcpy(infostring,
+ 				txt_konstruktor_Save_select_again_to_save_changes);
+ 		}
+ 		inforedraw = 1;
+@@ -1297,7 +1297,7 @@
+ 		    konstruktor_end();
+ 		    cnt = -1;
+ 		} else {
+-		    sprintf(infostring,
++		    strcpy(infostring,
+ 		    	txt_konstruktor_Exit_designer_select_again_to_exit);
+ 		    lastclick = 50;	/* very long click is used as
+ 					 * another click */
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
index 9034a6fac0e2..af69bd9e1c9d 100644
--- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2011-06-20 21:19:49.578922392 +0200
-+++ Makefile	2011-06-20 21:20:28.535421648 +0200
+--- a/Makefile.old	2011-06-20 21:19:49.578922392 +0200
++++ b/Makefile	2011-06-20 21:20:28.535421648 +0200
 @@ -39,14 +39,13 @@
  CFLAGS?=-O3 -pipe
  CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
index b3b59d5f3fc6..39a81fdcd790 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
@@ -1,8 +1,8 @@
-# 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="Robbo, a popular Atari XE/XL game ported to Linux"
 HOMEPAGE="http://gnurobbo.sourceforge.net/"
@@ -13,29 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video,joystick]
+RDEPEND="
+	media-libs/libsdl[sound,video,joystick]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf"
-RDEPEND=${DEPEND}
+	media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlink.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
 
 src_compile() {
 	emake \
-		PACKAGE_DATA_DIR="${GAMES_DATADIR}/${PN}" \
-		BINDIR="${GAMES_BINDIR}" \
+		PACKAGE_DATA_DIR="/usr/share/${PN}" \
+		BINDIR="/usr/bin" \
 		DOCDIR="/usr/share/doc/${PF}"
 }
 
 src_install() {
-	dogamesbin gnurobbo
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin gnurobbo
+	insinto "/usr/share/${PN}"
 	doins -r data/{levels,skins,locales,rob,sounds}
 	dodoc AUTHORS Bugs ChangeLog README TODO
 	newicon icon32.png ${PN}.png
 	make_desktop_entry ${PN} Gnurobbo
-	prepgamesdirs
 }