Force -O0 for amd64 and include stdlib.h for warnings wrt #214384.

(Portage version: 2.1.4.4)

5 files changed, 57 insertions, 51 deletions

diff --git a/x11-misc/suxpanel/ChangeLog b/x11-misc/suxpanel/ChangeLog
index 09c47be88223..07279e0f898e 100644
--- a/x11-misc/suxpanel/ChangeLog
+++ b/x11-misc/suxpanel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/suxpanel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.7 2008/02/18 20:42:55 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/ChangeLog,v 1.8 2008/04/03 16:32:12 drac Exp $
+
+*suxpanel-0.4b-r1 (03 Apr 2008)
+
+  03 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/suxpanel-0.4b-stdlib.patch, +suxpanel-0.4b-r1.ebuild:
+  Force -O0 for amd64 and include stdlib.h for warnings wrt #214384.
 
   18 Feb 2008; <cla@gentoo.org> suxpanel-0.4b.ebuild:
   Stable on x86 (bug #210622)
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4a-Makefile.in.patch b/x11-misc/suxpanel/files/suxpanel-0.4a-Makefile.in.patch
deleted file mode 100644
index 80c8aa917dc3..000000000000
--- a/x11-misc/suxpanel/files/suxpanel-0.4a-Makefile.in.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru suxpanel-0.4a/Makefile.in suxpanel-0.4a.patched/Makefile.in
---- suxpanel-0.4a/Makefile.in	2005-10-01 12:59:53.000000000 +0200
-+++ suxpanel-0.4a.patched/Makefile.in	2005-10-01 13:03:19.000000000 +0200
-@@ -1,7 +1,7 @@
- # ----------------------------------------------------------------------------
- 
- CC = gcc
--CFLAGS = -Wall $(GTK_CFLAGS) -O2 -g
-+CFLAGS := -Wall $(GTK_CFLAGS) $(CFLAGS)
- 
- # ----------------------------------------------------------------------------
- 
-@@ -22,6 +22,7 @@
- 	rm -rf *~ *.o *.so suxpanel
- 
- install:	all
-+	mkdir -p ${DESTDIR}/usr/bin
- 	cp suxpanel ${DESTDIR}/usr/bin/suxpanel
- 	mkdir -p ${DESTDIR}/usr/share/suxpanel/plugins
- 	cp -rv *.so ${DESTDIR}/usr/share/suxpanel/plugins
diff --git a/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch b/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch
new file mode 100644
index 000000000000..1e967512ec6e
--- /dev/null
+++ b/x11-misc/suxpanel/files/suxpanel-0.4b-stdlib.patch
@@ -0,0 +1,11 @@
+diff -ur suxpanel-0.4b.orig/settings.c suxpanel-0.4b/settings.c
+--- suxpanel-0.4b.orig/settings.c	2005-05-05 02:00:12.000000000 +0300
++++ suxpanel-0.4b/settings.c	2008-04-03 19:15:08.000000000 +0300
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #include "settings.h"
+ 
++#include <stdlib.h>
+ #include <string.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
diff --git a/x11-misc/suxpanel/suxpanel-0.4a.ebuild b/x11-misc/suxpanel/suxpanel-0.4a.ebuild
deleted file mode 100644
index a543913c60e9..000000000000
--- a/x11-misc/suxpanel/suxpanel-0.4a.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4a.ebuild,v 1.3 2006/10/11 12:01:14 nelchael Exp $
-
-inherit eutils
-
-DESCRIPTION="SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel"
-SRC_URI="http://vivid.dat.pl/suxpanel/${P}.tar.bz2"
-HOMEPAGE="http://www.gnomefiles.org/app.php?soft_id=84"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2
-		>=sys-apps/sed-4
-		x11-libs/libwnck
-		dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-Makefile.in.patch"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "Make install failed."
-	dobin suxpanel-install.sh
-	dodoc README
-}
diff --git a/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild b/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild
new file mode 100644
index 000000000000..bf3622cc296e
--- /dev/null
+++ b/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/suxpanel/suxpanel-0.4b-r1.ebuild,v 1.1 2008/04/03 16:32:12 drac Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="SuxPanel is a complete rewrite of MacOS Style Panel, a light-weight X11 desktop panel"
+SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://suxpanel.berlios.de"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-libs/libwnck"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+	epatch "${FILESDIR}"/${P}-stdlib.patch
+}
+
+src_compile() {
+	use amd64 && append-flags -O0
+	tc-export CC
+	econf
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dobin suxpanel-install.sh
+	dodoc README
+}