8 files changed, 2 insertions, 246 deletions

diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index af92d85f91e1..7fb6c0ee4fa6 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE_kde} \
 		${MASTER_SITE_LOCAL} \
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 7174a99a15c5..2b54b9aa4f8a 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,4 +1,4 @@
-SHA256 (KDE/kdebase-workspace-4.6.1.tar.bz2) = b2c113aec1e5c79b31f2dcac718ba94d142fe39e8e9640d13d19c2dcbf5fae98
-SIZE (KDE/kdebase-workspace-4.6.1.tar.bz2) = 69489744
+SHA256 (KDE/kdebase-workspace-4.6.2.tar.bz2) = 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
+SIZE (KDE/kdebase-workspace-4.6.2.tar.bz2) = 69356153
 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127
 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348
diff --git a/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp
deleted file mode 100644
index b08046ff9014..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksmserver_fadeeffect.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./ksmserver/fadeeffect.cpp.ori	2008-07-22 00:15:47.000000000 +0200
-+++ ./ksmserver/fadeeffect.cpp	2008-07-22 00:16:13.000000000 +0200
-@@ -58,7 +58,7 @@
- #include "fadeeffect.moc"
- 
- 
--#ifndef HAVE_SSE2
-+#if !defined(HAVE_SSE2) || __GNUC__ < 4
- static inline void *_mm_malloc(size_t size, int)
- {
-     return malloc(size);
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.cc b/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.cc
deleted file mode 100644
index c2e8520d7182..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.cc
+++ /dev/null
@@ -1,55 +0,0 @@
---- ksysguard~/gui/SensorDisplayLib/ListView.cc	2009-12-14 12:43:42.000000000 +0200
-+++ ksysguard/gui/SensorDisplayLib/ListView.cc	2011-02-18 12:49:41.000000000 +0200
-@@ -108,6 +108,8 @@
-     return Time;
-   else if ( type == "M" )
-     return DiskStat;
-+  else if ( type == "KB" || type == "KByte" )
-+    return KByte;
-   else
-     return Text;
- }
-@@ -115,6 +117,8 @@
- void
- ListView::answerReceived(int id, const QList<QByteArray>& answer)
- {
-+	unsigned long kbytes;
-+	float sbytes;
- 	/* We received something, so the sensor is probably ok. */
- 	sensorError(id, false);
- 
-@@ -139,7 +143,12 @@
- 			}
- 
- 			for(uint i =0 ; i < colTypes.count(); i++) {
--				mColumnTypes.append(convertColumnType(colTypes[i]));
-+				ColumnType type = convertColumnType(colTypes[i]);
-+				mColumnTypes.append(type);
-+				if (type == Text || type == DiskStat)
-+					mModel.addColumnAlignment(Qt::AlignLeft);
-+				else
-+					mModel.addColumnAlignment(Qt::AlignRight);
- 			}
- 			
- 			mModel.setHorizontalHeaderLabels(translatedHeaders);
-@@ -166,6 +175,20 @@
- 					  case Time:
- 						item->setData(QTime::fromString(records[j]), Qt::DisplayRole);
- 						break;
-+					  case KByte:
-+						kbytes = records[j].toInt();
-+						if(kbytes >= 1024*1024*1024*0.7) {  //If it's over 0.7TiB, then set the scale to terabytes
-+							sbytes = kbytes / float(1024*1024*1024);
-+							item->setText(i18nc("units", "%1 TiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0)));
-+						} else if(kbytes >= 1024*1024*0.7) { //If it's over 0.7GiB, then set the scale to gigabytes
-+							sbytes = kbytes / float(1024*1024);
-+							item->setText(i18nc("units", "%1 GiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0)));
-+						} else if(kbytes > 1024) {
-+							sbytes = kbytes / float(1024);
-+							item->setText(i18nc("units", "%1 MiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0)));
-+						} else
-+							item->setText(i18nc("units", "%1 KiB", kbytes));
-+						break;
- 					  case DiskStat:
- 					  case Text:
- 					  default:
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h b/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h
deleted file mode 100644
index b416634067e3..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h
+++ /dev/null
@@ -1,56 +0,0 @@
---- ksysguard~/gui/SensorDisplayLib/ListView.h	2011-02-18 12:44:19.000000000 +0200
-+++ ksysguard/gui/SensorDisplayLib/ListView.h	2011-02-18 12:47:59.000000000 +0200
-@@ -29,6 +29,41 @@
- class ListViewSettings;
- class QTreeView;
- 
-+class ListViewModel : public QStandardItemModel {
-+public:
-+	ListViewModel(QObject * parent = 0 ) : QStandardItemModel(parent)
-+	{
-+	}
-+
-+	ListViewModel(int rows, int columns, QObject * parent = 0) : QStandardItemModel(rows, columns, parent)
-+	{
-+	}
-+
-+	void addColumnAlignment( Qt::AlignmentFlag align )
-+	{
-+		mAlignment.append(align);
-+	}
-+
-+	void clear()
-+	{
-+		QStandardItemModel::clear();
-+		mAlignment.clear();
-+	}
-+
-+	QVariant data(const QModelIndex &index, int role) const
-+	{
-+		int column = index.column();
-+
-+		if ( role == Qt::TextAlignmentRole && column >= 0 && column < mAlignment.size() )
-+			return mAlignment[column];
-+		else
-+			return QStandardItemModel::data(index, role);
-+	}
-+
-+private:
-+	QList<Qt::AlignmentFlag> mAlignment;
-+};
-+
- class ListView : public KSGRD::SensorDisplay
- {
- 	Q_OBJECT
-@@ -61,9 +96,9 @@
- 
- private:
- 
--	typedef enum { Text, Int, Float, Time, DiskStat } ColumnType;
-+	typedef enum { Text, Int, Float, Time, DiskStat, KByte } ColumnType;
- 
--	QStandardItemModel mModel;
-+	ListViewModel mModel;
- 	QTreeView *mView;
- 	ListViewSettings* lvs;
- 	QByteArray mHeaderSettings;
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd b/x11/kdebase4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd
deleted file mode 100644
index c3c6b96bae0a..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd
+++ /dev/null
@@ -1,12 +0,0 @@
---- ksysguard~/gui/SystemLoad2.sgrd	2009-08-28 18:01:43.000000000 +0200
-+++ ksysguard/gui/SystemLoad2.sgrd	2011-01-03 19:18:24.000000000 +0200
-@@ -10,7 +10,7 @@
-   <beam summationName="Swap" sensorName="mem/swap/used" sensorType="integer" hostName="localhost" color="0xff00c000" />
-  </display>
-  <display title="Network History" svgBackground="widgets/plot-background" autoRange="1" class="FancyPlotter" column="0" row="2" version="1" min="0" max="20" manualRange="1">
--  <beam sensorType="float" hostName="localhost" summationName="Receiving" regexpSensorName="network/interfaces/(?!lo).*/receiver/data" color="0xB3A52D" />
--  <beam sensorType="float" hostName="localhost" summationName="Sending" regexpSensorName="network/interfaces/(?!lo).*/transmitter/data" color="0x844798" />
-+  <beam sensorType="float" hostName="localhost" summationName="Receiving" regexpSensorName="network/interfaces/(?!lo|bridge|usbus).*/receiver/data" color="0xB3A52D" />
-+  <beam sensorType="float" hostName="localhost" summationName="Sending" regexpSensorName="network/interfaces/(?!lo|bridge|usbus).*/transmitter/data" color="0x844798" />
-  </display>
- </WorkSheet>
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc b/x11/kdebase4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc
deleted file mode 100644
index 20c9adcc41d9..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc
+++ /dev/null
@@ -1,92 +0,0 @@
---- ksysguard~/gui/ksgrd/SensorManager.cc	2009-10-15 18:33:36.000000000 +0200
-+++ ksysguard/gui/ksgrd/SensorManager.cc	2011-02-19 23:22:35.000000000 +0200
-@@ -66,6 +66,7 @@
-   mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) );
-   mDict.insert( QLatin1String( "sys" ), i18nc( "@item sensor description", "System Load" ) );
-   mDict.insert( QLatin1String( "wait" ), i18n( "Waiting" ) );
-+  mDict.insert( QLatin1String( "intr" ), i18n( "Interrupt Load" ) );
-   mDict.insert( QLatin1String( "TotalLoad" ), i18n( "Total Load" ) );
-   mDict.insert( QLatin1String( "mem" ), i18n( "Memory" ) );
-   mDict.insert( QLatin1String( "physical" ), i18n( "Physical Memory" ) );
-@@ -82,6 +83,7 @@
-   mDict.insert( QLatin1String( "filepages" ), i18n( "File Pages" ) );
-   mDict.insert( QLatin1String( "pscount" ), i18n( "Process Count" ) );
-   mDict.insert( QLatin1String( "ps" ), i18n( "Process Controller" ) );
-+  mDict.insert( QLatin1String( "lastpid" ), i18n( "Last Process ID" ) );
-   mDict.insert( QLatin1String( "disk" ), i18n( "Disk Throughput" ) );
-   mDict.insert( QLatin1String( "load" ), i18nc( "CPU Load", "Load" ) );
-   mDict.insert( QLatin1String( "totalio" ), i18n( "Total Accesses" ) );
-@@ -95,6 +97,8 @@
-   mDict.insert( QLatin1String( "pageIn" ), i18n( "Pages In" ) );
-   mDict.insert( QLatin1String( "pageOut" ), i18n( "Pages Out" ) );
-   mDict.insert( QLatin1String( "context" ), i18n( "Context Switches" ) );
-+  mDict.insert( QLatin1String( "trap" ), i18n( "Traps" ) );
-+  mDict.insert( QLatin1String( "syscall" ), i18n( "System Calls" ) );
-   mDict.insert( QLatin1String( "network" ), i18n( "Network" ) );
-   mDict.insert( QLatin1String( "interfaces" ), i18n( "Interfaces" ) );
-   mDict.insert( QLatin1String( "receiver" ), i18n( "Receiver" ) );
-@@ -129,22 +133,30 @@
-   mDict.insert( QLatin1String( "acpi" ), i18n( "ACPI" ) );
-   mDict.insert( QLatin1String( "thermal_zone" ), i18n( "Thermal Zone" ) );
-   mDict.insert( QLatin1String( "temperature" ), i18n( "Temperature" ) );
-+  mDict.insert( QLatin1String( "AverageTemperature" ), i18n( "Average CPU Temperature" ) );
-   mDict.insert( QLatin1String( "fan" ), i18n( "Fan" ) );
-   mDict.insert( QLatin1String( "state" ), i18n( "State" ) );
-   mDict.insert( QLatin1String( "battery" ), i18n( "Battery" ) );
-+  mDict.insert( QLatin1String( "batterycapacity" ), i18n( "Battery Capacity" ) );
-   mDict.insert( QLatin1String( "batterycharge" ), i18n( "Battery Charge" ) );
-   mDict.insert( QLatin1String( "batteryusage" ), i18n( "Battery Usage" ) );
-+  mDict.insert( QLatin1String( "batteryvoltage" ), i18n( "Battery Voltage" ) );
-+  mDict.insert( QLatin1String( "batteryrate" ), i18n( "Battery Discharge Rate" ) );
-   mDict.insert( QLatin1String( "remainingtime" ), i18n( "Remaining Time" ) );
-   mDict.insert( QLatin1String( "interrupts" ), i18n( "Interrupts" ) );
-   mDict.insert( QLatin1String( "loadavg1" ), i18n( "Load Average (1 min)" ) );
-   mDict.insert( QLatin1String( "loadavg5" ), i18n( "Load Average (5 min)" ) );
-   mDict.insert( QLatin1String( "loadavg15" ), i18n( "Load Average (15 min)" ) );
-   mDict.insert( QLatin1String( "clock" ), i18n( "Clock Frequency" ) );
-+  mDict.insert( QLatin1String( "AverageClock" ), i18n( "Average Clock Frequency" ) );
-   mDict.insert( QLatin1String( "lmsensors" ), i18n( "Hardware Sensors" ) );
-   mDict.insert( QLatin1String( "partitions" ), i18n( "Partition Usage" ) );
-   mDict.insert( QLatin1String( "usedspace" ), i18n( "Used Space" ) );
-   mDict.insert( QLatin1String( "freespace" ), i18n( "Free Space" ) );
-   mDict.insert( QLatin1String( "filllevel" ), i18n( "Fill Level" ) );
-+  mDict.insert( QLatin1String( "usedinode" ), i18n( "Used Inodes" ) );
-+  mDict.insert( QLatin1String( "freeinode" ), i18n( "Free Inodes" ) );
-+  mDict.insert( QLatin1String( "inodelevel" ), i18n( "Inode Level" ) );
-   mDict.insert( QLatin1String( "system" ), i18n( "System" ) );
-   mDict.insert( QLatin1String( "uptime" ), i18n( "Uptime" ) );
-   mDict.insert( QLatin1String( "SoftRaid" ), i18n( "Linux Soft Raid (md)" ) );
-@@ -167,16 +179,21 @@
-   }
- 
-   for ( int i = 1; i < 6; i++) {
-+    mDict.insert( QLatin1String( "batt" ) + QString::number( i ), i18n( "Battery %1", i ) );
-     mDict.insert( QLatin1String( "fan" ) + QString::number( i ), i18n( "Fan %1", i ) );
-     mDict.insert( QLatin1String( "temp" ) + QString::number( i ), i18n( "Temperature %1", i ) );
-   }
- 
-   mDict.insert( QLatin1String( "int00" ), i18n( "Total" ) );
-+  mDict.insert( QLatin1String( "softint" ), i18n( "Software Interrupts" ) );
-+  mDict.insert( QLatin1String( "hardint" ), i18n( "Hardware Interrupts" ) );
- 
-   QString num;
-   for ( int i = 1; i < 25; i++ ) {
-     num.sprintf( "%.2d", i );
-     mDict.insert( QLatin1String( "int" ) + num, ki18n( "Int %1" ).subs( i - 1, 3 ).toString() );
-+    num.sprintf( "%.3d", i + 255);
-+    mDict.insert( QLatin1String( "int" ) + num, ki18n( "Int %1" ).subs( i + 255, 4 ).toString() );
-   }
- 
-   // TODO: translated descriptions not yet implemented.
-@@ -186,6 +203,11 @@
-   mUnits.insert( QLatin1String( "min" ), i18nc( "the unit minutes", "min" ) );
-   mUnits.insert( QLatin1String( "MHz" ), i18nc( "the frequency unit", "MHz" ) );
-   mUnits.insert( QLatin1String( "%" ), i18nc( "a percentage", "%" ) );
-+  mUnits.insert( QLatin1String( "mA" ), i18nc( "the unit milliamperes", "mA" ) );
-+  mUnits.insert( QLatin1String( "mAh" ), i18nc( "the unit milliampere hours", "mAh" ) );
-+  mUnits.insert( QLatin1String( "mW" ), i18nc( "the unit milliwatts", "mW" ) );
-+  mUnits.insert( QLatin1String( "mWh" ), i18nc( "the unit milliwatt hours", "mWh" ) );
-+  mUnits.insert( QLatin1String( "mV" ), i18nc( "the unit millivolts", "mV" ) );
- 
-   mTypes.clear();
-   mTypes.insert( QLatin1String( "integer" ), i18n( "Integer Value" ) );
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 2db2b33fdd50..d1cbcebbda5b 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -523,8 +523,6 @@ share/apps/kconf_update/ksmserver_shortcuts.upd
 share/apps/kconf_update/kwin.upd
 share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
-share/apps/kconf_update/kwin_blacklist.sh
-share/apps/kconf_update/kwin_blacklist.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
 share/apps/kconf_update/kwin_focus2.sh
@@ -646,20 +644,6 @@ share/apps/kdm/themes/circles/flower.png
 share/apps/kdm/themes/circles/help.png
 share/apps/kdm/themes/circles/options.png
 share/apps/kdm/themes/circles/screenshot.png
-share/apps/kdm/themes/ethais/KdmGreeterTheme.desktop
-share/apps/kdm/themes/ethais/ethais.xml
-share/apps/kdm/themes/ethais/lineedit_active.png
-share/apps/kdm/themes/ethais/lineedit_normal.png
-share/apps/kdm/themes/ethais/lock.png
-share/apps/kdm/themes/ethais/login_active.png
-share/apps/kdm/themes/ethais/login_normal.png
-share/apps/kdm/themes/ethais/pw_icon.png
-share/apps/kdm/themes/ethais/rectangle.png
-share/apps/kdm/themes/ethais/rectangle_overlay.png
-share/apps/kdm/themes/ethais/screenshot.png
-share/apps/kdm/themes/ethais/session_normal.png
-share/apps/kdm/themes/ethais/system_normal.png
-share/apps/kdm/themes/ethais/user_icon.png
 share/apps/kdm/themes/horos/KdmGreeterTheme.desktop
 share/apps/kdm/themes/horos/horos.xml
 share/apps/kdm/themes/horos/lineedit_active.png
@@ -2538,7 +2522,6 @@ share/wallpapers/stripes.png.desktop
 @dirrm share/apps/kdm/themes/oxygen-air
 @dirrm share/apps/kdm/themes/oxygen
 @dirrm share/apps/kdm/themes/horos
-@dirrm share/apps/kdm/themes/ethais
 @dirrm share/apps/kdm/themes/circles
 @dirrmtry share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions