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

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

2 files changed, 24 insertions, 13 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/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
 }