Stop depending on dev-util/pkgconfig wrt #374775 by dragos240. USE=static-libs and drop .la files, ebuild cleanup etc

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

3 files changed, 46 insertions, 24 deletions

diff --git a/dev-libs/libgamin/ChangeLog b/dev-libs/libgamin/ChangeLog
index ca1f9dfc7642..bd52f00040e4 100644
--- a/dev-libs/libgamin/ChangeLog
+++ b/dev-libs/libgamin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgamin
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.25 2010/06/16 18:43:43 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.26 2011/07/11 04:16:29 ssuominen Exp $
+
+  11 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libgamin-0.1.10-r2.ebuild:
+  Stop depending on dev-util/pkgconfig wrt #374775 by dragos240. USE="static-libs"
+  and remove libtool archive.
 
   16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   libgamin-0.1.10-r2.ebuild,
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 3c585ff2fc91..6615296fda53 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libgamin-0.1.10-compilewarnings.patch 526 RMD160 b460c5b724a36934c5e4a411a3d5e6d5a8f820ef SHA1 8358f05948018bfd46b752f76006f5272f5f9385 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68
 AUX libgamin-0.1.10-disable_python_static_library.patch 340 RMD160 9e479b3483d658efdeff40f92e3a405568467623 SHA1 c7378e36fe7a15ba92fbef45c57515e922d3bb52 SHA256 460306119bc6be6fd19d173eadfa28493fc72e90fceaf3ee49b50fee50a4f5d1
 AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7
 DIST gamin-0.1.10.tar.gz 653392 RMD160 fb6ba5ec2d2f49afacf10dda4095f02f5930d686 SHA1 f4c6b9fe87757552ef58fef4abef9e42cd3142ac SHA256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 RMD160 9f53abfcb9e785e9408cb8f1d35ff36fb739d878 SHA1 3d276802bbab47885dfcba0bbe6422711c84e676 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723
-EBUILD libgamin-0.1.10-r2.ebuild 2990 RMD160 ccbc0a4c663ff83acb342892da58c1b91bd6d60b SHA1 d51e84ae1d65e5ca8ea3fc2046ae0666477d7476 SHA256 62719902d63e5654614670041aaf52b2e94f214deb1351c572feb81e75f192ac
-MISC ChangeLog 3603 RMD160 60e852119e4e442416cf465f94b3543478c6e3c2 SHA1 6aeea26314151c7851d0111500acf624b2bde24e SHA256 d48808b2de083f8291f3bcdbb6f24bfdc905d137732eb70f66fd3054c5ff7967
+DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
+EBUILD libgamin-0.1.10-r2.ebuild 3153 RMD160 6837da9d626d1c0f413ee31d2e380e20d4fe9478 SHA1 272bef989315263ded2552455dff3353d36f1266 SHA256 4a0dc1f3602dd31e4aaf2d82d25e1c35e4434667f6b1d2de8d617ed8889f8ca2
+MISC ChangeLog 3801 RMD160 8c0c2aef1eb3d4bdeea1dde8a9a7547d4a6ba896 SHA1 d18935f1b7d5d3c0aa5515c0ac88dd4dcb51b075 SHA256 3c6d26bdc5e655963223d2f0f1674c5641f79843641c08505fe104a24c2eb366
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4aeMcACgkQXkR9YqOcLPHcfwD9EvdaRAqy3ftdNxc20SAorVLg
+LVctQzfTfrUygAQyHz4BAI0c2eZD7+iM+PLjB2r7BwA15DNzWtVidCOT3f7ELG+C
+=rn1u
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
index 20222730681f..87b51c12b488 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.12 2010/06/16 18:43:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.13 2011/07/11 04:16:29 ssuominen Exp $
+
+EAPI=2
 
-EAPI="2"
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
@@ -15,22 +16,21 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
 HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
 SRC_URI="http://www.gnome.org/~veillard/${MY_PN}/sources/${MY_P}.tar.gz
-	mirror://gentoo/${MY_PN}-0.1.9-freebsd.patch.bz2"
+	mirror://gentoo/${MY_PN}-0.1.9-freebsd.patch.bz2
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug kernel_linux python"
+IUSE="debug kernel_linux python static-libs"
 
 RESTRICT="test" # need gam-server
 
 RDEPEND="!app-admin/fam
 	!<app-admin/gamin-0.1.10"
+DEPEND="${RDEPEND}"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	if use python; then
@@ -39,17 +39,19 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
 	# Fix QA warnings, bug #257281, upstream #466791
-	epatch "${FILESDIR}/${P}-compilewarnings.patch"
+	epatch "${FILESDIR}"/${P}-compilewarnings.patch
 
 	# Fix compile warnings; bug #188923
-	epatch "${DISTDIR}/${MY_PN}-0.1.9-freebsd.patch.bz2"
+	epatch "${DISTDIR}"/${MY_PN}-0.1.9-freebsd.patch.bz2
 
 	# Fix collision problem due to intermediate library, upstream bug #530635
-	epatch "${FILESDIR}/${P}-noinst-lib.patch"
+	epatch "${FILESDIR}"/${P}-noinst-lib.patch
 
 	# Build only shared version of Python module.
-	epatch "${FILESDIR}/${P}-disable_python_static_library.patch"
+	epatch "${FILESDIR}"/${P}-disable_python_static_library.patch
 
 	# Python bindings are built/installed manually.
 	sed -e "/SUBDIRS += python/d" -i Makefile.am
@@ -57,15 +59,17 @@ src_prepare() {
 	# autoconf is required as the user-cflags patch modifies configure.in
 	# however, elibtoolize is also required, so when the above patch is
 	# removed, replace the following call with a call to elibtoolize
-	eautoreconf
+	AT_M4DIR="${WORKDIR}" eautoreconf
 
 	# disable pyc compiling
-	mv "${S}"/py-compile "${S}"/py-compile.orig
-	ln -s $(type -P true) "${S}"/py-compile
+	rm -f py-compile
+	ln -s $(type -P true) py-compile
 }
 
 src_configure() {
-	econf --disable-debug \
+	econf \
+		$(use_enable static-libs static) \
+		--disable-debug \
 		--disable-server \
 		$(use_enable kernel_linux inotify) \
 		$(use_enable debug debug-api) \
@@ -89,7 +93,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
+	emake DESTDIR="${D}" install || die
 
 	if use python; then
 		installation() {
@@ -104,8 +108,10 @@ src_install() {
 		python_clean_installation_image
 	fi
 
-	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt || die "dodoc failed"
-	dohtml doc/* || die "dohtml failed"
+	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt || die
+	dohtml doc/* || die
+
+	find "${D}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {