From: Mamoru Komachi <usata@gentoo.org>
Date: Tue, 23 Nov 2004 11:32:36 +0000 (+0000)
Subject: Disables make check if xv is not installed. This closes bug #71895.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba9214cb1f63b64731acb1051e3efb74511be9d3;p=gentoo.git

Disables make check if xv is not installed. This closes bug #71895.
---

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 7d09e8aa2c07..b455ed4ef5f4 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/giflib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.16 2004/09/30 09:44:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.17 2004/11/23 11:32:36 usata Exp $
+
+  23 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> giflib-4.1.0-r3.ebuild:
+  Disables make check if xv is not installed. This closes bug #71895.
 
 *giflib-4.1.3 (30 Sep 2004)
 
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index f410ac944100..4dae467d7596 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,5 +1,15 @@
-MD5 80492e65c6171e9a2d08dfebb8c2c1bb ChangeLog 2159
-MD5 1caabac90097241be52b055a0db54722 giflib-4.1.0-r3.ebuild 1775
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 721a7654edfc8476582c25d7226eac40 ChangeLog 2303
+MD5 9e97783752b429f53bf5d71bac2544b4 giflib-4.1.0-r3.ebuild 2253
 MD5 8b1514bb8ac3cd7d7b392ed6a6f78b2b giflib-4.1.3.ebuild 1719
 MD5 93888297538e2f77defcfef93578b8db files/digest-giflib-4.1.0-r3 64
 MD5 eff137a49d638c20405a6f8c9c4ad5b5 files/digest-giflib-4.1.3 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBox5AVWNWqTUmv+0RAgC9AKC4Wnsh1CXqc7RJIYtnL48maLLJNwCgjPsK
+a/sSe5aCKw9KUlLYPtsT0UA=
+=elyp
+-----END PGP SIGNATURE-----
diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild
index 7a92ae20d8e0..0eb9be2739d9 100644
--- a/media-libs/giflib/giflib-4.1.0-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.30 2004/11/09 22:22:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.31 2004/11/23 11:32:36 usata Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="Library to handle, display and manipulate GIF images"
 HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml"
@@ -57,3 +57,23 @@ pkg_postinst() {
 		einfo "make sure that you have libungif emerged."
 	fi
 }
+
+src_test() {
+	if has_version 'media-gfx/xv' ; then
+		if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) ; then
+			ewarn
+			ewarn "You are not authorised to conntect to X server to make check."
+			ewarn "Disabling make check."
+			ewarn
+			epause; ebeep; epause
+		else
+			make check || die "make check failed"
+		fi
+	else
+		ewarn
+		ewarn "You need media-gfx/xv to run the tests for this package."
+		ewarn "Disabling make check."
+		ewarn
+		epause; ebeep; epause
+	fi
+}