Fix compilation with --as-needed, bug #318657

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

6 files changed, 14 insertions, 80 deletions

diff --git a/gnustep-apps/simpleagenda/ChangeLog b/gnustep-apps/simpleagenda/ChangeLog
index 93eb9074245c..728c734d9659 100644
--- a/gnustep-apps/simpleagenda/ChangeLog
+++ b/gnustep-apps/simpleagenda/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-apps/simpleagenda
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/ChangeLog,v 1.14 2010/03/15 16:59:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/ChangeLog,v 1.15 2010/05/06 08:43:07 voyageur Exp $
+
+  06 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -simpleagenda-0.38.ebuild, -simpleagenda-0.39.ebuild,
+  -simpleagenda-0.40.ebuild, simpleagenda-0.41.ebuild:
+  Fix compilation with --as-needed, bug #318657
 
 *simpleagenda-0.41 (15 Mar 2010)
 
diff --git a/gnustep-apps/simpleagenda/Manifest b/gnustep-apps/simpleagenda/Manifest
index 82114b16a61e..3d93ecb05831 100644
--- a/gnustep-apps/simpleagenda/Manifest
+++ b/gnustep-apps/simpleagenda/Manifest
@@ -1,12 +1,6 @@
 DIST SimpleAgenda-0.36.tar.gz 81001 RMD160 fd164a712884f8666d87d877b53c90531bf74d0c SHA1 76a6632165b89ccf72471e7943dc439a28ed3cb9 SHA256 6f13fa72264153aec375e459b18691765827f2f3ecfb6ef4719350844b69a955
-DIST SimpleAgenda-0.38.tar.gz 92511 RMD160 225be19bb4bac5c1f691dddcb63545b5c1400b74 SHA1 cf7f982cf58df4a6bf18c1c188a6945bd9bdac6f SHA256 333d882a5bbefa818bb7dd84e24d76b1842d85379808b64b4c2b945c99b39b2c
-DIST SimpleAgenda-0.39.tar.gz 117589 RMD160 bf587875d1d5170b480c97f6221ab8f882bb7c83 SHA1 a7ffb9743349301949785948b6f3e35f90c1ad3c SHA256 bf237d35cb109bc38591bf49b9def4e76d357af64b06073607f5ccab1ee44e37
-DIST SimpleAgenda-0.40.tar.gz 138617 RMD160 28118e076866aa1636ea1d04f08337fdeb290452 SHA1 375a6f662175a25112e78d13b3f8b20754e8a082 SHA256 06cd2197c7d2026410296dd9b6b79c8d5a7181b359efc09ab2e17b63233558e3
 DIST SimpleAgenda-0.41.tar.gz 140034 RMD160 bd5333f4b98d0a124f4bae8a1ea823559afc385f SHA1 d5e4b647dc5cd7f2faea371e1aa641f3d656d1da SHA256 c052e9029fe2b8953e1a798a46e290d619fa3b81f53ceff25e4d8f6e748a3a1b
 EBUILD simpleagenda-0.36.ebuild 617 RMD160 84e3551d15ea9a09875434cf3ace5199ae99b5d4 SHA1 a349666841199712e3d939c7e6c5a42a035199b6 SHA256 8a8a86b1ff76e1228e7a4e5164e4460cbeae022e12d7c8432fbb7f40f0c83628
-EBUILD simpleagenda-0.38.ebuild 620 RMD160 d92a54db6180e15d641fc14d6f87d03c227ddbcb SHA1 5d36d01380bf7d6963b915010f8fbe1af07415a6 SHA256 994884c746fd176d22000642e45dfe3493ee5405fa969ec3894070281b88331f
-EBUILD simpleagenda-0.39.ebuild 735 RMD160 666a4a6a6860dec2630560347c840104c682580f SHA1 e635dfa8c9117c3c7cd16327d6296be1a0ab1aae SHA256 dee6e0fb3189ee94cd088ccbe43caca9742d96d88ddfccaf67f17ffc061c8852
-EBUILD simpleagenda-0.40.ebuild 627 RMD160 6c6dadda31f78945ab31e709294ae74d409186a3 SHA1 27c876112c387204e73a30a4e0ff3fd22a7aee73 SHA256 02a2bd60c8856244fe1560f84d6523488d6e0f3cb937f7c73a670358579e1055
-EBUILD simpleagenda-0.41.ebuild 627 RMD160 f8034013e8b9dd496a1199876d37d13354584f07 SHA1 1ed647307ed8636a45845309024c37e4a12a58c7 SHA256 9985683004145dc1c4c92c5c6fabecc42fe2606a033f8bd51dca5d8a0d9ceacf
-MISC ChangeLog 2454 RMD160 aa4431aa7ca2953573a32699a05f56cfceaddcd8 SHA1 46e666b50f0febaf67542bf9a34152c4586a2510 SHA256 d2b9f95f04d839414cd9f99dcba703d15c66de54ce8847b4d02cb952b98f8cd3
+EBUILD simpleagenda-0.41.ebuild 783 RMD160 9c5e3f94725f0459042197cd2cc6e0b071231310 SHA1 59ec1eed49831a83fff0834a2bd0cfbc0d797e32 SHA256 e444679c826604be84bddb1eeb34d423ec5edb885d0922017e97be74e3ca71d3
+MISC ChangeLog 2669 RMD160 d1d454c4e59caba37c1b7bece75f65a229ac1b0e SHA1 887115a327dcb33ce273b8b28e7c4492d6ecf446 SHA256 fbbb34cdf0e146d8a95bc35d08ee010a6893c87eae5cfbb18bf099094150cef6
 MISC metadata.xml 238 RMD160 e2f5d7fdc51da945aa4c249be825afdc6fc781db SHA1 f69ea223e7704f813f8fe6952c23f4c0026044aa SHA256 34899a20e2f0dcbd6f7ed12c1de461549d8d06b1fdca29b3a235d200aa72482c
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.38.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.38.ebuild
deleted file mode 100644
index e3e4f4a07582..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.38.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.38.ebuild,v 1.2 2009/09/21 15:41:04 voyageur Exp $
-
-inherit eutils gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/pub/gnustep/"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libical
-	>=virtual/gnustep-back-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.39.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.39.ebuild
deleted file mode 100644
index e8884b325347..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.39.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.39.ebuild,v 1.1 2009/09/21 15:41:04 voyageur Exp $
-
-EAPI=2
-inherit autotools gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/pub/gnustep/"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libical
-	>=virtual/gnustep-back-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	sed -e "s/${MY_PN}/${MY_PN}-${PV}/" -i configure.ac || die "sed failed"
-	eautoreconf
-}
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.40.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.40.ebuild
deleted file mode 100644
index 1e2fe69cbe15..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.40.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.40.ebuild,v 1.1 2010/03/07 22:25:54 voyageur Exp $
-
-EAPI=2
-inherit gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/pub/gnustep/"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libical-0.27
-	>=virtual/gnustep-back-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild
index 98366a1b2b9e..e563caa90ec2 100644
--- a/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild
+++ b/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild,v 1.1 2010/03/15 16:59:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/simpleagenda/simpleagenda-0.41.ebuild,v 1.2 2010/05/06 08:43:07 voyageur Exp $
 
 EAPI=2
 inherit gnustep-2
@@ -20,3 +20,8 @@ DEPEND=">=dev-libs/libical-0.27
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	# Correct link command for --as-needed
+	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile.preamble || die "sed failed"
+}