Remove old. Fix QA warnings.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 22 insertions, 123 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index e34226b62f03..d3d55f310004 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.79 2009/05/13 08:28:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.80 2009/05/13 08:35:41 scarabeus Exp $
+
+  13 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  kdebluetooth-1.0_beta2-r2.ebuild, -kdebluetooth-1.0_beta8.ebuild,
+  -kdebluetooth-1.0_beta8-r1.ebuild, kdebluetooth-1.0_beta8-r2.ebuild:
+  Remove old. Fix QA warnings.
 
   13 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
   kdebluetooth-1.0_beta8.ebuild, kdebluetooth-1.0_beta8-r1.ebuild,
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild
index fe9855bb0037..495f4ffa5241 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild
@@ -1,8 +1,8 @@
-# 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-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild,v 1.4 2008/04/25 13:33:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild,v 1.5 2009/05/13 08:35:41 scarabeus Exp $
 
-inherit kde autotools
+inherit kde
 
 MY_PV=${PV}
 MY_P=${PN}-${MY_PV}
@@ -28,12 +28,14 @@ RDEPEND="${DEPEND}
 		=kde-base/kdebase-3.5* )
 	net-wireless/bluez-utils"
 
-PATCHES="${FILESDIR}/better-menu-names.diff
-		${FILESDIR}/kcm-btpaired-fix.diff
-		${FILESDIR}/kcm-no-dcop-error.diff
-		${FILESDIR}/kdebluetooth-dbuspasskeyagent.diff
-		${FILESDIR}/kdebluetooth-sdp-bitop.diff
-		${FILESDIR}/kdebluetooth.diff"
+PATCHES=(
+	"${FILESDIR}/better-menu-names.diff"
+	"${FILESDIR}/kcm-btpaired-fix.diff"
+	"${FILESDIR}/kcm-no-dcop-error.diff"
+	"${FILESDIR}/kdebluetooth-dbuspasskeyagent.diff"
+	"${FILESDIR}/kdebluetooth-sdp-bitop.diff"
+	"${FILESDIR}/kdebluetooth.diff"
+)
 
 LANGS="bg br ca cs cy da de el en_GB es et fi fr ga gl hu is it ja ka lt
 mt nb nl nn pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tr uk zh_CN"
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
deleted file mode 100644
index e56817f2c72c..000000000000
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild,v 1.4 2009/05/13 08:28:34 scarabeus Exp $
-
-inherit kde
-
-DESCRIPTION="KDE Bluetooth Framework"
-HOMEPAGE="http://bluetooth.kmobiletools.org/"
-#SRC_URI="mirror://sourceforge/kde-bluetooth/${MY_P}.tar.bz2"
-# cf. bug 190296
-SRC_URI="http://tomstar.ath.cx/load/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-# Localisation will be added once we have a release.
-
-DEPEND=">=dev-libs/openobex-1.1
-	app-mobilephone/obexftp
-	>=dev-libs/dbus-qt3-old-0.70"
-
-RDEPEND="${DEPEND}
-	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
-		=kde-base/kdebase-3.5* )
-	|| (
-		 net-wireless/bluez
-		( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
-	)
-	"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${P}-gcc43.patch ${FILESDIR}/${P}-bashism.patch"
-
-src_unpack() {
-	kde_src_unpack
-
-	cd "${S}"
-	sed -i -e "s:\(MimeType=.*\):\1;:" kdebluetooth/kbtobexclient/kbtobexclient.desktop \
-		|| die "sed'ing the desktop file failed"
-
-	rm -f "${S}/configure"
-}
-
-src_install() {
-	kde_src_install
-
-	# Fix the desktop file
-	sed -i -e 's:^\(Categories=.*\):\1;:' \
-		"${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #1 failed"
-	sed -i -e 's:^\(MimeTypes\):X-\1:' \
-		"${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #2 failed"
-}
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
index 9f2b54abba38..5da7b4376104 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild,v 1.4 2009/05/13 08:28:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild,v 1.5 2009/05/13 08:35:41 scarabeus Exp $
 
 inherit kde
 
@@ -32,8 +32,10 @@ RDEPEND="${DEPEND}
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/${P}-gcc43.patch ${FILESDIR}/${P}-bashism.patch
-	${FILESDIR}/${P}-kbluelock.diff"
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch ${FILESDIR}/${P}-bashism.patch"
+	"${FILESDIR}/${P}-kbluelock.diff"
+)
 
 src_unpack() {
 	kde_src_unpack
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
deleted file mode 100644
index 8d66df73e24a..000000000000
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.10 2009/05/13 08:28:34 scarabeus Exp $
-
-inherit kde
-
-DESCRIPTION="KDE Bluetooth Framework"
-HOMEPAGE="http://bluetooth.kmobiletools.org/"
-#SRC_URI="mirror://sourceforge/kde-bluetooth/${MY_P}.tar.bz2"
-# cf. bug 190296
-SRC_URI="http://tomstar.ath.cx/load/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE=""
-
-# Localisation will be added once we have a release.
-
-DEPEND=">=dev-libs/openobex-1.1
-	app-mobilephone/obexftp
-	>=dev-libs/dbus-qt3-old-0.70"
-
-RDEPEND="${DEPEND}
-	|| ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* )
-		=kde-base/kdebase-3.5* )
-	|| (
-		 net-wireless/bluez
-		( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 )
-	)
-	"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${P}-gcc43.patch"
-
-src_unpack() {
-	kde_src_unpack
-
-	cd "${S}"
-	sed -i -e "s:\(MimeType=.*\):\1;:" kdebluetooth/kbtobexclient/kbtobexclient.desktop \
-		|| die "sed'ing the desktop file failed"
-
-	rm -f "${S}/configure"
-}
-
-src_install() {
-	kde_src_install
-
-	# Fix the desktop file
-	sed -i -e 's:^\(Categories=.*\):\1;:' \
-		"${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #1 failed"
-	sed -i -e 's:^\(MimeTypes\):X-\1:' \
-		"${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #2 failed"
-}