Clean up wrt #289987

(Portage version: 2.2_rc46/cvs/Linux x86_64)

6 files changed, 9 insertions, 129 deletions

diff --git a/net-misc/knutclient/files/knutclient-0.9.3-xdg-desktop-entry.diff b/net-misc/knutclient/files/knutclient-0.9.3-xdg-desktop-entry.diff
deleted file mode 100644
index 6d775fa07dcf..000000000000
--- a/net-misc/knutclient/files/knutclient-0.9.3-xdg-desktop-entry.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/Makefile.am.orig	2007-03-31 15:43:04.000000000 +0200
-+++ src/Makefile.am	2007-03-31 15:44:30.000000000 +0200
-@@ -32,8 +32,7 @@
- knutclient_LDADD = $(LIB_KDEUI)
- 
- # this is where the desktop file will go 
--shelldesktopdir   = $(kde_appsdir)/Utilities
--shelldesktop_DATA = knutclient.desktop
-+xdg_apps_DATA = knutclient.desktop
- 
- # this is where the shell's XML-GUI resource file goes
- shellrcdir   = $(kde_datadir)/knutclient
---- src/knutclient.desktop.orig	2008-06-21 12:55:47.000000000 +0200
-+++ src/knutclient.desktop	2008-06-21 12:57:10.000000000 +0200
-@@ -1,20 +1,16 @@
--# KDE Config File  
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Version=0.9.3
--Exec=knutclient -caption "%c" %i %m  
--Icon=knutclient.png
--MiniIcon=knutclient.png
--DocPath=knutclient/index.html
-+Exec=knutclient -caption "%c" %i
-+Icon=knutclient
-+X-DocPath=knutclient/index.html
- Name=KNutClient
- Name[de]=KNutClient
- Name[cs]=KNutClient
- Comment=Client for NUT
--Comment[de]=
-+Comment[de]=KDE-Frontend für NUT
- Comment[cs]=Klient pro UPS syst� NUT
- Comment[es]=Cliente KDE para NUT
--Terminal=0
-+Terminal=false
- X-KDE-StartupNotify=true
--OnlyShowIn=KDE;
- Categories=Qt;KDE;System;Monitor;
diff --git a/net-misc/knutclient/files/knutclient-0.9.3-xdg_desktop_entry.diff b/net-misc/knutclient/files/knutclient-0.9.3-xdg_desktop_entry.diff
deleted file mode 100644
index 5cc750e65818..000000000000
--- a/net-misc/knutclient/files/knutclient-0.9.3-xdg_desktop_entry.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.am.orig	2007-03-31 15:43:04.000000000 +0200
-+++ src/Makefile.am	2007-03-31 15:44:30.000000000 +0200
-@@ -32,8 +32,7 @@
- knutclient_LDADD = $(LIB_KDEUI)
- 
- # this is where the desktop file will go 
--shelldesktopdir   = $(kde_appsdir)/Utilities
--shelldesktop_DATA = knutclient.desktop
-+xdg_apps_DATA = knutclient.desktop
- 
- # this is where the shell's XML-GUI resource file goes
- shellrcdir   = $(kde_datadir)/knutclient
diff --git a/net-misc/knutclient/files/knutclient-0.9.diff b/net-misc/knutclient/files/knutclient-0.9.diff
deleted file mode 100644
index 6522e5e19b3d..000000000000
--- a/net-misc/knutclient/files/knutclient-0.9.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/knutnet.cpp.orig	2006-08-29 18:29:57.000000000 -0700
-+++ src/knutnet.cpp	2006-08-29 18:33:33.000000000 -0700
-@@ -892,7 +892,7 @@
-     dataAvailable=commandSocket->bytesAvailable();
-     if (recvBuffer.size() < (dataAvailable+1) ) recvBuffer.resize(dataAvailable+1);
-     if ((lengthInputData = commandSocket->readBlock(recvBuffer.data(),dataAvailable)) == -1) return RecvErr;
--    recvBuffer[lengthInputData]='\0';          
-+    recvBuffer[static_cast<int>(lengthInputData)]='\0';          
-     rBuffer.append(recvBuffer.data()); // adds reading data to main input buffer
-     if (endString.isEmpty()) endRecv = false;
-     else {
diff --git a/net-misc/knutclient/knutclient-0.9.3-r1.ebuild b/net-misc/knutclient/knutclient-0.9.3-r1.ebuild
deleted file mode 100644
index dbd6466eb354..000000000000
--- a/net-misc/knutclient/knutclient-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.9.3-r1.ebuild,v 1.3 2008/07/31 19:20:13 carlo Exp $
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Client for the NUT UPS monitoring daemon"
-HOMEPAGE="http://www.knut.noveradsl.cz/knutclient/"
-SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/knutclient-0.9.3-xdg-desktop-entry.diff"
-
-src_unpack(){
-	kde_src_unpack
-	rm "${S}"/configure
-}
diff --git a/net-misc/knutclient/knutclient-0.9.3.ebuild b/net-misc/knutclient/knutclient-0.9.3.ebuild
deleted file mode 100644
index 284764c5b485..000000000000
--- a/net-misc/knutclient/knutclient-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.9.3.ebuild,v 1.9 2008/02/19 12:04:08 ingmar Exp $
-
-inherit kde
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Client for the NUT UPS monitoring daemon"
-HOMEPAGE="http://www.knut.noveradsl.cz/knutclient/"
-SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/${PN}/stable/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${P}-xdg_desktop_entry.diff"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack(){
-	kde_src_unpack
-	# assure we pick up the patch
-	rm "${S}"/configure
-
-	sed -e 's/.png//' -i "${S}"/src/${PN}.desktop || die 'Sed failed'
-}
diff --git a/net-misc/knutclient/knutclient-0.9.4.ebuild b/net-misc/knutclient/knutclient-0.9.4.ebuild
index b58a10a9b449..817aaaf3a233 100644
--- a/net-misc/knutclient/knutclient-0.9.4.ebuild
+++ b/net-misc/knutclient/knutclient-0.9.4.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.9.4.ebuild,v 1.3 2008/07/31 19:20:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.9.4.ebuild,v 1.4 2009/10/25 12:39:30 ssuominen Exp $
 
-ARTS_REQUIRED="never"
+ARTS_REQUIRED=never
 
 inherit kde
 
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
+MY_P=${P/_/-}
 
 DESCRIPTION="Client for the NUT UPS monitoring daemon"
 HOMEPAGE="http://www.knut.noveradsl.cz/knutclient/"
 SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
+S=${WORKDIR}/${MY_P}
+
 need-kde 3.5
 
-PATCHES="${FILESDIR}/knutclient-0.9.4-xdg-desktop-entry.diff"
+PATCHES=( "${FILESDIR}/${P}-xdg-desktop-entry.diff" )
 
 src_unpack(){
 	kde_src_unpack