From 0e08774e867bf99f07f4ab5adb909e8bb428c275 Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Thu, 19 Apr 2007 10:38:00 +0000 Subject: [PATCH] Care for some tests. Package-Manager: portage-2.1.2.4 --- app-office/koffice-libs/ChangeLog | 5 ++++- app-office/koffice-libs/koffice-libs-1.6.2.ebuild | 8 +++++++- app-office/koffice/ChangeLog | 5 ++++- app-office/koffice/koffice-1.6.2-r1.ebuild | 8 +++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog index 1ca83b099749..b96c19dfb36d 100644 --- a/app-office/koffice-libs/ChangeLog +++ b/app-office/koffice-libs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/koffice-libs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.74 2007/03/02 02:04:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.75 2007/04/19 10:34:11 carlo Exp $ + + 19 Apr 2007; Carsten Lohrke koffice-libs-1.6.2.ebuild: + Care for some tests. 02 Mar 2007; Jeroen Roovers koffice-libs-1.6.1.ebuild: Stable for HPPA. diff --git a/app-office/koffice-libs/koffice-libs-1.6.2.ebuild b/app-office/koffice-libs/koffice-libs-1.6.2.ebuild index 28841ef2018c..cb827c44d7ea 100644 --- a/app-office/koffice-libs/koffice-libs-1.6.2.ebuild +++ b/app-office/koffice-libs/koffice-libs-1.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6.2.ebuild,v 1.2 2007/02/16 20:29:19 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6.2.ebuild,v 1.3 2007/04/19 10:34:11 carlo Exp $ MAXKOFFICEVER=${PV} KMNAME=koffice @@ -45,6 +45,12 @@ src_unpack() { # Force the compilation of libkopainter. sed -i 's:$(KOPAINTERDIR):kopainter:' "${S}/lib/Makefile.am" + if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then + einfo "User ${USER} has no X access, disabling some tests." + sed -e "s:SUBDIRS = . tests:SUBDIRS = .:" -i lib/store/Makefile.am || die "sed failed" + sed -e "s:SUBDIRS = kohyphen . tests:SUBDIRS = kohyphen .:" -i lib/kotext/Makefile.am || die "sed failed" + fi + kde-meta_src_unpack makefiles } diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog index 9b682d77ba39..8bb1dccf4a53 100644 --- a/app-office/koffice/ChangeLog +++ b/app-office/koffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/koffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.217 2007/03/18 22:33:00 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.218 2007/04/19 10:38:00 carlo Exp $ + + 19 Apr 2007; Carsten Lohrke koffice-1.6.2-r1.ebuild: + Care for some tests. *koffice-1.6.2-r1 (18 Mar 2007) diff --git a/app-office/koffice/koffice-1.6.2-r1.ebuild b/app-office/koffice/koffice-1.6.2-r1.ebuild index 09bfed66603f..b954d6a3c93d 100644 --- a/app-office/koffice/koffice-1.6.2-r1.ebuild +++ b/app-office/koffice/koffice-1.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6.2-r1.ebuild,v 1.1 2007/03/18 22:33:00 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6.2-r1.ebuild,v 1.2 2007/04/19 10:38:00 carlo Exp $ inherit kde @@ -76,6 +76,12 @@ src_unpack() { `ls ${S}/krita/colorspaces/*/Makefile.am` sed -i -e "s:toolbar tests:toolbar:" ${S}/kplato/Makefile.am + if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then + einfo "User ${USER} has no X access, disabling some tests." + sed -e "s:SUBDIRS = . tests:SUBDIRS = .:" -i lib/store/Makefile.am || die "sed failed" + sed -e "s:SUBDIRS = kohyphen . tests:SUBDIRS = kohyphen .:" -i lib/kotext/Makefile.am || die "sed failed" + fi + # Labplot needs the header file sed -i -e "s:utils.h:utils.h parser/parser.h:" ${S}/kexi/kexidb/Makefile.am || die "sed failed" } -- 2.26.2