QA: Fix compilation with forced as-needed (bug 246880), respect LDFLAGS, respect CXX

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

4 files changed, 41 insertions, 13 deletions

diff --git a/app-editors/cssed/ChangeLog b/app-editors/cssed/ChangeLog
index 294c2775aae1..a5b10f1483b1 100644
--- a/app-editors/cssed/ChangeLog
+++ b/app-editors/cssed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/cssed
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/cssed/ChangeLog,v 1.19 2008/07/25 16:30:39 cardoe Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cssed/ChangeLog,v 1.20 2009/02/11 15:08:51 angelos Exp $
+
+  11 Feb 2009; Christoph Mende <angelos@gentoo.org>
+  +files/cssed-0.4.0-asneeded.patch, cssed-0.4.0-r1.ebuild:
+  QA: Fix compilation with forced as-needed (bug 246880), respect LDFLAGS,
+  respect CXX
 
   25 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-editors/cssed/Manifest b/app-editors/cssed/Manifest
index 7216722ad346..0c08baa02090 100644
--- a/app-editors/cssed/Manifest
+++ b/app-editors/cssed/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cssed-0.4.0-asneeded.patch 407 RMD160 622ee71ae64550cc90eea89782d8aaf501cfdbd9 SHA1 d50324bdab615916662eca0bfb9a403b5e131747 SHA256 ae1d32faa1da24a996ed378d484caade16621bdd13d595c487225aa1fd5ba9a2
 DIST cssed-0.4.0.tar.gz 1457946 RMD160 91bd22facdf40298d54bac83cc126740a1a077d8 SHA1 98ca1bcca97ee22516ca18ebfd832a48efb80e77 SHA256 25d26d5d30311c88e7c6195e2407c1deb23997723cb939377f5f2078b778ecc4
-EBUILD cssed-0.4.0-r1.ebuild 794 RMD160 bdad278e42e599c340a6a834ecb4518c03ac28f3 SHA1 492fdd0d4ba314651de8264b9de4b1560448a203 SHA256 c57e6ba354490a8dccbbaa3bec966b099490f295f60a53d41a2f2585551aeee3
-MISC ChangeLog 2371 RMD160 b4c8107e0a587e9c343ce79df57843986347aa38 SHA1 fdff3d733d499b8a9daef9af272242abd23c3cc2 SHA256 2a4a0becc5a51ea15e7101425fa331cdf9200ff8b1bdc44d581915a0fc38f29f
+EBUILD cssed-0.4.0-r1.ebuild 1065 RMD160 a95fcff994768940f025572ec036cc639dbfceb4 SHA1 fa5477c4904f24d078328833a5624bcf2e20a381 SHA256 de162313b3654edd805a20b03a13f528ef0b0734779f7980702b89ffb58d6e2d
+MISC ChangeLog 2574 RMD160 dea23aa5f88157302276da4ff7993a8a60cfad7c SHA1 9d619fbbb79ab6ab1517513a87ee74d4309dd20e SHA256 fd98a1da4c0e05036583d4ed90c19540cd9fb8a3323e546fa9e34898009d2353
 MISC metadata.xml 240 RMD160 8f7077739c7b9da019cf197b2f2c28a64bfba5c5 SHA1 c7df50d2868b54b11325fed9b6d56ee0f7a743a4 SHA256 5f7d866286bd824750d3578673b32dc05c2d1b37ce16807f3c22ae95644b6ddd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiJ/7kACgkQoeSe8B0zEfxLrQCbBp4N3zRdT5Rz4pMkrdVtuteL
-uWgAniC4oGasz8yYXvglLDfFVxthxBAY
-=gYM7
+iEYEARECAAYFAkmS6gsACgkQKhnDs22gwa/8FwCfagk2wB/Ei1K0RgRIpd3YX65r
+tywAoIyej99yF/ORhL0C1PnlRMaZl40M
+=6IKb
 -----END PGP SIGNATURE-----
diff --git a/app-editors/cssed/cssed-0.4.0-r1.ebuild b/app-editors/cssed/cssed-0.4.0-r1.ebuild
index d4a12725bd2c..a9b2c8b36c1a 100644
--- a/app-editors/cssed/cssed-0.4.0-r1.ebuild
+++ b/app-editors/cssed/cssed-0.4.0-r1.ebuild
@@ -1,8 +1,10 @@
-# 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/app-editors/cssed/cssed-0.4.0-r1.ebuild,v 1.4 2008/05/18 16:09:44 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cssed/cssed-0.4.0-r1.ebuild,v 1.5 2009/02/11 15:08:51 angelos Exp $
 
-DESCRIPTION="CSSED a GTK2 application to help create and maintain CSS style sheets for web developing"
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="a GTK2 application to help create and maintain CSS style sheets for web developing"
 HOMEPAGE="http://cssed.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -19,11 +21,20 @@ RDEPEND=">=x11-libs/gtk+-2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	sed -i -e "/^cssed_LINK/s:g++:$(tc-getCXX) \$(LDFLAGS):" src/Makefile.am
+	eautoreconf
+}
+
 src_compile() {
-	econf $(use_with plugins plugin-headers) || die
-	emake || die
+	econf $(use_with plugins plugin-headers)
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake failed"
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/app-editors/cssed/files/cssed-0.4.0-asneeded.patch b/app-editors/cssed/files/cssed-0.4.0-asneeded.patch
new file mode 100644
index 000000000000..cf208dc843cd
--- /dev/null
+++ b/app-editors/cssed/files/cssed-0.4.0-asneeded.patch
@@ -0,0 +1,11 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a425281..9167c00 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -65,5 +65,5 @@ cssed_SOURCES = \
+ 	xpm-icons.h \
+ 	filetypes.h
+ 
+-cssed_LDADD = @PACKAGE_LIBS@  ../scintilla/gtk/libscintilla.a ../libcroco/parser/libcroco.a
++cssed_LDADD = ../scintilla/gtk/libscintilla.a ../libcroco/parser/libcroco.a @PACKAGE_LIBS@
+ cssed_LINK = g++ -DGTK -o cssed