Stop depending on dev-util/pkgconfig wrt #374775 by dragos240

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

3 files changed, 32 insertions, 20 deletions

diff --git a/app-admin/gam-server/ChangeLog b/app-admin/gam-server/ChangeLog
index 284ec3ef3edc..d8fbd9b3c306 100644
--- a/app-admin/gam-server/ChangeLog
+++ b/app-admin/gam-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gam-server
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.9 2009/09/25 10:50:13 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.10 2011/07/11 04:25:40 ssuominen Exp $
+
+  11 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> gam-server-0.1.10.ebuild:
+  Stop depending on dev-util/pkgconfig wrt #374775 by dragos240
 
   25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/gamin-0.1.9-freebsd.patch, gam-server-0.1.10.ebuild:
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index c1fe6934d4bb..fb320e5c1fc4 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gam-server-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 gam-server-0.1.10.ebuild 1638 RMD160 86454a4318baecac9e3d3af4f23023a0aa3a42eb SHA1 54831f60a1a3f099438231ba6555360f4944f1fa SHA256 6c8eea3f7c3f96b0916e786b414cfac808110aeb6dc342f90e47ede892a11076
-MISC ChangeLog 1459 RMD160 f9241c8276dcb08335db99b8659cc033ef54c315 SHA1 6c51d66a4621f4900adb89f555ad4095c81a1ee9 SHA256 82694604929c9ac2a3cc96f892857f84e7f06e90dde4fcc2e838bd77739a35c4
+DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
+EBUILD gam-server-0.1.10.ebuild 1938 RMD160 1b89121ce4144792f34596b83dde4fa1fa5a85eb SHA1 21769265c851a5e32259fb087e3e123e8533077a SHA256 588db561a613c2023642370050049d96889d46b5fac826926295a2163a57af4b
+MISC ChangeLog 1605 RMD160 939fe04b60842b32cc149a80588c8a74cb38ccfd SHA1 0109480b3b398273fec7378a3b253b935fa99567 SHA256 3388b63119481991318bafbf4d034edb51527e5597bf7546d57bde3abed75286
 MISC metadata.xml 193 RMD160 d229eaaf3f5d3937df3a8242fbb874afee3afeff SHA1 c11375432387dea6f6f9b80baf1490c17f9674ae SHA256 4143c03933b7210719f44d20a67303de568d2b5a064ab0903720ce628ce4afa2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkq8oG4ACgkQAiZjviIA2Xi2XgCg6cM8mkgKIt5NDmZZJUaElo59
-SogAn2k33gU6RMb5QhKpzf4OzZhXQSeI
-=0Yeq
+iF4EAREIAAYFAk4aeu8ACgkQXkR9YqOcLPFQfQEAjZD0vItwA62yVzlSKG+Qr9Fc
+qgjpO05xcyE8CQXB51QA+wdVjTAPDSg1hewjW7K4HPRnf5niCfUPDVKkgPqydTJv
+=DFlP
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gam-server/gam-server-0.1.10.ebuild b/app-admin/gam-server/gam-server-0.1.10.ebuild
index 36f4d9119bf2..73de1434b3c3 100644
--- a/app-admin/gam-server/gam-server-0.1.10.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.9 2009/09/25 10:50:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.10 2011/07/11 04:25:40 ssuominen Exp $
 
-inherit autotools eutils flag-o-matic libtool python
+inherit autotools eutils flag-o-matic libtool multilib python
 
 MY_PN="gamin"
 MY_P=${MY_PN}-${PV}
@@ -10,7 +10,8 @@ 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"
@@ -22,15 +23,16 @@ RDEPEND=">=dev-libs/glib-2
 	!app-admin/fam
 	!<app-admin/gamin-0.1.10"
 
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
 	# Fix compile warnings; bug #188923
 	epatch "${DISTDIR}/${MY_PN}-0.1.9-freebsd.patch.bz2"
 
@@ -40,21 +42,27 @@ src_unpack() {
 	# 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
 }
 
 src_compile() {
 	# fixes bug 225403
 	#append-flags "-D_GNU_SOURCE"
 
-	econf --disable-debug \
+	if ! has_version dev-util/pkgconfig; then
+		export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
+		export DAEMON_LIBS="-lglib-2.0"
+	fi
+
+	econf \
+		--disable-debug \
 		--disable-libgamin \
 		$(use_enable kernel_linux inotify) \
 		$(use_enable debug debug-api)
 
-	emake || die "emake failed"
+	emake || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "installation failed"
+	emake DESTDIR="${D}" install || die
 }