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

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

5 files changed, 12 insertions, 72 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/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"
+}