[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroid/files/, games-rpg/freedroid/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroid/files/, games-rpg/freedroid/

[Alfredo Tupone]

commit:     fcc4281c0eacb8d3e125ed2c597c7d22ed2da640
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 15:43:01 2015 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 15:43:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc4281c

games-rpg/freedroid: compile with format-security. Bug #544366

Package-Manager: portage-2.2.20.1

 .../freedroid/files/freedroid-1.0.2-format.patch   | 29 ++++++++++++++++++++++
 games-rpg/freedroid/freedroid-1.0.2.ebuild         |  4 +++
 2 files changed, 33 insertions(+)

diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
new file mode 100644
index 0000000..ebb7089
--- /dev/null
+++ b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
@@ -0,0 +1,29 @@
+--- src/init.c.old	2015-10-24 17:37:24.431514375 +0200
++++ src/init.c	2015-10-24 17:37:43.057157826 +0200
+@@ -554,13 +554,13 @@
+ 	   * following gnu-coding standards for command line interfaces */
+ 	case 'v':
+ 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
+-	  printf (copyright);
++	  printf ("%s", copyright);
+ 	  exit (0);
+ 	  break;
+ 
+ 	case 'h':
+ 	case '?':
+-	  printf (usage_string);
++	  printf ("%s", usage_string);
+ 	  exit (0);
+ 	  break;
+ 
+--- src/misc.c.old	2015-10-24 17:37:54.368941282 +0200
++++ src/misc.c	2015-10-24 17:38:10.202638172 +0200
+@@ -889,7 +889,7 @@
+   if (db_level <= debug_level)
+     {
+       vsnprintf (buffer, 5000, fmt, args);
+-      fprintf (stderr, buffer);
++      fprintf (stderr, "%s", buffer);
+       fflush (stderr);
+     }
+ 

diff --git a/games-rpg/freedroid/freedroid-1.0.2.ebuild b/games-rpg/freedroid/freedroid-1.0.2.ebuild
index dde856f..86e8499 100644
--- a/games-rpg/freedroid/freedroid-1.0.2.ebuild
+++ b/games-rpg/freedroid/freedroid-1.0.2.ebuild
@@ -22,6 +22,10 @@ DEPEND="media-libs/libsdl[joystick,sound,video]
 	media-libs/sdl-mixer[mod,vorbis]
 	media-libs/libvorbis"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_install() {
 	default
 	find "${D}" -name "Makefile*" -exec rm -f '{}' +

[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedroid/files/, games-rpg/freedroid/

[Austin English]

commit:     bfe83a032fd992fc6e05ac20aaad65051a7ea1d3
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 10:15:46 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 10:16:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe83a03

games-rpg/freedroid: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 .../freedroid/files/freedroid-1.0.2-format.patch   |  8 ++---
 games-rpg/freedroid/freedroid-1.0.2-r1.ebuild      | 37 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
index ebb7089..4dbf96b 100644
--- a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
+++ b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
@@ -1,5 +1,5 @@
---- src/init.c.old	2015-10-24 17:37:24.431514375 +0200
-+++ src/init.c	2015-10-24 17:37:43.057157826 +0200
+--- a/src/init.c	2015-10-24 17:37:24.431514375 +0200
++++ b/src/init.c	2015-10-24 17:37:43.057157826 +0200
 @@ -554,13 +554,13 @@
  	   * following gnu-coding standards for command line interfaces */
  	case 'v':
@@ -16,8 +16,8 @@
  	  exit (0);
  	  break;
  
---- src/misc.c.old	2015-10-24 17:37:54.368941282 +0200
-+++ src/misc.c	2015-10-24 17:38:10.202638172 +0200
+--- a/src/misc.c	2015-10-24 17:37:54.368941282 +0200
++++ b/src/misc.c	2015-10-24 17:38:10.202638172 +0200
 @@ -889,7 +889,7 @@
    if (db_level <= debug_level)
      {

diff --git a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
new file mode 100644
index 00000000..17a817a
--- /dev/null
+++ b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Freedroid - a Paradroid clone"
+HOMEPAGE="http://freedroid.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+	virtual/jpeg:0
+	media-libs/libpng:0
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/libvorbis
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod,vorbis]
+	sys-libs/zlib"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+)
+
+src_install() {
+	default
+	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
+	rm -rf "${D}/usr/share/${PN}/"{freedroid.6,mac-osx} || die
+	newicon graphics/paraicon.bmp ${PN}.bmp
+	make_desktop_entry freedroid Freedroid /usr/share/pixmaps/${PN}.bmp
+}