Fix as-needed issue (bug #381345).

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 36 insertions, 13 deletions

diff --git a/dev-util/ccglue/ChangeLog b/dev-util/ccglue/ChangeLog
index dc4f098c8671..174d39f15a87 100644
--- a/dev-util/ccglue/ChangeLog
+++ b/dev-util/ccglue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ccglue
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccglue/ChangeLog,v 1.2 2011/06/25 10:13:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccglue/ChangeLog,v 1.3 2011/08/31 21:22:44 radhermit Exp $
+
+  31 Aug 2011; Tim Harder <radhermit@gentoo.org> ccglue-0.3.1.ebuild,
+  +files/ccglue-0.3.1-as-needed.patch:
+  Fix as-needed issue (bug #381345).
 
 *ccglue-0.3.1 (25 Jun 2011)
 
diff --git a/dev-util/ccglue/Manifest b/dev-util/ccglue/Manifest
index bea65c0752b6..86ff11b0ca42 100644
--- a/dev-util/ccglue/Manifest
+++ b/dev-util/ccglue/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX ccglue-0.2.0-string.patch 178 RMD160 4b637c2d370a9aedf9d8e9e40577d39a6ecd1f1d SHA1 bbe5fa4742d34f603ae19d432d071c17fbb1425a SHA256 45a1093bd8e3fafde9d0545ef501973da69af519a7c0575d035b1223883b71e6
+AUX ccglue-0.3.1-as-needed.patch 345 RMD160 466c5497bc6bb96cbbaeb0d3ab8aea1cd002c573 SHA1 32c1ee8e36a8258fadf7c0e95b54090a20be7650 SHA256 6be62084887e0560d0ec46cdbd5d68d9d72f4efda95535db40d68a9c57f7f548
 DIST ccglue-release-0.2.0.tar.gz 98134 RMD160 2cf2f0f7fdfb9e13b98dcd6e21ff167abcd6c678 SHA1 56538f7540bf020a8da4b55e19577fa827465cf3 SHA256 64a138506951fcfac11cbc35894b3635689f0c1708015ceb14ec397ee00f3d7b
 DIST ccglue-release-0.3.1.tar.gz 101529 RMD160 55d0371980db3d75af382f5967176b8b8c761c8a SHA1 afe4ab55dcff18e72625b8f3a3e1d6da11d39fc2 SHA256 9954bb2af56e8bc313820081f4d45c564b34804978c5a7682846ae98a941b332
 EBUILD ccglue-0.2.0.ebuild 656 RMD160 a5f02ad3b7721755db45f436c320406f94bce570 SHA1 461f96d919fa7c92e28d6715a331b2c00fd97188 SHA256 b0b619e000ba848e68a9c842a5deec2f382b705bac2475cb46f59272f4a64535
-EBUILD ccglue-0.3.1.ebuild 581 RMD160 99c92d444d47f19a8b91356a0becf96a9548a7ce SHA1 4bde535682c0fdd72d902ecd8158a9ae81aef064 SHA256 6b4d73a767b38adc0ed864d461a37557ad28ce601a00bfebe08fa0a7499c5600
-MISC ChangeLog 493 RMD160 1a007cc047c6a0a4bd080180852c65cb39bd1a65 SHA1 372c769b36303d7842e91228d4fbeec0ff09fc2b SHA256 75db4ac7903c0ca3b834784191e56115594820ff0387ab375502ca40b56595ba
+EBUILD ccglue-0.3.1.ebuild 682 RMD160 b24781cbcf2f44ec2a4342b3e05e1c1f08f4eebb SHA1 db1a0c7fcfbac4fdd9cc31b4f24182cf8846d8a7 SHA256 a4c8dcc6890ad3048937d00d60cfd21e37ea85e159016f398098b219acb157da
+MISC ChangeLog 640 RMD160 1b9037a7efb379b0ba3d703901c32fe1b9edf5d5 SHA1 a0557e8f07733f802a3192e0aec99ce7f9a39612 SHA256 076b3993b3a7f33d53c55192de3df18916eb6da538b3c41968faf837cbddd07f
 MISC metadata.xml 396 RMD160 41d03531b8bdf7a2db07ab1fac5a30d722ad23f9 SHA1 d2123f39f5ffa3b8231b5bcdeefdab2f8c92e689 SHA256 5ee3ca1db2c3ac8f66bcfeaebe7389e34f0db234e65edfb109aec574cdc05424
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOBbTnAAoJEEqz6FtPBkyjiuIIALWUmU4ItY/yHHNAscaLycud
-U1pOPJw59S1x7Qh1s7kJMVB0J3hSlCFmiAGHg7fG+sSbA8OJ3Ejnc0B4F5+eQs/7
-V+/mlV8pUpXYDKt1XtG6DwDlFdufWnx4jwclSgHpFI1E153PhXLVZVS6jet5Nn/7
-TQHTdfKBlpUpRSlJAQOuLRzNvo8u4Pd0VxevE0kX9gIu+NG9JSNgUf6KffOis5vD
-rxMSTIsz4OS52mrHb+Kz9qdPLd6xV5r2CS1NVhsHQ0yHzMQXbNFxHxmDiWuXUmhp
-KeKTMSf/r4C3v6ZLFkelHXPsgudQ4TDaFyQZkBe+wS7FQo5z/7TvtXQebbE30EA=
-=wRe+
+iQEcBAEBCgAGBQJOXqYxAAoJEEqz6FtPBkyjaAcH/0Naj3wvzTEh/vtgMYzDbKMV
+yXKRyz2mHfBKc5boSqw0Zwn/uP+JxQoQA9CsIJsaylywBb2CQSNpgrsPrvAeVSCC
+CrxRX36FfBpdh/voPqgoLU2lqU4AlkVmlyGVXLAVsq/5CY2N7IDuwm5NnU/VPHxE
+Gr7I/u0DhaBwoJXJm1X9//NgUDxuXiCYX5rb9ytQsaR7DzNfHbWnITuIujLoIt/3
+cPwSEX2zugvkaAJUihaJ/hi/JevXUv8JFI4lrdObbRfTPOKRkJt9gj6DHOjuMrUb
+SMoCOALG2UHqmitphQeeOD3zF+T9/6XHCgjt6s0oXrNhJuf7ukCpE33tR2gBVu4=
+=WqPP
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ccglue/ccglue-0.3.1.ebuild b/dev-util/ccglue/ccglue-0.3.1.ebuild
index bf1f035bd265..153403ef1aa6 100644
--- a/dev-util/ccglue/ccglue-0.3.1.ebuild
+++ b/dev-util/ccglue/ccglue-0.3.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccglue/ccglue-0.3.1.ebuild,v 1.1 2011/06/25 10:13:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccglue/ccglue-0.3.1.ebuild,v 1.2 2011/08/31 21:22:44 radhermit Exp $
 
 EAPI=4
 
+inherit autotools eutils
+
 DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
 HOMEPAGE="http://ccglue.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.gz"
@@ -18,3 +20,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/release-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
diff --git a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
new file mode 100644
index 000000000000..5f2e5e34c5b5
--- /dev/null
+++ b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
@@ -0,0 +1,11 @@
+--- release-0.3.1/src/Makefile.am.orig
++++ release-0.3.1/src/Makefile.am
+@@ -1,6 +1,4 @@
+ bin_PROGRAMS = ccglue
+ ccglue_SOURCES = cscoperdr.c seqfile.c sym_mgr.c digraph.c options.c main.c c_glue.c
+-INCLUDES = `pkg-config --cflags glib-2.0`
+-AM_LDFLAGS = `pkg-config --libs glib-2.0`
+-
+-
++AM_CFLAGS = $(GLIB_CFLAGS)
++ccglue_LDADD = $(GLIB_LIBS)