Remove 3.5.0 and 3.5.1 monolithic ebuilds.

(Portage version: 2.1_pre7-r4)

6 files changed, 6 insertions, 247 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 5d71048829bd..776b644330c5 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.156 2006/04/04 01:33:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.157 2006/04/05 23:03:14 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/superkaramba-3.5.0-fbsd.patch, -kdeutils-3.5.0.ebuild,
+  -kdeutils-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.3-r1.ebuild:
   Mark 3.4.3-r1 stable on ia64
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.0 b/kde-base/kdeutils/files/digest-kdeutils-3.5.0
deleted file mode 100644
index 45ccee2adb7a..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6b2cbe8b7d15166eff261f20ece2718 kdeutils-3.5.0.tar.bz2 2958132
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.1 b/kde-base/kdeutils/files/digest-kdeutils-3.5.1
deleted file mode 100644
index 237ef72bc94c..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1286c6a09b04452adfe492de2fad79bd kdeutils-3.5.1.tar.bz2 2974660
diff --git a/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch b/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch
deleted file mode 100644
index 4528b7fa6fe7..000000000000
--- a/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Index: superkaramba/src/memsensor.cpp
-===================================================================
---- superkaramba/src/memsensor.cpp	(revision 487000)
-+++ superkaramba/src/memsensor.cpp	(revision 487001)
-@@ -14,7 +14,7 @@
- #include <qstring.h>
- #include <qregexp.h>
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -32,14 +32,14 @@
- #include <sys/swap.h>
- #endif
- 
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
- #endif
- 
- MemSensor::MemSensor(int msec) : Sensor(msec)
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-    /* get the page size with "getpagesize" and calculate pageshift from it */
-     int pagesize = getpagesize();
-     pageshift = 0;
-@@ -51,7 +51,7 @@
- 
-     /* we only need the amount of log(2)1024 for our conversion */
-     pageshift -= 10;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,SLOT(receivedStdout(KProcess *, char *, int )));
-     connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,7 +62,7 @@
-     MaxSet = false;
- 
-     readValues();
--# elif defined __FreeBSD__
-+# elif defined Q_OS_FREEBSD
-     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-@@ -73,7 +73,7 @@
- MemSensor::~MemSensor()
- {}
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
- {
-     buffer[len] = 0;
-@@ -87,7 +87,7 @@
- 
- void MemSensor::processExited(KProcess *)
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     QStringList stringList = QStringList::split('\n',sensorResult);
-     sensorResult = "";
-     QStringList itemsList = QStringList::split(' ', stringList[1]);
-@@ -99,7 +99,7 @@
- 
- int MemSensor::getMemTotal()
- {
--#if defined __FreeBSD || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -114,7 +114,7 @@
- 
- int MemSensor::getMemFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -138,7 +138,7 @@
- 
- int MemSensor::getBuffers()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -159,7 +159,7 @@
- 
- int MemSensor::getCached()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -179,7 +179,7 @@
- 
- int MemSensor::getSwapTotal()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal);
- # else
-@@ -221,7 +221,7 @@
- 
- int MemSensor::getSwapFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal - swapUsed);
- # else
-@@ -266,8 +266,8 @@
- 
- void MemSensor::readValues()
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     ksp.clearArguments();
-     ksp << "swapinfo";
-     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +291,7 @@
-     SensorParams *sp;
-     Meter *meter;
-     QObjectListIt it( *objList );
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     bool set = false;
- #endif
-     int totalMem = getMemTotal();
-@@ -303,7 +303,7 @@
-     while (it != 0)
-     {
-         sp = (SensorParams*)(*it);
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-         if ( (!MaxSet) && (totalSwap > 0) ) {
-            setMaxValue(sp);
-            bool set = true;
-@@ -331,7 +331,7 @@
-         meter->setValue(format);
-         ++it;
-     }
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     if (set)
-         MaxSet = true;
- #endif
diff --git a/kde-base/kdeutils/kdeutils-3.5.0.ebuild b/kde-base/kdeutils/kdeutils-3.5.0.ebuild
deleted file mode 100644
index 64e3d8e7aebd..000000000000
--- a/kde-base/kdeutils/kdeutils-3.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0.ebuild,v 1.3 2005/12/17 20:49:02 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt snmp pbbuttonsd xmms"
-
-DEPEND="~kde-base/kdebase-${PV}
-	snmp? ( net-analyzer/net-snmp )
-	pbbuttonsd? ( app-laptop/pbbuttonsd )
-	dev-lang/python
-	xmms? ( media-sound/xmms )
-	dev-libs/gmp"
-
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/gnupg )
-	!x11-misc/superkaramba"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix output of klaptopdaemon (kde bug 103437).
-	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
-
-	# Fix memory calculations for FreeBSD systems
-	epatch "${FILESDIR}/superkaramba-3.5.0-fbsd.patch"
-}
-
-src_compile() {
-	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
-	              $(use_with xmms)"
-
-	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeutils/kdeutils-3.5.1.ebuild b/kde-base/kdeutils/kdeutils-3.5.1.ebuild
deleted file mode 100644
index cb5805e6a291..000000000000
--- a/kde-base/kdeutils/kdeutils-3.5.1.ebuild
+++ /dev/null
@@ -1,46 +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/kdeutils/kdeutils-3.5.1.ebuild,v 1.4 2006/03/25 04:01:13 agriffis Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt snmp pbbuttonsd xmms"
-
-BOTH_DEPEND="~kde-base/kdebase-${PV}
-	snmp? ( net-analyzer/net-snmp )
-	pbbuttonsd? ( app-laptop/pbbuttonsd )
-	dev-lang/python
-	xmms? ( media-sound/xmms )
-	dev-libs/gmp
-	|| ( x11-libs/libXtst virtual/x11 )"
-
-RDEPEND="${BOTH_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	!x11-misc/superkaramba"
-
-DEPEND="${BOTH_DEPEND}
-	|| ( (
-			x11-libs/libX11
-			x11-proto/xextproto
-			x11-proto/xproto
-		) virtual/x11 )
-	virtual/os-headers"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix output of klaptopdaemon (kde bug 103437).
-	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
-}
-
-src_compile() {
-	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
-	              $(use_with xmms)"
-
-	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
-
-	kde_src_compile
-}