From: Carsten Lohrke <carlo@gentoo.org>
Date: Sun, 15 Apr 2007 22:47:28 +0000 (+0000)
Subject: Fix bug #143375, care for some tests.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6d0ce54478f23ff5bd0dc3955881f90393b7963;p=gentoo.git

Fix bug #143375, care for some tests.
Package-Manager: portage-2.1.2.3
---

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 2650b2c0dae5..d60475921781 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.86 2007/02/05 12:35:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.87 2007/04/15 22:47:28 carlo Exp $
+
+*kdebase-kioslaves-3.5.6-r1 (15 Apr 2007)
+
+  15 Apr 2007; Carsten Lohrke <carlo@gentoo.org>
+  +kdebase-kioslaves-3.5.6-r1.ebuild:
+  Fix bug #143375, care for some tests.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kdebase-3.4.1-configure.patch,
diff --git a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.5.6-r1 b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.5.6-r1
new file mode 100644
index 000000000000..7f2b669fe56f
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.5.6-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599
+RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599
+SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..b2829eb1e434
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild,v 1.1 2007/04/15 22:47:28 carlo Exp $
+
+KMNAME=kdebase
+KMMODULE=kioslave
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="hal kdehiddenvisibility ldap openexr samba"
+DEPEND="ldap? ( net-nds/openldap )
+	samba? ( >=net-fs/samba-3.0.1 )
+	>=dev-libs/cyrus-sasl-2
+	hal? ( || ( dev-libs/dbus-qt3-old ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
+		   =sys-apps/hal-0.5* )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!<kde-base/kdesktop-3.5.6-r1"
+RDEPEND="${DEPEND}
+	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)"	# for the kdeeject script used by the devices/mounthelper ioslave
+DEPEND="${DEPEND}
+	x11-apps/xhost"
+
+# see bug #143375
+KMEXTRA="kdesktop/init"
+
+pkg_setup() {
+	kde_pkg_setup
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "To enable HAL support in this package is required to have"
+		eerror "sys-apps/dbus compiled with Qt 3 support."
+		eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+		die "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+	fi
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+	#  FIXME - disable broken tests
+	sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/smtp/Makefile.am || die "sed failed"
+	sed -i -e "s:TESTS =.*:TESTS =:" ${S}/kioslave/trash/Makefile.am || die "sed failed"
+
+	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
+		einfo "User ${USER} has no X access, disabling some tests."
+		for ioslave in media remote home system ; do
+			sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \
+				-i kioslave/${ioslave}/Makefile.am || die "sed failed"
+		done
+	fi
+}
+
+src_compile() {
+	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+	kde-meta_src_compile
+}