Spring cleaning.

(Portage version: 2.1.4.4)

8 files changed, 8 insertions, 428 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index b7b3966a7a9f..d148acdf2f45 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.105 2008/01/31 15:29:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.106 2008/02/17 01:59:23 ingmar Exp $
+
+  16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdesktop-3.5.5-seli-xinerama.patch, -kdesktop-3.5.5.ebuild,
+  -kdesktop-3.5.5-r1.ebuild, -kdesktop-3.5.6.ebuild,
+  -kdesktop-3.5.6-r1.ebuild, -kdesktop-3.5.6-r2.ebuild,
+  -kdesktop-3.5.7.ebuild:
+  Spring cleaning
 
   31 Jan 2008; Brent Baude <ranger@gentoo.org> kdesktop-3.5.8.ebuild:
   Marking kdesktop-3.5.8 ppc for bug 207634
diff --git a/kde-base/kdesktop/files/kdesktop-3.5.5-seli-xinerama.patch b/kde-base/kdesktop/files/kdesktop-3.5.5-seli-xinerama.patch
deleted file mode 100644
index 18e637d2b470..000000000000
--- a/kde-base/kdesktop/files/kdesktop-3.5.5-seli-xinerama.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Index: kdebase-3.5.5/kdesktop/desktop.cc
-===================================================================
---- kdebase-3.5.5.orig/kdesktop/desktop.cc
-+++ kdebase-3.5.5/kdesktop/desktop.cc
-@@ -516,9 +516,12 @@ void KDesktop::popupExecuteCommand(const
-   if ( m_miniCli->isVisible() ) {
-       KWin::forceActiveWindow( m_miniCli->winId() );
-   } else {
--      QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos());
--      m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2,
--                      rect.y() + (rect.height() - m_miniCli->height())/2);
-+      NETRootInfo i( qt_xdisplay(), NET::Supported );
-+      if( !i.isSupported( NET::WM2FullPlacement )) {
-+          QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos());
-+          m_miniCli->move(rect.x() + (rect.width() - m_miniCli->width())/2,
-+                          rect.y() + (rect.height() - m_miniCli->height())/2);
-+      }
-       m_miniCli->show(); // non-modal
-   }
- }
-Index: kdebase-3.5.5/kdesktop/minicli.cpp
-===================================================================
---- kdebase-3.5.5.orig/kdesktop/minicli.cpp
-+++ kdebase-3.5.5/kdesktop/minicli.cpp
-@@ -369,6 +369,17 @@ int Minicli::runCommand()
-     cmd = uri.path();
-   else
-     cmd = uri.url();
-+    
-+  QCString asn;
-+  if( qApp->desktop()->isVirtualDesktop())
-+  {
-+    asn = KStartupInfo::createNewStartupId();
-+    KStartupInfoId id;
-+    id.initId( asn );
-+    KStartupInfoData data;
-+    data.setXinerama( qApp->desktop()->screenNumber( this ));
-+    KStartupInfo::sendChange( id, data );
-+  }
- 
-   // Determine whether the application should be run through
-   // the command line (terminal) interface...
-@@ -504,7 +515,7 @@ int Minicli::runCommand()
-         case KURIFilterData::HELP:
-         {
-           // No need for kfmclient, KRun does it all (David)
--          (void) new KRun( m_filterData->uri(), parentWidget());
-+          (void) new KRun( m_filterData->uri(), parentWidget(), asn );
-           return 0;
-         }
-         case KURIFilterData::EXECUTABLE:
-@@ -516,7 +527,7 @@ int Minicli::runCommand()
-             if (service && service->isValid() && service->type() == "Application")
-             {
-               notifyServiceStarted(service);
--              KRun::run(*service, KURL::List());
-+              KRun::run(*service, KURL::List(), parentWidget(), asn );
-               return 0;
-             }
-           }
-@@ -551,7 +562,7 @@ int Minicli::runCommand()
-           if (service && service->isValid() && service->type() == "Application")
-           {
-             notifyServiceStarted(service);
--            KRun::run(*service, KURL::List(), this);
-+            KRun::run(*service, KURL::List(), parentWidget(), asn );
-             return 0;
-           }
- 
-@@ -559,7 +570,7 @@ int Minicli::runCommand()
-           if (service && service->isValid() && service->type() == "Application")
-           {
-             notifyServiceStarted(service);
--            KRun::run(*service, KURL::List(), this);
-+            KRun::run(*service, KURL::List(), parentWidget(), asn );
-             return 0;
-           }
- 
-@@ -571,7 +582,7 @@ int Minicli::runCommand()
-       }
-     }
- 
--    if ( KRun::runCommand( cmd, exec, m_iconName ) )
-+    if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) )
-       return 0;
-     else
-     {
diff --git a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
deleted file mode 100644
index 4b8b7c8397f6..000000000000
--- a/kde-base/kdesktop/kdesktop-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,54 +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/kdesktop/kdesktop-3.5.5-r1.ebuild,v 1.12 2007/07/22 10:47:47 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="3.5.5-r7 $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
-	$(deprange $PV $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-PATCHES="${FILESDIR}/${P}-seli-xinerama.patch"
-
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}
diff --git a/kde-base/kdesktop/kdesktop-3.5.5.ebuild b/kde-base/kdesktop/kdesktop-3.5.5.ebuild
deleted file mode 100644
index e4273038171f..000000000000
--- a/kde-base/kdesktop/kdesktop-3.5.5.ebuild
+++ /dev/null
@@ -1,52 +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/kdesktop/kdesktop-3.5.5.ebuild,v 1.10 2007/07/22 10:47:47 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
-	$(deprange $PV $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
deleted file mode 100644
index 5e7ed78863fe..000000000000
--- a/kde-base/kdesktop/kdesktop-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/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.2 2007/07/22 10:47:47 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
-	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch"
-
-src_unpack() {
-	kde-meta_src_unpack
-	# see bug #143375
-	sed  -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \
-		-i kdesktop/Makefile.am
-}
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild
deleted file mode 100644
index 1f9141da7e37..000000000000
--- a/kde-base/kdesktop/kdesktop-3.5.6-r2.ebuild
+++ /dev/null
@@ -1,61 +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/kdesktop/kdesktop-3.5.6-r2.ebuild,v 1.1 2007/04/30 20:00:28 carlo Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
-	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch"
-
-src_unpack() {
-	kde-meta_src_unpack
-	# see bug #143375
-	sed  -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \
-		-i kdesktop/Makefile.am
-}
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}
diff --git a/kde-base/kdesktop/kdesktop-3.5.6.ebuild b/kde-base/kdesktop/kdesktop-3.5.6.ebuild
deleted file mode 100644
index 41838f5bae4e..000000000000
--- a/kde-base/kdesktop/kdesktop-3.5.6.ebuild
+++ /dev/null
@@ -1,54 +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/kdesktop/kdesktop-3.5.6.ebuild,v 1.3 2007/07/22 10:47:47 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
-	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch"
-
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}
diff --git a/kde-base/kdesktop/kdesktop-3.5.7.ebuild b/kde-base/kdesktop/kdesktop-3.5.7.ebuild
deleted file mode 100644
index 5305de1ce0b7..000000000000
--- a/kde-base/kdesktop/kdesktop-3.5.7.ebuild
+++ /dev/null
@@ -1,59 +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/kdesktop/kdesktop-3.5.7.ebuild,v 1.8 2007/08/11 16:38:13 armin76 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-05.tar.bz2"
-
-DESCRIPTION="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility xscreensaver"
-
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
-	xscreensaver? ( x11-proto/scrnsaverproto )"
-	# Requires the desktop background settings module,
-	# so until we separate the kcontrol modules into separate ebuilds :-),
-	# there's a dep here
-RDEPEND="${DEPEND}
-	$(deprange 3.5.6 $MAXKDEVER kde-base/kcheckpass)
-	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
-	$(deprange $PV $MAXKDEVER kde-base/konqueror)
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-KMCOPYLIB="libkonq libkonq/"
-KMEXTRACTONLY="kcheckpass/kcheckpass.h
-	libkonq/
-	kdm/kfrontend/themer/
-	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
-KMCOMPILEONLY="kcontrol/background
-	kdmlib/"
-KMNODOCS=true
-
-src_unpack() {
-	kde-meta_src_unpack
-	# see bug #143375
-	sed  -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \
-		-i kdesktop/Makefile.am
-}
-src_compile() {
-	myconf="${myconf} $(use_with xscreensaver)"
-	kde-meta_src_compile
-}
-
-src_install() {
-	# ugly, needs fixing: don't install kcontrol/background
-	kde-meta_src_install
-
-	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
-}