Fix building testsuite with -Wl,--as-needed wrt #294878 by Kacper Kowalik.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 57 insertions, 7 deletions

diff --git a/gnome-extra/tasks/ChangeLog b/gnome-extra/tasks/ChangeLog
index cb368467c356..cec4dee723c6 100644
--- a/gnome-extra/tasks/ChangeLog
+++ b/gnome-extra/tasks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/tasks
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/tasks/ChangeLog,v 1.5 2009/09/06 10:24:07 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/tasks/ChangeLog,v 1.6 2010/06/29 15:39:28 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> tasks-0.16.ebuild,
+  +files/tasks-0.16-asneeded.patch:
+  Fix building testsuite with -Wl,--as-needed wrt #294878 by Kacper Kowalik.
 
   06 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org> tasks-0.16.ebuild:
   Remove commented src_prepare.
diff --git a/gnome-extra/tasks/files/tasks-0.16-asneeded.patch b/gnome-extra/tasks/files/tasks-0.16-asneeded.patch
new file mode 100644
index 000000000000..3a13d7f3a9e3
--- /dev/null
+++ b/gnome-extra/tasks/files/tasks-0.16-asneeded.patch
@@ -0,0 +1,42 @@
+--- libkoto/Makefile.am
++++ libkoto/Makefile.am
+@@ -1,6 +1,8 @@
++ALL_LIBS = $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
++ALL_CFLAGS = $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
++
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
+-AM_LDFLAGS = $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" $(WARN_CFLAGS) $(ALL_CFLAGS)
+ 
+ # Really nasty, but I don't want to check for this every time I want to use
+ # g_date_set_time_t.
+@@ -8,6 +10,8 @@
+ AM_CPPFLAGS += -D'g_date_set_time_t(d,t)=g_date_set_time(d,t)'
+ endif
+ 
++LINK = $(CCLD) $(ALL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(ALL_LIBS)
++
+ noinst_LIBRARIES = libkoto.a
+ libkoto_a_SOURCES = \
+ 	ical-util.h ical-util.c \
+@@ -38,13 +42,18 @@
+ 	koto-utils.h koto-utils.c \
+ 	koto-platform.h
+ 
+-
+ TESTS = test-group-store test-ical-util test-date-parser
+ check_PROGRAMS = test-group-store test-ical-util test-date-parser
+ 
+ test_group_store_SOURCES = test-koto-group-store.c koto-group-store.c koto-category-group.c koto-group.c ical-util.c
++test_group_store_LDADD = $(ALL_LIBS)
++test_group_store_CFLAGS = $(ALL_CFLAGS)
+ 
+ test_ical_util_SOURCES = test-ical-util.c ical-util.c
++test_ical_util_LDADD = $(ALL_LIBS)
++test_ical_util_CFLAGS = $(ALL_CFLAGS)
+ 
+ test_date_parser_SOURCES = koto-date-parser.c
+ test_date_parser_CPPFLAGS = $(AM_CPPFLAGS) -DBUILD_TESTS=1
++test_date_parser_LDADD = $(ALL_LIBS)
++test_date_parser_CFLAGS = $(ALL_CFLAGS)
diff --git a/gnome-extra/tasks/tasks-0.16.ebuild b/gnome-extra/tasks/tasks-0.16.ebuild
index f268f7ec36db..97dcba46004c 100644
--- a/gnome-extra/tasks/tasks-0.16.ebuild
+++ b/gnome-extra/tasks/tasks-0.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/tasks/tasks-0.16.ebuild,v 1.2 2009/09/06 10:24:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/tasks/tasks-0.16.ebuild,v 1.3 2010/06/29 15:39:28 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A small, lightweight to-do list for Gnome"
 HOMEPAGE="http://pimlico-project.org/tasks.html"
@@ -20,14 +20,18 @@ RDEPEND=">=gnome-extra/evolution-data-server-1.8
 	>=x11-libs/gtk+-2.16
 	>=dev-libs/glib-2.14
 	>=dev-libs/libunique-1"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9.0
 	>=dev-util/intltool-0.33.0
 	sys-devel/gettext"
 
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF} --with-unique --enable-gtk"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}