Spring cleaning.

(Portage version: 2.1.4.4)

7 files changed, 6 insertions, 250 deletions

diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index c5880ab1803c..4e63df5b02c0 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.84 2008/02/07 00:12:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.85 2008/02/17 01:40:34 ingmar Exp $
+
+  16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/krdc-3.5.6-zeroconf.patch, -krdc-3.5.5.ebuild, -krdc-3.5.6.ebuild,
+  -krdc-3.5.6-r1.ebuild, -krdc-3.5.7.ebuild, -krdc-4.0.0.ebuild:
+  Spring cleaning
 
 *krdc-4.0.1 (06 Feb 2008)
 
diff --git a/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch b/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch
deleted file mode 100644
index c6f3ee092352..000000000000
--- a/kde-base/krdc/files/krdc-3.5.6-zeroconf.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: kdenetwork-3.5.6/krdc/maindialogwidget.cpp
-===================================================================
---- kdenetwork-3.5.6.orig/krdc/maindialogwidget.cpp
-+++ kdenetwork-3.5.6/krdc/maindialogwidget.cpp
-@@ -33,7 +33,6 @@
- #include "maindialogwidget.h"
- 
- static const QString DEFAULT_SCOPE = "default";
--static const QString DNSSD_SCOPE = "DNS-SD";
- 
- class UrlListViewItem : public KListViewItem
- {
-@@ -80,7 +79,7 @@ class UrlListViewItem : public KListView
- 
- MainDialogWidget::MainDialogWidget( QWidget *parent, const char *name )
-     : MainDialogBase( parent, name ),
--      m_scanning( false ), m_locator_dnssd(0)
-+      m_scanning( false )
- {
-   HostPreferences *hp = HostPreferences::instance();
-   QStringList list;
-@@ -108,9 +107,21 @@ MainDialogWidget::MainDialogWidget( QWid
-   bool showBrowse = hp->showBrowsingPanel();
-   enableBrowsingArea( showBrowse );
- 
-+  m_locator_dnssd = new DNSSD::ServiceBrowser(QStringList::split(',',"_rfb._tcp,_rdp._tcp"),0,DNSSD::ServiceBrowser::AutoResolve);
-+  connect(m_locator_dnssd,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
-+	  SLOT(addedService(DNSSD::RemoteService::Ptr)));
-+  connect(m_locator_dnssd,SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)),
-+	  SLOT(removedService(DNSSD::RemoteService::Ptr)));
-+  m_locator_dnssd->startBrowse();
-+
-   adjustSize();
- }
- 
-+MainDialogWidget::~MainDialogWidget()
-+{
-+  delete m_locator_dnssd;
-+}
-+
- void MainDialogWidget::save()
- {
-   HostPreferences *hp = HostPreferences::instance();
-@@ -216,35 +227,18 @@ void MainDialogWidget::rescan()
- 
-   m_browsingView->clear();
- 
--  if (m_locator_dnssd) {
--    delete m_locator_dnssd;  // still active browsers
--    m_locator_dnssd = 0;
--  }
--
--  if (m_scope == DNSSD_SCOPE) {
--    kdDebug() << "Scope is DNSSD\n";
--    m_locator_dnssd = new DNSSD::ServiceBrowser(QStringList::split(',',"_rfb._tcp,_rdp._tcp"),0,DNSSD::ServiceBrowser::AutoResolve);
--    connect(m_locator_dnssd,SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
--      SLOT(addedService(DNSSD::RemoteService::Ptr)));
--    connect(m_locator_dnssd,SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)),
--      SLOT(removedService(DNSSD::RemoteService::Ptr)));
--    m_locator_dnssd->startBrowse();
--    // now find scopes
--    lastSignalServices(true);
--  } else {
--    QString filter;
--    if ( !m_searchInput->text().stripWhiteSpace().isEmpty() ) {
--      QString ef = KServiceLocator::escapeFilter(
--        m_searchInput->text().stripWhiteSpace() );
--      filter = "(|(|(description=*"+ef+"*)(username=*"+ef+"*))(fullname=*"+ef+"*))";
--    }
--
--    if ( !m_locator->findServices( "service:remotedesktop.kde",
--                                   filter, m_scope ) ) {
--      kdWarning() << "Failure in findServices()" << endl;
--      errorScanning();
--      return;
--    }
-+  QString filter;
-+  if ( !m_searchInput->text().stripWhiteSpace().isEmpty() ) {
-+    QString ef = KServiceLocator::escapeFilter(
-+					       m_searchInput->text().stripWhiteSpace() );
-+    filter = "(|(|(description=*"+ef+"*)(username=*"+ef+"*))(fullname=*"+ef+"*))";
-+  }
-+
-+  if ( !m_locator->findServices( "service:remotedesktop.kde",
-+				 filter, m_scope ) ) {
-+    kdWarning() << "Failure in findServices()" << endl;
-+    errorScanning();
-+    return;
-   }
- }
- 
-@@ -350,8 +344,6 @@ void MainDialogWidget::lastSignalService
- 
- void MainDialogWidget::foundScopes( QStringList scopeList )
- {
--  scopeList << DNSSD_SCOPE;  
--
-   int di = scopeList.findIndex( DEFAULT_SCOPE );
-   if ( di >= 0 )
-     scopeList[ di ] = i18n( "default" );
-Index: kdenetwork-3.5.6/krdc/maindialogwidget.h
-===================================================================
---- kdenetwork-3.5.6.orig/krdc/maindialogwidget.h
-+++ kdenetwork-3.5.6/krdc/maindialogwidget.h
-@@ -33,7 +33,7 @@ class MainDialogWidget : public MainDial
- 
-   public:
-     MainDialogWidget( QWidget *parent, const char *name );
--    ~MainDialogWidget() {}
-+    ~MainDialogWidget();
- 
-     void setRemoteHost( const QString & );
-     QString remoteHost();
diff --git a/kde-base/krdc/krdc-3.5.5.ebuild b/kde-base/krdc/krdc-3.5.5.ebuild
deleted file mode 100644
index 819d89fb1290..000000000000
--- a/kde-base/krdc/krdc-3.5.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5.5.ebuild,v 1.10 2006/12/11 13:08:49 kloeri Exp $
-
-KMNAME=kdenetwork
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility rdesktop slp"
-DEPEND=">=dev-libs/openssl-0.9.6b
-	slp? ( net-libs/openslp )
-	x11-libs/libXxf86vm
-	x11-libs/libXtst"
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
-
-src_compile() {
-	myconf="$myconf `use_enable slp`"
-	kde-meta_src_compile
-}
diff --git a/kde-base/krdc/krdc-3.5.6-r1.ebuild b/kde-base/krdc/krdc-3.5.6-r1.ebuild
deleted file mode 100644
index 61d151b3f5e5..000000000000
--- a/kde-base/krdc/krdc-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,25 +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/krdc/krdc-3.5.6-r1.ebuild,v 1.1 2007/02/07 18:57:59 flameeyes Exp $
-
-KMNAME=kdenetwork
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility rdesktop slp"
-DEPEND=">=dev-libs/openssl-0.9.6b
-	slp? ( net-libs/openslp )
-	x11-libs/libXxf86vm
-	x11-libs/libXtst"
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
-
-PATCHES="${FILESDIR}/${P}-zeroconf.patch"
-
-src_compile() {
-	local myconf="$(use_enable slp)"
-	kde-meta_src_compile
-}
diff --git a/kde-base/krdc/krdc-3.5.6.ebuild b/kde-base/krdc/krdc-3.5.6.ebuild
deleted file mode 100644
index 143b159c8be2..000000000000
--- a/kde-base/krdc/krdc-3.5.6.ebuild
+++ /dev/null
@@ -1,23 +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/krdc/krdc-3.5.6.ebuild,v 1.1 2007/01/16 21:10:56 flameeyes Exp $
-
-KMNAME=kdenetwork
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility rdesktop slp"
-DEPEND=">=dev-libs/openssl-0.9.6b
-	slp? ( net-libs/openslp )
-	x11-libs/libXxf86vm
-	x11-libs/libXtst"
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
-
-src_compile() {
-	myconf="$myconf `use_enable slp`"
-	kde-meta_src_compile
-}
diff --git a/kde-base/krdc/krdc-3.5.7.ebuild b/kde-base/krdc/krdc-3.5.7.ebuild
deleted file mode 100644
index ed51347ba887..000000000000
--- a/kde-base/krdc/krdc-3.5.7.ebuild
+++ /dev/null
@@ -1,23 +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/krdc/krdc-3.5.7.ebuild,v 1.8 2007/08/11 15:39:45 armin76 Exp $
-
-KMNAME=kdenetwork
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility rdesktop slp"
-DEPEND=">=dev-libs/openssl-0.9.6b
-	slp? ( net-libs/openslp )
-	x11-libs/libXxf86vm
-	x11-libs/libXtst"
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
-
-src_compile() {
-	local myconf="$(use_enable slp)"
-	kde-meta_src_compile
-}
diff --git a/kde-base/krdc/krdc-4.0.0.ebuild b/kde-base/krdc/krdc-4.0.0.ebuild
deleted file mode 100644
index e0cfab9860be..000000000000
--- a/kde-base/krdc/krdc-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +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/krdc/krdc-4.0.0.ebuild,v 1.1 2008/01/18 00:23:31 ingmar Exp $
-
-EAPI="1"
-
-KMNAME=kdenetwork
-inherit kde4-meta
-
-DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook jpeg vnc zeroconf"
-
-DEPEND="
-	jpeg? ( media-libs/jpeg )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use zeroconf && has_version net-dns/avahi; then
-		KDE4_BUILT_WITH_USE_CHECK="
-			${KDE4_BUILT_WITH_USE_CHECK} net-dns/avahi mdnsresponder-compat"
-	fi
-	kde4-meta_pkg_setup
-}
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with zeroconf DNSSD)"
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to use the remote desktop protocol (RDP) install >=net-misc/rdesktop-1.4.1"
-	echo
-}