Add patch to properly respect USE flags (#81966).

(Portage version: 2.0.51.19)

8 files changed, 161 insertions, 2 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index cca28b3a6697..a05663780b5d 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.14 2005/05/27 14:45:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.15 2005/06/07 13:01:52 greg_g Exp $
+
+*kdebase-kioslaves-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +kdebase-kioslaves-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966).
 
   27 May 2005; Carsten Lohrke <carlo@gentoo.org>
   kdebase-kioslaves-3.4.0.ebuild, kdebase-kioslaves-3.4.1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1-r1 b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1-r1
new file mode 100644
index 000000000000..518952ccb74d
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1-r1
@@ -0,0 +1,3 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
new file mode 100644
index 000000000000..80cf050b7a45
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/kdebase-3.4.1-configure.patch
@@ -0,0 +1,56 @@
+Index: kioslave/smb/configure.in.bot
+===================================================================
+--- kioslave/smb/configure.in.bot	(revision 420060)
++++ kioslave/smb/configure.in.bot	(working copy)
+@@ -1,4 +1,4 @@
+-if test "$have_libsmbclient" = no; then
++if test "x$with_samba" = xcheck && test "x$have_libsmbclient" = xno; then
+   echo ""
+   echo "You're missing libsmbclient from samba 3.0"
+   echo "KDE will not be able to browse windows shares without it,"
+Index: kioslave/smb/configure.in.in
+===================================================================
+--- kioslave/smb/configure.in.in	(revision 420060)
++++ kioslave/smb/configure.in.in	(working copy)
+@@ -1,20 +1,34 @@
+ AC_DEFUN([SMB_CHECK],
+ [
+ AC_REQUIRE([KDE_CHECK_LARGEFILE])
+-have_libsmbclient=yes
+-KDE_CHECK_HEADER(libsmbclient.h, ,[have_libsmbclient=no] )
+-KDE_CHECK_LIB(smbclient, smbc_new_context, [] ,[have_libsmbclient=no])
+ 
+-AM_CONDITIONAL(include_kioslave_smb, test "$have_libsmbclient" = yes)
++AC_ARG_WITH(samba,
++  [AS_HELP_STRING(--with-samba,
++    [enable the samba ioslave @<:@default=check@:>@])],
++  [], with_samba=check)
+ 
+-SMBCLIENT_EXTRA_LIBS=""
+-AC_CHECK_FUNC(yp_get_default_domain, [],
++have_libsmbclient=no
++if test "x$with_samba" != xno; then
++  have_libsmbclient=yes
++  KDE_CHECK_HEADER(libsmbclient.h, [], [have_libsmbclient=no])
++  KDE_CHECK_LIB(smbclient, smbc_new_context, [], [have_libsmbclient=no])
++
++  SMBCLIENT_EXTRA_LIBS=""
++  AC_CHECK_FUNC(yp_get_default_domain, [],
+   [
+      KDE_CHECK_LIB(nsl, yp_get_default_domain, 
+            [SMBCLIENT_EXTRA_LIBS="-lnsl"] )
+   ])
+ 
+-AC_SUBST(SMBCLIENT_EXTRA_LIBS)
++  AC_SUBST(SMBCLIENT_EXTRA_LIBS)
++
++  if test "x$with_samba" != xcheck && test "x$have_libsmbclient" = xno; then
++    AC_MSG_FAILURE([--with-samba was given, but test for libsmbclient failed])
++  fi
++fi
++
++AM_CONDITIONAL(include_kioslave_smb, test "x$have_libsmbclient" = xyes)
++
+ ])
+ 
+ SMB_CHECK
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..0f7ec244cdeb
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 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.4.1-r1.ebuild,v 1.1 2005/06/07 13:01:52 greg_g Exp $
+
+KMNAME=kdebase
+KMMODULE=kioslave
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+IUSE="hal ldap samba"
+DEPEND="ldap? ( net-nds/openldap )
+	samba? ( >=net-fs/samba-3.0.1 )
+	>=dev-libs/cyrus-sasl-2
+	hal? ( =sys-apps/dbus-0.23*
+	       =sys-apps/hal-0.4* )"
+RDEPEND="${DEPEND}
+	$(deprange $PV $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
+
+PATCHES="${FILESDIR}/kdebase-3.4.1-configure.patch"
+
+src_compile () {
+	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal`"
+	kde-meta_src_compile
+}
+
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 13640f947d74..5b8461a9b599 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.13 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.14 2005/06/07 13:02:51 greg_g Exp $
+
+*ksysguard-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +ksysguard-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966).
 
 *ksysguard-3.4.1 (25 May 2005)
 
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.4.1-r1 b/kde-base/ksysguard/files/digest-ksysguard-3.4.1-r1
new file mode 100644
index 000000000000..518952ccb74d
--- /dev/null
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.4.1-r1
@@ -0,0 +1,3 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch b/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch
new file mode 100644
index 000000000000..9bc10ebbf56f
--- /dev/null
+++ b/kde-base/ksysguard/files/kdebase-3.4.1-configure.patch
@@ -0,0 +1,37 @@
+Index: ksysguard/configure.in.in
+===================================================================
+--- ksysguard/configure.in.in	(revision 420060)
++++ ksysguard/configure.in.in	(working copy)
+@@ -23,17 +23,27 @@
+ AM_CONDITIONAL(include_ksysguardd_openbsd, test "$UNAME" = OpenBSD)
+ AC_SUBST(UNAME)
+ 
+-KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
+-AC_SUBST(LIBSENSORS)
++AC_ARG_WITH(sensors,
++	[AS_HELP_STRING(--with-sensors,
++		[enable support for lm_sensors @<:@default=check@:>@])],
++	[], with_sensors=check)
+ 
+-dnl Check for dell laptop support
+-AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
++if test "x$with_sensors" != xno; then
++	KDE_CHECK_HEADERS(sensors/sensors.h)
++	KDE_CHECK_LIB(sensors, sensors_init, [LIBSENSORS="-lsensors"])
+ 
++	if test "x$with_readline" != xcheck && test -z "$LIBSENSORS"; then
++        	AC_MSG_FAILURE([--with-sensors was given, but test for lm_sensors failed])
++	fi
++fi
++
+ case "$UNAME" in
+ 	Linux) LIBHOSTS="$LIBSENSORS" ;;
+ 	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
+ 	Solaris) LIBHOSTS="$LIBSENSORS -lkstat -lsocket" ;;
+ esac
+ AC_SUBST(LIBHOSTS)
++AC_SUBST(LIBSENSORS)
+ 
+-KDE_CHECK_HEADERS(sensors/sensors.h)
++dnl Check for dell laptop support
++AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
diff --git a/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild b/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..37ea2856db87
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild,v 1.1 2005/06/07 13:02:51 greg_g Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE System Guard"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+IUSE="lm_sensors"
+DEPEND="lm_sensors? ( sys-apps/lm_sensors )"
+
+PATCHES="${FILESDIR}/kdebase-3.4.1-configure.patch"
+
+src_compile() {
+	myconf="$myconf `use_with lm_sensors sensors`"
+	kde-meta_src_compile
+}