Spring cleaning.

Package-Manager: portage-2.1.4.4

8 files changed, 8 insertions, 395 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index ea40dc12dc15..04b9b39b9eae 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.109 2008/02/07 00:11:51 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.110 2008/02/17 03:30:11 ingmar Exp $
+
+  17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdebase-kioslaves-3.5.5-fstab.patch,
+  -kdebase-kioslaves-3.5.5-r1.ebuild, -kdebase-kioslaves-3.5.6.ebuild,
+  -kdebase-kioslaves-3.5.6-r1.ebuild, -kdebase-kioslaves-3.5.7.ebuild,
+  -kdebase-kioslaves-3.5.7-r1.ebuild, -kdebase-kioslaves-4.0.0.ebuild:
+  Spring cleaning
 
 *kdebase-kioslaves-4.0.1 (06 Feb 2008)
 
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.5-fstab.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.5-fstab.patch
deleted file mode 100644
index 3f0721e75fb7..000000000000
--- a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-3.5.5-fstab.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Stephan Kulow <coolo@kde.org>
-To: kde-commits@kde.org
-Subject: branches/KDE/3.5/kdebase/kioslave/media/mediamanager
-Date: Mon, 09 Oct 2006 09:32:17 +0000
-Message-Id: <1160386337.725673.25740.nullmailer@svn.kde.org>
-Cc: kde-packager@kde.org
-Content-Type: text/plain;
-  charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-X-Length: 6245
-
-SVN commit 593835 by coolo:
-
-devices that are in fstab should show up no matter what HAL thinks
-CCMAIL: kde-packager@kde.org
-
-
- M  +16 -7     halbackend.cpp  
-
-
---- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp #593834:593835
-@@ -215,11 +215,6 @@
-              !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
-             return;
- 
--        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
--               !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
--             ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
--            return;
--
-         /* Query drive udi */
-         QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
-         /* We don't list floppy volumes because we list floppy drives */
-@@ -240,7 +235,19 @@
- 
-         /* Create medium */
-         Medium* medium = new Medium(udi, "");
-+        setVolumeProperties(medium);
- 
-+        if ( isInFstab( medium ).isNull() )
-+        {
-+            // if it's not mountable by user and not by HAL, don't show it at all
-+            if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
-+                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
-+                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
-+            {
-+                delete medium;
-+                return;
-+            }
-+        }
-         QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
-         kdDebug() << "automount " << options["automount"] << endl;
-         if (options["automount"] == "true" && allowNotification ) {
-@@ -248,7 +255,6 @@
-             if (!error.isEmpty())
-                 kdDebug() << "error " << error << endl;
-         }
--        setVolumeProperties(medium);
-         m_mediaList.addMedium(medium, allowNotification);
- 
-         return;
-@@ -992,7 +998,10 @@
- 
-     for (; it!=end; ++it)
-     {
--        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl;
-+        QString reald = (*it)->realDeviceName();
-+        if ( reald.endsWith( "/" ) )
-+            reald = reald.left( reald.length() - 1 );
-+        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
-         if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
- 	{
-             QStringList opts = (*it)->mountOptions();
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
deleted file mode 100644
index 8aab61e1ac39..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.5-r1.ebuild,v 1.13 2007/08/02 06:02:11 mr_bones_ 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/hal-0.5* )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )"
-RDEPEND="${DEPEND}
-	$(deprange $PV $MAXKDEVER kde-base/kdialog)"	# for the kdeeject script used by the devices/mounthelper ioslave
-
-PATCHES="${FILESDIR}/${P}-fstab.patch"
-
-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"
-}
-
-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.6-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
deleted file mode 100644
index bf86e468ce0a..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.5 2007/08/02 06:02:11 mr_bones_ 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-04.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/hal-0.5* )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!<kde-base/kdesktop-3.5.6-r1"
-RDEPEND="${DEPEND}
-	virtual/ssh
-	$(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
-}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild
deleted file mode 100644
index 5a331c2ac3d8..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.ebuild,v 1.4 2007/08/02 06:02:11 mr_bones_ 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/hal-0.5* )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )"
-RDEPEND="${DEPEND}
-	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)"	# for the kdeeject script used by the devices/mounthelper ioslave
-
-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"
-}
-
-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.7-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild
deleted file mode 100644
index 31d426107235..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.7-r1.ebuild,v 1.8 2007/08/11 16:47:02 armin76 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-06.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/hal-0.5* )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!<kde-base/kdesktop-3.5.6-r1"
-RDEPEND="${DEPEND}
-	virtual/ssh
-	$(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
-}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild
deleted file mode 100644
index c7a42eda670d..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.7.ebuild,v 1.4 2007/08/02 06:02:11 mr_bones_ 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-05.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/hal-0.5* )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!<kde-base/kdesktop-3.5.6-r1"
-RDEPEND="${DEPEND}
-	virtual/ssh
-	$(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
-}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.0.0.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.0.0.ebuild
deleted file mode 100644
index 57308b7be3f6..000000000000
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-4.0.0.ebuild,v 1.2 2008/01/22 04:17:58 ingmar Exp $
-
-EAPI="1"
-
-KMNAME=kdebase-runtime
-KMMODULE=kioslave
-inherit kde4-meta
-
-DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bzip2 debug htmlhandbook openexr samba"
-RESTRICT="test"
-
-# Note that if you upgrade strigi, you have to rebuild this package.
-DEPEND="
-	>=app-misc/strigi-0.5.7
-	>=dev-libs/cyrus-sasl-2
-	>=sys-apps/dbus-1.0.2
-	=sys-apps/hal-0.5*
-	x11-libs/libXcursor
-	samba? ( >=net-fs/samba-3.0.1 )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )"
-RDEPEND="${DEPEND}
-	>=kde-base/kdesu-${PV}:${SLOT}
-	>=kde-base/kdialog-${PV}:${SLOT}
-	virtual/ssh"
-
-KMEXTRA="
-	kioexec
-	kdeeject"
-
-src_unpack() {
-	if use htmlhandbook; then
-		KMEXTRA="${KMEXTRA}
-			doc/kioslave"
-	fi
-	kde4-meta_src_unpack
-}
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with bzip BZip2)
-		$(cmake-utils_use_with samba Samba)
-		$(cmake-utils_use_with openexr OpenEXR)"
-
-	kde4-meta_src_compile
-}