Fix building with GCC 4.4 and -Wl,--as-needed.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 107 insertions, 24 deletions

diff --git a/x11-misc/bbmail/ChangeLog b/x11-misc/bbmail/ChangeLog
index be88d8a072b9..006ebfb87492 100644
--- a/x11-misc/bbmail/ChangeLog
+++ b/x11-misc/bbmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bbmail
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/ChangeLog,v 1.16 2008/09/22 12:52:50 omp Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/ChangeLog,v 1.17 2009/07/30 16:25:06 ssuominen Exp $
+
+  30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> bbmail-0.9.3.ebuild,
+  +files/bbmail-0.9.3-gcc4.4.patch:
+  Fix building with GCC 4.4 and -Wl,--as-needed.
 
   22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
   Change herd from commonbox to desktop-wm.
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
index b695778fd94a..66f14de49aa1 100644
--- a/x11-misc/bbmail/Manifest
+++ b/x11-misc/bbmail/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bbmail-0.9.3-gcc4.3.patch 1418 RMD160 4a5ec2963b718ca2cf72d3bd6f0cdd7b41a48968 SHA1 a816b5f5a8553727e6f06fc399cc498ccb47b3ae SHA256 2de79b768b972c534ff177758606cd44125fe2ac6923b3c6441c2d990582f37a
+AUX bbmail-0.9.3-gcc4.4.patch 2776 RMD160 f36b83db85971ce2d2aa21fc9f8c8e6201cc48de SHA1 797134a764680a8e281f0f6e278091dec4efe39e SHA256 d1496056e06ef1772e1f250f305bbff08f8c35492864ac48ea1c5687444e69e0
 DIST bbmail-0.8.3.tar.gz 123318 RMD160 9a4de2c12b60cfa4306c572446e2ba7e2ad9a4b7 SHA1 1707500785614805b88b77d4e86c3fbb059744e2 SHA256 94472a9d4fd6ec1379d38a70dbd47ac3057c5ddbc8772de221cfe709fe84232c
 DIST bbmail-0.9.3.tar.gz 186433 RMD160 a6884f90cf28d09522aa700ae7a257b6ba3f1b5a SHA1 6ea97fc29d408ae4d6fa66e1de9cfe73bad17440 SHA256 e992f83d758215e3331f7bfcb5431b6cc8988bc542907de1bca6fe3c8ae9233e
 EBUILD bbmail-0.8.3.ebuild 637 RMD160 36398d0d2dc5e71f399acb941b7f2308d17f1a49 SHA1 bd1371dfe29b041f4d9b78f7ece59afcf59c6fdb SHA256 1d91c746699d52016f64f58f221e01a9bbc0d5c2307f26c0974e4ab601d61790
-EBUILD bbmail-0.9.3.ebuild 815 RMD160 e1064f7c0e9d7d10da30a54590c00307ed6f2f0a SHA1 bd2e3da77750369a2911c1fa53dde70efcff6ebd SHA256 5dcca13a033dee243c2961427ccd46b3a6678f83e39dba3c62049489d825a2e6
-MISC ChangeLog 2154 RMD160 39c052f7a7f2255a237b98be313f31e0adbd36ac SHA1 6d61ce4406e001cc2b83af6f07dc16ef9294db08 SHA256 add61f28bf023c93ee0a0e501f70195f7a7942c607400b23a6dfb981efadd51b
+EBUILD bbmail-0.9.3.ebuild 856 RMD160 ab0670693a9593a79105172f62f56f20b564bad6 SHA1 2214b2dd021f9b826241b04b912f576f1c4d1bb4 SHA256 2ed00be44fdf53aaa463ae241357dba251c20e37737a41a477cbd2f4fa198b7b
+MISC ChangeLog 2321 RMD160 41ed4b7ade875e0af7b82106b1b0ade6dda2132f SHA1 4ce663fc70a9530d9ab4ef253d98040103bc1201 SHA256 dd8526d5f9c1106563eab7b94603e085c2180c197c62ac145797479bf189eb89
 MISC metadata.xml 240 RMD160 a56e1233654a28c7e54882274655a44ec725c1e1 SHA1 5b91861d472cff908c9b1f237ec262bd81e775b5 SHA256 bb7932c057781ec6b7c9d34f6789722f69ccec157c7f3dbe589116b469b553e4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjXlS0ACgkQvSApE0uP4Uu20wCfbKwFinPRV7KjIBCf7JZrUVlZ
-6wMAn1BW48CHNB+WaSxOHaH5r/ZfzfD9
-=0CYW
------END PGP SIGNATURE-----
diff --git a/x11-misc/bbmail/bbmail-0.9.3.ebuild b/x11-misc/bbmail/bbmail-0.9.3.ebuild
index a0f9393642fa..cb4a4c5ebf29 100644
--- a/x11-misc/bbmail/bbmail-0.9.3.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.9.3.ebuild,v 1.1 2008/09/17 21:16:31 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbmail/bbmail-0.9.3.ebuild,v 1.2 2009/07/30 16:25:06 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="blackbox mail notification"
 HOMEPAGE="http://www.sourceforge.net/projects/bbtools"
@@ -13,18 +14,16 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="
-	virtual/blackbox
+RDEPEND="virtual/blackbox
 	x11-libs/libX11
 	x11-libs/libXext"
-
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch \
+		"${FILESDIR}"/${P}-gcc4.4.patch
+	eautoreconf
 }
 
 src_install () {
diff --git a/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch
new file mode 100644
index 000000000000..d0f93d921d97
--- /dev/null
+++ b/x11-misc/bbmail/files/bbmail-0.9.3-gcc4.4.patch
@@ -0,0 +1,89 @@
+diff -ur bbmail-0.9.3.orig/configure.ac bbmail-0.9.3/configure.ac
+--- bbmail-0.9.3.orig/configure.ac	2007-12-03 23:04:11.000000000 +0200
++++ bbmail-0.9.3/configure.ac	2009-07-30 19:24:12.000000000 +0300
+@@ -9,13 +9,11 @@
+ AC_DEFUN(AC_SET_DEBUG,
+ [
+  test "$CXXFLAGS" = "" && CXXFLAGS="-g -Wall -DDEBUG"
+- test "$LDFLAGS" = "" && LDFLAGS=""
+ ])
+ 
+ AC_DEFUN(AC_SET_NODEBUG,
+ [
+- test "$CXXFLAGS" = "" && CXXFLAGS="-O2 -Wall"
+- test "$LDFLAGS" = "" && LDFLAGS="-s"
++ test "$CXXFLAGS" = "" && CXXFLAGS="-Wall"
+ ])
+       
+ 
+@@ -46,9 +44,9 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+ dnl Checks for Xextension
+diff -ur bbmail-0.9.3.orig/src/bbmail.cpp bbmail-0.9.3/src/bbmail.cpp
+--- bbmail-0.9.3.orig/src/bbmail.cpp	2007-12-03 23:08:26.000000000 +0200
++++ bbmail-0.9.3/src/bbmail.cpp	2009-07-30 19:20:10.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "config.h"
+ #include <string>
+diff -ur bbmail-0.9.3.orig/src/mailboxmenu.cpp bbmail-0.9.3/src/mailboxmenu.cpp
+--- bbmail-0.9.3.orig/src/mailboxmenu.cpp	2005-02-01 00:03:37.000000000 +0200
++++ bbmail-0.9.3/src/mailboxmenu.cpp	2009-07-30 19:20:39.000000000 +0300
+@@ -19,6 +19,9 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ //
++
++#include <cstdio>
++
+ #include "mailboxmenu.h"
+ 
+ MailboxMenu::MailboxMenu(ToolWindow *toolwindow) :
+diff -ur bbmail-0.9.3.orig/src/main.cpp bbmail-0.9.3/src/main.cpp
+--- bbmail-0.9.3.orig/src/main.cpp	2006-01-20 23:28:08.000000000 +0200
++++ bbmail-0.9.3/src/main.cpp	2009-07-30 19:19:49.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "main.h"
+ #include "config.h"
+diff -ur bbmail-0.9.3.orig/src/Makefile.am bbmail-0.9.3/src/Makefile.am
+--- bbmail-0.9.3.orig/src/Makefile.am	2005-09-06 23:57:42.000000000 +0300
++++ bbmail-0.9.3/src/Makefile.am	2009-07-30 19:24:39.000000000 +0300
+@@ -10,5 +10,4 @@
+ 		 spoollist.cpp spoollist.h \
+ 		 mailboxmenu.cpp mailboxmenu.h \
+ 		 blackboxstyle.h
+-bbmail_LDADD = @X_LIBS@
+-
++bbmail_LDADD = @LIBS@
+diff -ur bbmail-0.9.3.orig/src/resource.cpp bbmail-0.9.3/src/resource.cpp
+--- bbmail-0.9.3.orig/src/resource.cpp	2007-08-28 19:47:19.000000000 +0300
++++ bbmail-0.9.3/src/resource.cpp	2009-07-30 19:20:00.000000000 +0300
+@@ -19,6 +19,8 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdio>
++
+ #include "bbmail.h"
+ #include "resource.h"
+ #include "blackboxstyle.h"