(non maintainer commit) fix tests when USE=gnome is present, bug 235849 by Mounir Lamouri

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 22 insertions, 102 deletions

diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog
index 2a21ba2a57ad..fc903fa150cc 100644
--- a/net-im/ekiga/ChangeLog
+++ b/net-im/ekiga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ekiga
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ChangeLog,v 1.60 2009/02/05 03:04:07 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ChangeLog,v 1.61 2009/02/16 19:21:49 darkside Exp $
+
+  16 Feb 2009; Jeremy Olexa <darkside@gentoo.org> -ekiga-2.0.11.ebuild,
+  ekiga-2.0.12.ebuild:
+  (non maintainer commit) fix tests when USE=gnome is present, bug 235849 by
+  Mounir Lamouri
 
   05 Feb 2009; Jeremy Olexa <darkside@gentoo.org> ekiga-2.0.12.ebuild:
   (non maintainer commit) Don't use bundled intltool, causes problems for some
diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest
index 78546480da2a..becec60bc398 100644
--- a/net-im/ekiga/Manifest
+++ b/net-im/ekiga/Manifest
@@ -3,9 +3,7 @@ AUX ekiga-2.0.12-gdu.patch 2274 RMD160 b7f44eee0568e3baa844a2e08994718711bfe773
 AUX ekiga-eggtrayicon-transparency.diff 2960 RMD160 9303bf9c0dcb2f666b88622a772540136f0a63df SHA1 d8a7b866ba119d286899f19a3ddb618f117398de SHA256 9cf235b64f1201e0119a55c76db6d1c243abb971757e5d781aa95c3724138e37
 AUX ekiga-eggtrayicon-update.diff 13969 RMD160 159f1164516362b90ef8e63988ba5fa77c544e13 SHA1 edc6809219a312483f2f8c77f07a0d88a2ce5cff SHA256 1db286369b81677d559b38261ce5f6686de41e3d645808f7ecb57cee6eaf82d6
 AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f19b5d7add4db5fa1f4e301d92101188c48006f SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d
-DIST ekiga-2.0.11.tar.bz2 5550887 RMD160 f53f633075ecc8c75d17e761ff494042717f4581 SHA1 9096a4d7bb737981920a8141f0305c616cd442c6 SHA256 5bd9f811685ec6d73b59ebcb66b8c26e673d40452b75d7a0d5dc9bf203fb5766
 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9
-EBUILD ekiga-2.0.11.ebuild 2343 RMD160 f3676120f0c3602b1517c47e8b9940d08032d79a SHA1 b8f816c48761307ab10e39496fcf749b8fe2867b SHA256 988e8f24195facba957790967c03c00a9a345b9cbe3b95264495c4093659c11e
-EBUILD ekiga-2.0.12.ebuild 2339 RMD160 1f11dd7af2a81161ae26ec95490fbffd6239df00 SHA1 473b7e7435099ed379b5d35e92d7eb76a40d19d0 SHA256 84e9ac597f4d56b9126afd1079520300780324ca5c113e28ae86511ac47eec22
-MISC ChangeLog 7848 RMD160 2a332b32f9db972ffe90c8480a076ba29a4fd1b2 SHA1 836e1825f05ae0a93fc17f00c193b91383894011 SHA256 7650fa01234d23329f167246ded393f63a8d5a72c0e473b7794f6d1a7085e8b1
+EBUILD ekiga-2.0.12.ebuild 2683 RMD160 dc69c1516fa486a8622c75625b6e6ed58a1adb37 SHA1 8e9ea8627d66743f942011f60b68689715a87f3a SHA256 05e1f2d30c8fed2c6d541ec0f76c4ba5110d2d6a3b407a77881ad3899ff00cf5
+MISC ChangeLog 8038 RMD160 8c277fc8c80413d483e0530212787976e9c91f8d SHA1 4f6194bff7c3155e93d1259c99ec1f0b792f5347 SHA256 52319e86340656b476efd00f79a942825597de9fb5bfe759c1d5bbd47eae0854
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
diff --git a/net-im/ekiga/ekiga-2.0.11.ebuild b/net-im/ekiga/ekiga-2.0.11.ebuild
deleted file mode 100644
index 74b6590888ab..000000000000
--- a/net-im/ekiga/ekiga-2.0.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ekiga-2.0.11.ebuild,v 1.8 2007/10/12 16:03:26 dertobi123 Exp $
-
-inherit gnome2 eutils flag-o-matic
-
-DESCRIPTION="H.323 and SIP VoIP softphone"
-HOMEPAGE="http://www.ekiga.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="avahi dbus doc gnome sdl"
-
-RDEPEND="~dev-libs/pwlib-1.10.$[${PV##*.}-1]
-	~net-libs/opal-2.2.${PV##*.}
-	>=net-nds/openldap-2.0.0
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/glib-2.0.0
-	>=dev-libs/libxml2-2.6.1
-	sdl? ( >=media-libs/libsdl-1.2.4 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	avahi? ( net-dns/avahi )
-	gnome? ( >=gnome-base/libbonoboui-2.2.0
-		>=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/gnome-vfs-2.2.0
-		>=gnome-base/gconf-2.2.0
-		>=gnome-base/orbit-2.5.0
-		gnome-extra/evolution-data-server
-		>=media-sound/esound-0.2.28
-		doc? ( app-text/gnome-doc-utils ) )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.20
-	gnome? ( app-text/scrollkeeper )"
-
-pkg_setup() {
-	if ! built_with_use dev-libs/pwlib ldap; then
-		eerror "You need to build dev-libs/pwlib with USE=ldap enabled."
-		die "Pwlib w/o ldap-support detected."
-	fi
-
-	if use avahi && ! built_with_use net-dns/avahi dbus; then
-		eerror "You need to build net-dns/avahi with USE=dbus enabled."
-		die "Avahi without dbus-support detected."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# Fix configure to install schemafile into the proper directory
-	epatch "${FILESDIR}"/${PN}-1.99.0-configure.patch
-
-	# fix -gnome compile, bug 133021
-	epatch "${FILESDIR}"/not-gnome.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable dbus) \
-		$(use_enable sdl) \
-		$(use_enable avahi) \
-		$(use_enable doc) \
-		$(use_enable gnome) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	if use gnome; then
-		gnome2_src_install
-	else
-		make DESTDIR="${D}" install || die "make install failed"
-
-		dodoc AUTHORS ChangeLog NEWS
-	fi
-}
-
-pkg_postinst() {
-	if use gnome; then
-		gnome2_pkg_postinst
-
-		# we need to fix the GConf permissions, see bug #59764
-		einfo "Fixing GConf permissions for ekiga"
-		ekiga-config-tool --fix-permissions
-	fi
-}
-
-DOCS="AUTHORS ChangeLog NEWS"
diff --git a/net-im/ekiga/ekiga-2.0.12.ebuild b/net-im/ekiga/ekiga-2.0.12.ebuild
index 2995c12d6cfc..8ce191a32fc8 100644
--- a/net-im/ekiga/ekiga-2.0.12.ebuild
+++ b/net-im/ekiga/ekiga-2.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ekiga-2.0.12.ebuild,v 1.9 2009/02/05 03:04:07 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekiga/ekiga-2.0.12.ebuild,v 1.10 2009/02/16 19:21:49 darkside Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -72,6 +72,19 @@ src_unpack() {
 		|| die "patching configure failed"
 }
 
+src_test() {
+	# xml files don't follow dtd, see bug #235849
+	# prevent tests to fail
+	if use gnome; then
+		sed -i -e "/,check-doc/d" help/Makefile \
+			|| die "patching help/Makefile for tests failed"
+		sed -i -e "/^check:/d" help/Makefile \
+			|| die "patching help/Makefile for tests failed"
+	fi
+
+	emake -j1 check || "emake check failed"
+}
+
 src_install() {
 	if use gnome; then
 		gnome2_src_install