Rev Bumped 3.5.9 and 3.5.10 to fix the ntfs-3g locale mount issue.

Fixes bug 238520 - thanks to Ambroz Bizjak.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 242 insertions, 0 deletions

diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 5d1a33490e66..9ed3e1e413bd 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,10 +1,14 @@
+AUX kdebase-3.5.10-ntfs3g-locale.patch 2327 RMD160 9a6555e700b67fdae474a6e975cb498a2e6f675a SHA1 e74bfc491433d2e53828974b4722afae54726493 SHA256 505acf2be01ebdbb08861ad7e8543b1200ddcfb64b96859a1ea23f78fc0f8167
+AUX kdebase-3.5.9-ntfs3g-locale.patch 936 RMD160 dc3a3a42f6e6f15e4bb1631cebcf575061f2cc42 SHA1 eb0331c9ea94d80cff75de0644c7b57f96044aa6 SHA256 17d80a3b86b70d261dee2c798390dcd145211561d5a42ba569f8d97f2c5252ea
 DIST kdebase-3.5-patchset-11.tar.bz2 39328 RMD160 134ff835ff3577d138d259f43cb358e17b58ccd1 SHA1 d50aea5163611194f7e675b9b154e6b692ab8f7c SHA256 c9c0eb62c66739dd01baf07c9c01feb3854d56548f480b4cd99228896cecd100
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-runtime-4.0.4.tar.bz2 48319543 RMD160 bb8d03488ba69107d822c4bb885d938be1741f62 SHA1 18388e992c945d9245c7080eedaa1fdc226f1701 SHA256 c81e7069ec8b9869667b18aee8c4188f52ff68cca776afd93b6713aa85f103d9
 DIST kdebase-runtime-4.0.5.tar.bz2 48424795 RMD160 a83b8ec98bbd03812baa0794e9aaa8068a434dd5 SHA1 e8b15e2f134c7bd1555cd9f4759e5e5efd3d8073 SHA256 d8069a63b3006f9961e79cd74c6071d8e21f9258fd3a4dffeb0c1a5aa991f022
+EBUILD kdebase-kioslaves-3.5.10-r1.ebuild 2287 RMD160 d5ddfe0a65b33c2cc15039c6744b6cca7f8c4220 SHA1 953611695234bc750332ff207aa7622f48c6bf67 SHA256 110e5fd61bca5ecc84184a0d420e625f37d614d685a7f7b7eadbe9d47df2bf01
 EBUILD kdebase-kioslaves-3.5.10.ebuild 2108 RMD160 3febc3924f359c154c1b3f568afa0476d905215c SHA1 bf37b8fde803ada3b830d166b2e8e89f2c802e2c SHA256 4dbce875d7fa1f655c121e98e3d8f46a444ffb3966bc12ab1e37db794c23e9b5
+EBUILD kdebase-kioslaves-3.5.9-r1.ebuild 2265 RMD160 144d76abfe380e30159a79bb9ab3a04843e02c8b SHA1 8dbe731ca856a0e09223c19002e09dae13fc12a9 SHA256 47a3dd0496d3da70e09e7f9a02fd9be3f2a6ae8a498148dc8b0f6bc6dd368434
 EBUILD kdebase-kioslaves-3.5.9.ebuild 2079 RMD160 34f6ed0226101f00c8f908a7c7e3099d1c070106 SHA1 378c7174820b608155fd03714899350caa61e698 SHA256 851e7a79e2c7f7d5a4ab8baf950de51715ff908558f7d393dcd4248848048e12
 EBUILD kdebase-kioslaves-4.0.4.ebuild 1260 RMD160 c4cd7cdecf7c205747e74ef93e823bb8fe6db66d SHA1 7ce2b6022d6c1fbec083ad5c524ddf718ea5c8c1 SHA256 9dabd126858be076674e5da6b4e31d41082a0addfd84f06ae20b74ccad54c705
 EBUILD kdebase-kioslaves-4.0.5.ebuild 1264 RMD160 cce2244652b57fe3af984e3733964b59e8f78d77 SHA1 6e1d3fc716d3d7083b1fdf0655190203e2512bc9 SHA256 ab53c2e89fd3232a10d13e5f34badb3e6465a4ace3bc72a0939934c8d942af76
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch
new file mode 100644
index 000000000000..c2f627783ec7
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch
@@ -0,0 +1,78 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp	(revision 864098)
++++ kioslave/media/mediamanager/halbackend.cpp	(working copy)
+@@ -851,13 +851,6 @@
+         result << tmp;
+     }
+ 
+-	if ( valids.contains("locale") )
+-	{
+-		value = config.readBoolEntry( "locale", true );
+-		tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
+-		result << tmp;
+-	}
+-
+     if (valids.contains("utf8"))
+     {
+         value = config.readBoolEntry("utf8", true);
+@@ -878,6 +871,15 @@
+             result << "shortname=lower";
+     }
+ 
++
++    if (valids.contains("locale") && fstype == "ntfs-3g")
++    {
++        char *cType;
++        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
++            result << QString("locale=%1").arg(cType);
++        }
++    }
++
+     if (valids.contains("sync"))
+     {
+         value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
+@@ -931,7 +933,7 @@
+ 
+     QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
+ 
+-    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
++    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
+     for (int index = 0; names[index]; ++index)
+         if (valids.contains(names[index]))
+             config.writeEntry(names[index], valids[names[index]] == "true");
+@@ -951,10 +953,6 @@
+         config.writeEntry("automount", valids["automount"]);
+     }
+ 
+-	if (valids.contains("locale") ) {
+-		config.writeEntry("locale", valids["locale"]);
+-	}
+-
+     return true;
+ }
+ 
+@@ -1153,11 +1151,6 @@
+         soptions << QString("uid=%1").arg(getuid());
+     }
+ 
+-    if (valids["locale"] == "true")
+-	{
+-		soptions << QString("locale=%1").arg( KGlobal::locale()->language() ); 
+-	}
+-
+     if (valids["ro"] == "true")
+         soptions << "ro";
+ 
+@@ -1182,6 +1175,11 @@
+         soptions << QString("shortname=%1").arg(valids["shortname"]);
+     }
+ 
++    if (valids.contains("locale"))
++    {
++        soptions << QString("locale=%1").arg(valids["locale"]);
++    }
++
+     if (valids.contains("journaling"))
+     {
+         QString option = valids["journaling"];
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch b/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch
new file mode 100644
index 000000000000..a5499f15893a
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch
@@ -0,0 +1,31 @@
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp	(revision 864099)
++++ kioslave/media/mediamanager/halbackend.cpp	(working copy)
+@@ -849,6 +849,14 @@
+         result << tmp;
+     }
+ 
++    if (valids.contains("locale") && fstype == "ntfs-3g")
++    {
++        char *cType;
++        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
++            result << QString("locale=%1").arg(cType);
++        }
++    }
++
+     if (valids.contains("utf8"))
+     {
+         value = config.readBoolEntry("utf8", true);
+@@ -1149,6 +1157,11 @@
+     if (valids["quiet"] == "true")
+         soptions << "quiet";
+ 
++    if (valids.contains("locale"))
++    {
++        soptions << QString("locale=%1").arg(valids["locale"]);
++    }
++
+     if (valids["utf8"] == "true")
+         soptions << "utf8";
+ 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..08321cdd1ce4
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.10-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 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.10-r1.ebuild,v 1.1 2008/10/01 00:46:18 jmbsvicetto Exp $
+
+KMNAME=kdebase
+KMMODULE=kioslave
+EAPI="1"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-13.tar.bz2"
+
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="hal kdehiddenvisibility ldap openexr samba"
+
+DEPEND="x11-libs/libXcursor
+	ldap? ( net-nds/openldap )
+	samba? ( >=net-fs/samba-3.0.1 )
+	>=dev-libs/cyrus-sasl-2
+	hal? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!<kde-base/kdesktop-3.5.6-r1"
+RDEPEND="${DEPEND}
+	virtual/ssh
+	>=kde-base/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
+DEPEND="${DEPEND}
+	x11-apps/xhost"
+
+# Fixes bug 238520 by applying revision 864963 patch to
+# kdebase/kioslave/media/mediamanager/halbackend.cpp
+PATCHES=( "${FILESDIR}/kdebase-${PV}-ntfs3g-locale.patch" )
+
+# 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
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.9-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..78ce91e5141d
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.9-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 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.9-r1.ebuild,v 1.1 2008/10/01 00:46:18 jmbsvicetto Exp $
+
+KMNAME=kdebase
+KMMODULE=kioslave
+EAPI="1"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-11.tar.bz2"
+
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+KEYWORDS="~alpha ~amd64 ~hppa ~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/hal-0.5* )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!<kde-base/kdesktop-3.5.6-r1"
+RDEPEND="${DEPEND}
+	virtual/ssh
+	>=kde-base/kdialog-${PV}:${SLOT}"	# for the kdeeject script used by the devices/mounthelper ioslave
+DEPEND="${DEPEND}
+	x11-apps/xhost"
+
+# Fixes bug 238520 by applying revision 864963 patch to
+# kdebase/kioslave/media/mediamanager/halbackend.cpp
+PATCHES=( "${FILESDIR}/kdebase-${PV}-ntfs3g-locale.patch" )
+
+# 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
+}