Remove bashism, authorized by scarabeus

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

3 files changed, 82 insertions, 1 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index f71646de5140..705b23d224d6 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.72 2009/01/12 17:57:22 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.73 2009/03/03 23:11:11 drizzt Exp $
+
+*kdebluetooth-1.0_beta8-r1 (03 Mar 2009)
+
+  03 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
+  +files/kdebluetooth-1.0_beta8-bashism.patch,
+  +kdebluetooth-1.0_beta8-r1.ebuild:
+  Remove bashism, authorized by scarabeus
 
   12 Jan 2009; Ioannis Aslanidis <iaslanidis@gentoo.org>
   -kdebluetooth-1.0_beta1-r2.ebuild:
diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch
new file mode 100644
index 000000000000..25271145f592
--- /dev/null
+++ b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch
@@ -0,0 +1,22 @@
+--- kdebluetooth-1.0_beta8.orig/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler
++++ kdebluetooth-1.0_beta8/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler
+@@ -45,7 +45,7 @@
+ # Find the first unbinded /dev/rfcommX
+ DEV_NUMBER=0
+ while test "x"$(echo $RFCOMM_SHOW_OUT | grep "rfcomm"$DEV_NUMBER":"| cut -d' ' -f1 ) != "x"; do
+-	DEV_NUMBER=$[$DEV_NUMBER+1]
++	DEV_NUMBER=$(($DEV_NUMBER+1))
+ 	if test $DEV_NUMBER -gt 255; then break; fi;
+ done;
+ 
+--- kdebluetooth-1.0_beta8.orig/kdebluetooth/kioslave/obex/kio_obex/kioobex_start
++++ kdebluetooth-1.0_beta8/kdebluetooth/kioslave/obex/kio_obex/kioobex_start
+@@ -3,7 +3,7 @@
+ # This shell script is used as a mimetype handler
+ # for the bluetooth/obex-ftp-protocol mimetype. 
+ 
+-if (( $# == 0 )) ; then
++if [ $# = 0 ] ; then
+     konqueror "sdp:/"
+ else
+     host=$(echo $@ | sed 's/sdp:\/\/\[\(..:..:..:..:..:..\).*/\1/')
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
new file mode 100644
index 000000000000..6e329f284992
--- /dev/null
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r1.ebuild
@@ -0,0 +1,52 @@
+# 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.1 2009/03/03 23:11:11 drizzt 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-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/share/applications/kde/kbtobexsrv.desktop" || die "sed #1 failed"
+	sed -i -e 's:^\(MimeTypes\):X-\1:' \
+		"${D}/usr/share/applications/kde/kbtobexsrv.desktop" || die "sed #2 failed"
+}