Fixes bug #225975

4 files changed, 86 insertions, 12 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 81ec4a675559..6653ad9e0e8b 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2009/05/10 19:21:54 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.76 2009/05/11 17:08:50 deathwing00 Exp $
+
+*kdebluetooth-1.0_beta8-r2 (11 May 2009)
+
+  11 May 2009; Ioannis Aslanidis <iaslanidis@gentoo.org>
+  +files/kdebluetooth-1.0_beta8-kbluelock.diff,
+  +kdebluetooth-1.0_beta8-r2.ebuild:
+  Fixes bug #225975
 
   10 May 2009; Hanno Boeck <hanno@gentoo.org> kdebluetooth-1.0_beta8.ebuild,
   kdebluetooth-1.0_beta8-r1.ebuild:
diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest
index c00266d648dd..b0da6aa7449b 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX better-menu-names.diff 2062 RMD160 c3db60fa907a7907fd1a402df8dad13fca7763c8 SHA1 2fa8f9ecc78b212e8391c7add84f17eda94fc72f SHA256 58ddc9c33c6dc66fa85ce74ec7d60f181bb909ea7026f8d7af82091e0723d3e2
 AUX kcm-btpaired-fix.diff 15910 RMD160 e70bad64cdc8a909327427f477dd94a9282e0732 SHA1 b27f7acc10c60708681f3de648803c08191a40ba SHA256 673d2f9a2f1f92b4595d12bcc1d8bc375fed237741a48b52b0a84dffe59fb782
 AUX kcm-no-dcop-error.diff 1156 RMD160 81840a6069f8c188e2e57934c1d8d96fcee8e18f SHA1 c80b89c451f8fcb340163ba9b41ac534d09ed07d SHA256 85f082726200d7208cbda1fccdd8d5cdd27d6a6bad8ad65d768217c9139bb785
@@ -9,6 +6,7 @@ AUX kdebluetooth-1.0_beta1-kde3.5.2.patch 5380 RMD160 78521240c94c5046097b04b685
 AUX kdebluetooth-1.0_beta1-openobex-1.1.patch 7315 RMD160 c73ca92bcc511e91442ac27d9b362fa069c03db7 SHA1 ba4a45e8a138e9f53931389ccb989bb44992d3b8 SHA256 8b5dc80f455f9967dd1e0b94f3d32e9c270444063fa70eac5c387de1a8b5e848
 AUX kdebluetooth-1.0_beta8-bashism.patch 879 RMD160 519657c9933495e43a4a0f32308afe2ba1821861 SHA1 b20d28558723b03eaff085d18b6f857330bf43bb SHA256 042f12de950bbdb2c854fede63b19f425df576e91a3314a67287ac485b0bd7ae
 AUX kdebluetooth-1.0_beta8-gcc43.patch 1575 RMD160 2837f0b3a9728b174d3a23fccacc7553312ddbad SHA1 411e8431c27426565fffc8d43396d36e1fd11762 SHA256 02e9d017a4f0f6966a9738e4d0307d9d8b2bb8f49787ecb28487bdfc0f81c207
+AUX kdebluetooth-1.0_beta8-kbluelock.diff 925 RMD160 4c509154371b1580611c5d5d756fd9a6790dd72c SHA1 ec150293f68fe9533b97dafc516de94f86a4503e SHA256 27b2e6e5395a7d6b7842ac978c07bf107d314b8a8042cb7b801c8e7b76d469de
 AUX kdebluetooth-dbuspasskeyagent.diff 17790 RMD160 7c6b73ec8ca1aa375f6a472b966af3941dbb05eb SHA1 658d34372afb071e94c9c8555d80fcc673460141 SHA256 598d8a810c82fe2ce8aececc2649585908eced90c9fbe846fd8769452af9c5f9
 AUX kdebluetooth-sdp-bitop.diff 2012 RMD160 208ae7d61b7ee84dc77cacee22be1dbc78036abf SHA1 e7358af0bff9a1eeb2921c3c4177a0796f215b19 SHA256 ca489f6aed43d47316897c0bf303ad02877645586b70b859f38ba7450a94b736
 AUX kdebluetooth.diff 804 RMD160 b02d9c579c7b480de77b95db263188553f2421ab SHA1 a430eef27e8a6395bce594bd5f0bc661adbca81b SHA256 6fd029e1a2e85ae34ae94c99b5b8b362f43d4f6a91618fd01137b4987d6fbfef
@@ -16,13 +14,7 @@ DIST kdebluetooth-1.0_beta2.tar.bz2 1228026 RMD160 52d54f49a1eb5c89b2a5ad9550dc6
 DIST kdebluetooth-1.0_beta8.tar.bz2 1091884 RMD160 84570b1c3335521e4d0f976f91d0237a4b0c1ee2 SHA1 b602e02d26518217bcf1afa5da2e2473c93b81cc SHA256 3f4cf5566446b3cc9f5cdb98304fbefcd0319c0e659d60a75123e8729286f3fa
 EBUILD kdebluetooth-1.0_beta2-r2.ebuild 2202 RMD160 1f90d22f469728075a037482df54ae3c803e8465 SHA1 f2ffa9362cf3682d8cc357b17adb719e252003e1 SHA256 7e443fe31331c4e6bc704048cabc15560e5cbac7bd5342921856ee3209fe2606
 EBUILD kdebluetooth-1.0_beta8-r1.ebuild 1474 RMD160 087c0a898c2e8f102ea2c1f8c106626b662d3114 SHA1 e11b3034313daa53c22e5ade2bf907ba058eabf2 SHA256 99f10cf97bb328228440747edea17a09192a4d6b939713d17bc901fd8ba44442
+EBUILD kdebluetooth-1.0_beta8-r2.ebuild 1515 RMD160 08bef8bce727b7989d59cc0f147e348cb3b796a6 SHA1 8f49bdeebd867c58ff94ba89e6158d9d9b6ef586 SHA256 5cccbb122f70b76c60845b60ef471288328c91aa4f56c14cd0d785df1523989f
 EBUILD kdebluetooth-1.0_beta8.ebuild 1435 RMD160 4ad174c0f9c4ea3864ef1555f9a014933c99593e SHA1 a365521147036610ef11e06aa1bc31da1622a9fd SHA256 808899c9d73f9419669cbdff966ff314d7e742a8d4d2f7672926a70ffcc10e47
-MISC ChangeLog 13198 RMD160 6450c4cc3e9bb8f356f0e00ded88760ad188455a SHA1 aa9643dfc9eac64b5df56a3d4dafa32931721b66 SHA256 7f10ad9d9037abec002704c8fa2e7752ceb7026517bc8d1fc6411fcdd46b5923
+MISC ChangeLog 13403 RMD160 e2dadb51b77775e088c7421682ccfa2980cb6c60 SHA1 dacb51e5de4be0d248668e73e0ed910550b491fe SHA256 01b401f7a422d092d2210202183d12f2efc4e348d6461e7baa30bba039a68ae9
 MISC metadata.xml 252 RMD160 5050aee89a626730668539dee047f9b3e13e6382 SHA1 748125968cc776b5534a4e8a4c4db89ab4333571 SHA256 0e4030fc3b8fd3629227fb2c57e80882c546f9a4087178ce61c4e6f266187b7a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoHKVUACgkQr2QksT29OyDdZwCgpDVQ+c1DVMrm1hoYJ1MSUEBE
-dUoAoJ5UmbtkTJq7iQ8dzmajTTzecQZ1
-=gcNr
------END PGP SIGNATURE-----
diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff
new file mode 100644
index 000000000000..45c945992921
--- /dev/null
+++ b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff
@@ -0,0 +1,22 @@
+--- kdebluetooth/kbluelock/kbluelock.cpp	2007-09-17 18:52:33.000000000 +0200
++++ kdebluetooth/kbluelock/kbluelock.cpp	2008-06-11 22:57:51.000000000 +0200
+@@ -147 +147,18 @@
+-	if (adapter->getRemoteMajorClass(addr) == "phone") {
++	if (
++		adapter->getRemoteMajorClass(addr) == "phone" ||
++		adapter->getRemoteMajorClass(addr) == "wearable" ||
++		adapter->getRemoteMajorClass(addr) == "computer" && (
++			adapter->getRemoteMinorClass(addr) == "palm" ||
++			adapter->getRemoteMinorClass(addr) == "handheld" ||
++			adapter->getRemoteMinorClass(addr) == "wearable"
++		) ||
++		adapter->getRemoteMajorClass(addr) == "imaging" && (
++			adapter->getRemoteMinorClass(addr) == "camera"
++		) ||
++		adapter->getRemoteMajorClass(addr) == "audio_video" && (
++			adapter->getRemoteMinorClass(addr) == "headset" ||
++			adapter->getRemoteMinorClass(addr) == "video camera" ||
++			adapter->getRemoteMinorClass(addr) == "camcorder"
++		)
++	)
++	{
diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
new file mode 100644
index 000000000000..121cb4ec73d4
--- /dev/null
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2009/05/11 17:08:50 deathwing00 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 )
+		net-wireless/bluez )"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-gcc43.patch ${FILESDIR}/${P}-bashism.patch
+         ${FILESDIR}/${P}-kbluelock.diff"
+
+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"
+}