From: Daniel Drake <dsd@gentoo.org>
Date: Tue, 25 Oct 2005 17:01:02 +0000 (+0000)
Subject: Stop using gnome2 eclass. Use emake -j1 to prevent compilation errors - solves the... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7211b9d9e0a9c05227fccc685c2a4eb9c8f70255;p=gentoo.git

Stop using gnome2 eclass. Use emake -j1 to prevent compilation errors - solves the USE=webservices problem.
Package-Manager: portage-1.589-cvs
---

diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog
index 57e6b368e766..4127f50c0713 100644
--- a/app-misc/beagle/ChangeLog
+++ b/app-misc/beagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/beagle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.1 2005/10/24 14:02:17 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.2 2005/10/25 17:01:02 dsd Exp $
+
+  25 Oct 2005; Daniel Drake <dsd@gentoo.org> beagle-0.1.1.ebuild:
+  Stop using gnome2 eclass. Use emake -j1 to prevent compilation errors -
+  solves the USE=webservices problem.
 
 *beagle-0.1.1 (24 Oct 2005)
 
diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest
index 1c2ef06d96af..273147f2586b 100644
--- a/app-misc/beagle/Manifest
+++ b/app-misc/beagle/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 067a64ceb2a8be2583f99eab522eaa08 beagle-0.1.1.ebuild 2947
-MD5 7ebc3e7303ef4457b02d369e19b2e5ec ChangeLog 458
+MD5 a18dac353c947f0e14d279e5b7bf8748 beagle-0.1.1.ebuild 3019
+MD5 9bd252b5a2edd31b4823eec66f9cf1e5 ChangeLog 637
 MD5 43c872252a620e391c449e150e344a3a metadata.xml 224
 MD5 3375984ea7d16737cd465bae6ed3d928 files/beagle-0.1.1-null-task-source.patch 1347
 MD5 9c5c2f0ad3f959022b402ddba4dc671d files/beagle-0.1.1-uri-serialization.patch 2704
@@ -10,7 +10,7 @@ MD5 4840546d3689482f55c682ef01d4807b files/digest-beagle-0.1.1 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXOqdTOXg++0VvJQRAq/1AJ9Jb/l2LfLYDqWKoM0mNnqlkkEaYgCeO6oH
-NflvfeUminwvTnV6nx8IYb4=
-=wv7r
+iD8DBQFDXmUqTOXg++0VvJQRAlw3AKCo0K8M7xTAx89maq58SGUtvnSiVwCeNzya
+EKCN94y+xMpPzzbkD2D9lzY=
+=QLUK
 -----END PGP SIGNATURE-----
diff --git a/app-misc/beagle/beagle-0.1.1.ebuild b/app-misc/beagle/beagle-0.1.1.ebuild
index c9f7b472b4be..cf9e22526ac0 100644
--- a/app-misc/beagle/beagle-0.1.1.ebuild
+++ b/app-misc/beagle/beagle-0.1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.1.ebuild,v 1.1 2005/10/24 14:02:17 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.1.1.ebuild,v 1.2 2005/10/25 17:01:02 dsd Exp $
 
-inherit gnome.org gnome2 eutils mono
+inherit gnome.org eutils mono
 
 DESCRIPTION="Beagle is a search tool that ransacks your personal information space to find whatever you're looking for."
 HOMEPAGE="http://www.beagle-project.org/"
@@ -49,16 +49,9 @@ DEPEND="${RDEPEND}
 		x11-proto/scrnsaverproto )
 	virtual/x11 )"
 
-USE_DESTDIR="1"
+EXTRA_EMAKE="-j1"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-	G2CONF="${G2CONF} \
-	$(use_enable webservices) \
-	--enable-libbeagle \
-	--disable-evolution-sharp"
-
 	if built_with_use dev-libs/gmime mono
 	then
 		einfo "Mono support enabled in dev-libs/gmime, I will continue..."
@@ -91,17 +84,25 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-uri-serialization.patch
 }
 
+src_compile() {
+	econf $(use_enable webservices) \
+		--enable-libbeagle \
+		--disable-evolution-sharp \
+		|| die "configure failed"
+	emake -j1 || die "Make failed"
+}
+
 src_install() {
-	gnome2_src_install
+	make DESTDIR="${D}" install || die "Install failed!"
 
 	dodir /usr/share/beagle
 	insinto /usr/share/beagle
 	doins mozilla-extension/beagle.xpi
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 }
 
 pkg_postinst () {
-	gnome2_pkg_postinst
-
 	einfo "If available, Beagle greatly benefits from using certain operating"
 	einfo "system features such as Extended Attributes and inotify."
 	echo