Disabled make check if xv is not installed. See bug #70135.

4 files changed, 58 insertions, 6 deletions

diff --git a/media-libs/libungif/ChangeLog b/media-libs/libungif/ChangeLog
index be6db654e0af..e858b930e4ad 100644
--- a/media-libs/libungif/ChangeLog
+++ b/media-libs/libungif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libungif
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/ChangeLog,v 1.19 2004/10/02 22:24:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/ChangeLog,v 1.20 2004/11/06 08:50:27 usata Exp $
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> libungif-4.1.0.1b.ebuild,
+  libungif-4.1.3.ebuild:
+  Disabled make check if xv is not installed. See bug #70135.
 
   02 Oct 2004; Travis Tilley <lv@gentoo.org> libungif-4.1.0.1b.ebuild:
   fixed the libdir sandbox violations for the stable libungif too
diff --git a/media-libs/libungif/Manifest b/media-libs/libungif/Manifest
index 67bbe0435bd5..2aa25885e388 100644
--- a/media-libs/libungif/Manifest
+++ b/media-libs/libungif/Manifest
@@ -1,7 +1,17 @@
-MD5 b37254feb4ad1d1db955664e4cd49131 ChangeLog 2887
-MD5 849a1a4af2dcfcbedf129ead41ad0d96 libungif-4.1.3.ebuild 1590
-MD5 abd00083eac950e3d8205ca26b24bb01 libungif-4.1.0.1b.ebuild 1736
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b95e0489f0465015b61ff5a36094010 ChangeLog 3053
+MD5 023fdba0c5061f88719c5097813f1b6f libungif-4.1.0.1b.ebuild 2181
+MD5 c64f165c5de28bdf877b9f7892e294c2 libungif-4.1.3.ebuild 2027
 MD5 f71b3a2bf523f503987501c602a1c1e9 files/digest-libungif-4.1.0.1b 69
 MD5 4dce5cb6bb39518676e2056624963e1a files/libungif-4.1.0-stdarg.patch 655
 MD5 934f005d68b860ad80eff92ecf9e0273 files/libungif-CVS.patch 4542
 MD5 c8f7239f2db03a50ebcc2bd24a0cf8d0 files/digest-libungif-4.1.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjI7aVWNWqTUmv+0RAvQQAKCiJuZrgxCmaINJmEpqhAjhDSoDxQCfTXZf
+hCvc8s0H2cEPg6fHumQXCzc=
+=fY6l
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libungif/libungif-4.1.0.1b.ebuild b/media-libs/libungif/libungif-4.1.0.1b.ebuild
index e83fe0714e68..624f4a763b3f 100644
--- a/media-libs/libungif/libungif-4.1.0.1b.ebuild
+++ b/media-libs/libungif/libungif-4.1.0.1b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0.1b.ebuild,v 1.15 2004/10/02 22:24:21 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.0.1b.ebuild,v 1.16 2004/11/06 08:50:27 usata Exp $
 
 inherit eutils libtool
 
@@ -60,3 +60,22 @@ pkg_postinst() {
 		einfo "this and giflib"
 	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 src_test for this package."
+		ewarn
+		epause; ebeep; epause
+	fi
+}
diff --git a/media-libs/libungif/libungif-4.1.3.ebuild b/media-libs/libungif/libungif-4.1.3.ebuild
index 3160c38c7a3f..0b6d3091234e 100644
--- a/media-libs/libungif/libungif-4.1.3.ebuild
+++ b/media-libs/libungif/libungif-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.3.ebuild,v 1.2 2004/10/02 10:06:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libungif/libungif-4.1.3.ebuild,v 1.3 2004/11/06 08:50:28 usata Exp $
 
 inherit eutils libtool
 
@@ -48,3 +48,22 @@ pkg_postinst() {
 		einfo "this and giflib"
 	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 src_test for this package."
+		ewarn
+		epause; ebeep; epause
+	fi
+}