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

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

4 files changed, 60 insertions, 19 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/Manifest b/gnome-extra/tasks/Manifest
index b2c6cd94a1e3..c9ee504da9ed 100644
--- a/gnome-extra/tasks/Manifest
+++ b/gnome-extra/tasks/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tasks-0.14-configh.patch 240 RMD160 81cd792da95eecc8c048eea2c76c2752d0af168a SHA1 a35cd50e35445ce5b7874d082a3550197869b58e SHA256 0de224e7e8c2d1554a99bc92d939fadbde121b84811da6b2c2a5786ed81c417b
+AUX tasks-0.16-asneeded.patch 1581 RMD160 b6bb73fd5f02b5d1442242baedf13706f4025fdc SHA1 760bffb50b787548d05d0a121c2528a013dc2336 SHA256 96626b73c1a523750d0d7064b0429eb7f4449773649d3ce3ed2c12f85218a30d
 DIST tasks-0.14.tar.gz 290839 RMD160 d882cfc57b3c3ca633f08d5259b5d50e5ad06f83 SHA1 19640391eb58daec649d8a5262fc937a29a82f28 SHA256 af29cacde9ebf953e225aebe0788684db7e204375d9aea977a970799abbac044
 DIST tasks-0.16.tar.gz 258000 RMD160 23aca17a1a5766c4a5fc53b61c4137eff986cd59 SHA1 d0712097c3fba54d83f301fc44814d053ea2356b SHA256 343877dc6c3ed5d7475c2fa8a50f1e58f4bcdda7ddedc37f51ad6d737a9f8312
 EBUILD tasks-0.14.ebuild 1010 RMD160 d84852bcaa746cc882731444b6d671b5a8a1a1c9 SHA1 dcadd1e3d9a927ca93e26fc2122c81fc7e8912b5 SHA256 ac2b1e50d61b7aac2785b7b5903c80a1160c82ff34304b2413ea6d48055f2284
-EBUILD tasks-0.16.ebuild 820 RMD160 a6b56ac9aaa8134e305a1fae74adb2abc94e813b SHA1 bba9c53ab8c2bb143335f4829fd2c0e3f0b82395 SHA256 f66da68c05e8b165831d3c8e92725278501cdeeab6aad9dda1bc26c8e637ee4f
-MISC ChangeLog 1103 RMD160 04928c0b9a2fff29b6daf4f9e87434df90aff29a SHA1 9e3d8c3e6deb7d5a2c119f90c8e1021799f25cb6 SHA256 968764f4e0d8930d309d196f048265702fddfd7c9c830e208aed9afaad628822
+EBUILD tasks-0.16.ebuild 901 RMD160 188377de27f4cac1713bbc656640add10e692b54 SHA1 dca52881af9e8b04629145cead2bf91a113f79bf SHA256 980b7e284c9f46b22229ec1a2d498a1dbca2a1e102b1a15827eca265ea14d5a6
+MISC ChangeLog 1296 RMD160 b418a30b694e923093187d544f5f90678353232d SHA1 73a728d6e01074aa610d64f9826daf76f0d79a4e SHA256 398f2ef03defcccade51a5ffd07de47da8791bffbb88f18f1c79bc16c7b2cba9
 MISC metadata.xml 583 RMD160 1b65121b81b950ca4c2b03e3a98396e4a6a87906 SHA1 91c9b971ae53776cce2357fbcc5b2d0ebde8d1e2 SHA256 d219c719a681123dca2d3704a72c276dcdfeef3c65d5287f614b46b82e9d4351
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqjjc0ACgkQ1fmVwcYIWAZYmQCfd3DmGAQMNDSgEMZkogAFMlVu
-A4QAn263dRNnIEJGuZDtUAc9PWmaCpoV
-=fPHk
------END PGP SIGNATURE-----
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
+}