Fix CFLAGS (bug 428652), fix two compiler warnings, taking maint.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 71 insertions, 10 deletions

diff --git a/app-benchmarks/gtkperf/ChangeLog b/app-benchmarks/gtkperf/ChangeLog
index d3dd456fc28f..e9421c7f08ba 100644
--- a/app-benchmarks/gtkperf/ChangeLog
+++ b/app-benchmarks/gtkperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/gtkperf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/gtkperf/ChangeLog,v 1.5 2013/02/03 13:20:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/gtkperf/ChangeLog,v 1.6 2013/02/05 23:36:38 xmw Exp $
+
+*gtkperf-0.40-r1 (05 Feb 2013)
+
+  05 Feb 2013; Michael Weber <xmw@gentoo.org> -gtkperf-0.40.ebuild,
+  +gtkperf-0.40-r1.ebuild, +files/gtkperf-0.40-gentoo.patch:
+  Fix CFLAGS (bug 428652), fix two compiler warnings, taking maint.
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup after talking with leio
diff --git a/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
new file mode 100644
index 000000000000..eee7faf43b61
--- /dev/null
+++ b/app-benchmarks/gtkperf/files/gtkperf-0.40-gentoo.patch
@@ -0,0 +1,47 @@
+--- gtkperf-0.40/work/gtkperf/configure.in
++++ gtkperf-0.40/work/gtkperf/configure.in
+@@ -8,7 +8,6 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_ISC_POSIX
+-CFLAGS=""
+ AC_SUBST(CFLAGS)
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+--- gtkperf-0.40/work/gtkperf/src/timing.c
++++ gtkperf-0.40/work/gtkperf/src/timing.c
+@@ -97,7 +97,7 @@
+ 	gtk_text_buffer_insert (appdata->textview_info_buffer, &iter,
+ 				timestring, -1);
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ 
+ }
+ 
+@@ -129,7 +129,7 @@
+ 	gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ 			    " Test Finished");
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ 
+ }
+ 
+@@ -154,5 +154,5 @@
+ 	gtk_statusbar_push (GTK_STATUSBAR (appdata->statusbar_main), 0,
+ 			    " Running tests...");
+ 
+-	g_printf (timestring);
++	g_printf ("%s", timestring);
+ }
+--- gtkperf-0.40/work/gtkperf/src/main.c
++++ gtkperf-0.40/work/gtkperf/src/main.c
+@@ -5,6 +5,7 @@
+ #endif
+ 
+ #include <gtk/gtk.h>
++#include <stdlib.h>
+ 
+ #ifdef HILDONIZED
+ #include <libosso.h>
diff --git a/app-benchmarks/gtkperf/gtkperf-0.40.ebuild b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
index d9b25068d56a..6c274e96e2c1 100644
--- a/app-benchmarks/gtkperf/gtkperf-0.40.ebuild
+++ b/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/gtkperf/gtkperf-0.40.ebuild,v 1.4 2012/05/03 02:07:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/gtkperf/gtkperf-0.40-r1.ebuild,v 1.1 2013/02/05 23:36:38 xmw Exp $
 
-EAPI="1"
+EAPI=5
+
+inherit eutils
 
 MY_P="${PN}_${PV}"
 DESCRIPTION="Application designed to test GTK+ performance"
@@ -19,15 +21,21 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
 
-src_compile() {
-	econf "$(use_enable nls)"
-	emake || die "emake failed"
+src_configure() {
+	econf $(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}/usr/doc"
+	default
+
+	make_desktop_entry ${PN} ${PN} duck
+
+	rm -rf "${D}/usr/doc" || die
 	dodoc AUTHORS ChangeLog README TODO
 }