Remove old.

(Portage version: 2.2.0_alpha99/cvs/Linux i686)

4 files changed, 6 insertions, 121 deletions

diff --git a/app-cdr/kcdemu/ChangeLog b/app-cdr/kcdemu/ChangeLog
index aeabf9c53bd0..3e46da3183e9 100644
--- a/app-cdr/kcdemu/ChangeLog
+++ b/app-cdr/kcdemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/kcdemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/ChangeLog,v 1.8 2012/04/09 12:13:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/ChangeLog,v 1.9 2012/04/11 08:34:52 johu Exp $
+
+  11 Apr 2012; Johannes Huber <johu@gentoo.org>
+  -files/kcdemu-0.3.1-start-cdemud.patch, -kcdemu-0.3.1-r1.ebuild,
+  -kcdemu-0.3.ebuild:
+  Remove old.
 
   09 Apr 2012; Markus Meier <maekke@gentoo.org> kcdemu-0.4.ebuild:
   x86 stable, bug #404275
diff --git a/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch b/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch
deleted file mode 100644
index d6edfae54470..000000000000
--- a/app-cdr/kcdemu/files/kcdemu-0.3.1-start-cdemud.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9486c351315373e7f3be0ca8ab3c84e3295eccfb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 10 Jan 2012 23:29:23 -0500
-Subject: [PATCH] Try to start the daemon if it's not already running
-
-Fixes compatibility with cdemud-1.4.0, see
-https://bugs.gentoo.org/show_bug.cgi?id=393121
----
- src/cdemu.cpp |    9 ++++++++-
- src/cdemu.h   |    2 +-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/cdemu.cpp b/src/cdemu.cpp
-index 3fe18c2..75f91dc 100644
---- a/src/cdemu.cpp
-+++ b/src/cdemu.cpp
-@@ -32,6 +32,9 @@ CDEmu::CDEmu()
-       m_currentBus(0)
- {
-     this->findCurrentBus();
-+    // If the daemon has not been started, try to start it
-+    if (!m_currentBus)
-+        this->findCurrentBus(true);
- 
-     this->connectSlots(&m_sessionBus);
-     this->connectSlots(&m_systemBus);
-@@ -181,7 +184,7 @@ void CDEmu::connectSlots(QDBusConnection *connection)
- }
- 
- 
--void CDEmu::findCurrentBus()
-+void CDEmu::findCurrentBus(bool start_daemon)
- {
-     // We don't want to get signals from the wrong bus in case we
-     // switch from the session bus to the system bus or vice versa
-@@ -194,12 +197,16 @@ void CDEmu::findCurrentBus()
- 
-     // Try session bus first
-     QDBusConnectionInterface *interface = m_sessionBus.interface();
-+    if (start_daemon)
-+        interface->startService("net.sf.cdemu.CDEMUD_Daemon");
-     if (interface->isServiceRegistered("net.sf.cdemu.CDEMUD_Daemon"))
-         m_currentBus = &m_sessionBus;
-     else
-     {
-         // Try system bus then
-         interface = m_systemBus.interface();
-+        if (start_daemon)
-+            interface->startService("net.sf.cdemu.CDEMUD_Daemon");
-         if (interface->isServiceRegistered("net.sf.cdemu.CDEMUD_Daemon"))
-             m_currentBus = &m_systemBus;
-         else
-diff --git a/src/cdemu.h b/src/cdemu.h
-index c7b0655..8381c2f 100644
---- a/src/cdemu.h
-+++ b/src/cdemu.h
-@@ -56,7 +56,7 @@ private:
-     ~CDEmu();
- 
-     void connectSlots(QDBusConnection *connection);
--    void findCurrentBus();
-+    void findCurrentBus(bool start_daemon = false);
-     int nextFreeSlot();
- 
-     QDBusConnection m_sessionBus;
--- 
-1.7.8.3
-
diff --git a/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild b/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild
deleted file mode 100644
index 266fdd9950ea..000000000000
--- a/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/kcdemu-0.3.1-r1.ebuild,v 1.1 2012/01/12 00:10:53 johu Exp $
-
-EAPI=4
-KDE_LINGUAS="de es pl ro"
-inherit kde4-base
-
-MY_PN='kde_cdemu'
-
-DESCRIPTION="A frontend to cdemu daemon for KDE4"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/99752-${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=app-cdr/cdemu-1.2.0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-start-cdemud.patch"
-)
-
-S=${WORKDIR}/${MY_PN}
-
-DOCS=( ChangeLog )
diff --git a/app-cdr/kcdemu/kcdemu-0.3.ebuild b/app-cdr/kcdemu/kcdemu-0.3.ebuild
deleted file mode 100644
index 01bf7cb78af2..000000000000
--- a/app-cdr/kcdemu/kcdemu-0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdemu/kcdemu-0.3.ebuild,v 1.4 2010/10/09 19:15:52 fauli Exp $
-
-EAPI=3
-KDE_LINGUAS="de es"
-inherit kde4-base
-
-MY_P=kde_cdemu-${PV}
-
-DESCRIPTION="A frontend to cdemu daemon for KDE4"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/99752-${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=app-cdr/cdemu-1.2.0"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog )