Version bump as per bug 181553. Ebuild submitted by Matěj Laitl. Thanks, Matěj! Fixed whitespace error in beta2.

Package-Manager: portage-2.1.3_rc4

6 files changed, 178 insertions, 11 deletions

diff --git a/app-mobilephone/kmobiletools/ChangeLog b/app-mobilephone/kmobiletools/ChangeLog
index 1ad3df1df601..a5d9b723ba8b 100644
--- a/app-mobilephone/kmobiletools/ChangeLog
+++ b/app-mobilephone/kmobiletools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/kmobiletools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.15 2007/04/08 07:34:08 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.16 2007/06/18 20:15:34 philantrop Exp $
+
+*kmobiletools-0.5.0_beta3 (18 Jun 2007)
+
+  18 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch,
+  kmobiletools-0.5.0_beta2.ebuild, +kmobiletools-0.5.0_beta3.ebuild:
+  Version bump as per bug 181553. Ebuild submitted by Matěj Laitl. Thanks,
+  Matěj! Fixed whitespace error in beta2.
 
 *kmobiletools-0.5.0_beta2 (08 Apr 2007)
 
diff --git a/app-mobilephone/kmobiletools/Manifest b/app-mobilephone/kmobiletools/Manifest
index c2bbe7455a9c..df896be9a324 100644
--- a/app-mobilephone/kmobiletools/Manifest
+++ b/app-mobilephone/kmobiletools/Manifest
@@ -1,22 +1,31 @@
+AUX kmobiletools-0.5.0_beta3-no-automagic-deps.patch 4945 RMD160 ec2e5c14bdaea74c22db8f018c8b3c33e443c2d2 SHA1 a7b63c09801fc0b21bff24aabe8cb5e033af84da SHA256 acdd6a1bfe582ab95ba3b47bacf92c422ee0a16d52af2f0bd48f7b63c2a4c78e
+MD5 dfa08ffbda5bb89380c351b1d5efbf07 files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch 4945
+RMD160 ec2e5c14bdaea74c22db8f018c8b3c33e443c2d2 files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch 4945
+SHA256 acdd6a1bfe582ab95ba3b47bacf92c422ee0a16d52af2f0bd48f7b63c2a4c78e files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch 4945
 DIST kmobiletools-0.4.3.3.tar.bz2 800936 RMD160 4e0fd406a171e9bdb3cb91522439bab58cc6e7f5 SHA1 c0f79f6db5be34daf1729f65a1479522b6ea1656 SHA256 35e3e6249da39847155db240a325933476f4f9af6156be68b340f937c6799c7e
 DIST kmobiletools-0.5.0-beta2.tar.bz2 1171134 RMD160 10d9f4b1c5b80a37e9a8d59f7cd8cb38657cfbc6 SHA1 04bacbab7e36b1ef40b9c19231f286ef4bb2e3bf SHA256 24d6a4f9a4136ce68a27c8b8b402dd6ccb2360df2295f5187b024eeac25d25c8
+DIST kmobiletools-0.5.0-beta3.tar.bz2 1282637 RMD160 767637c697ecfeb2800635a47a9c59ed299ffe63 SHA1 ce9b6d3a53ab0b771e8d4615d545625eccea54b6 SHA256 ef30d9d2ff8f0cb86c3b00137fa7a21d926a01f567e8375d4c7032dd41da346e
 DIST kmobiletools-0.5_beta1.tar.bz2 998633 RMD160 b3f36230d8a31263bddfa3bc3891ae302c95f262 SHA1 783c3027682fa5ef3539ce275581f25052ae7ac2 SHA256 0617bc4ab72fcefd8044ce16ad46071c33615470b24926cd10fd7c9d1b02abf0
 EBUILD kmobiletools-0.4.3.3.ebuild 818 RMD160 8d192051b5ad11d530fc5abc7b5bcbad0f5240d8 SHA1 7ab4ed0a7b1810f444a4d8f9c5b820fd55373bae SHA256 61d5300f396410c3fe5b8ed5243dfcc10b5c6fcff275ad388101b8455e2a0370
 MD5 d3988a575c866e528b2ef8e138693b9b kmobiletools-0.4.3.3.ebuild 818
 RMD160 8d192051b5ad11d530fc5abc7b5bcbad0f5240d8 kmobiletools-0.4.3.3.ebuild 818
 SHA256 61d5300f396410c3fe5b8ed5243dfcc10b5c6fcff275ad388101b8455e2a0370 kmobiletools-0.4.3.3.ebuild 818
-EBUILD kmobiletools-0.5.0_beta2.ebuild 816 RMD160 3e3f3328777fd18a31d944e7005fa1fcf92f42f6 SHA1 b79e084f9b54706de99a53f8e22290032c0149ef SHA256 df1ec3945af8533ad02d2af445093771a2332e9e2848890993cad3301932de20
-MD5 61578d2819835df34d25d43b209312c4 kmobiletools-0.5.0_beta2.ebuild 816
-RMD160 3e3f3328777fd18a31d944e7005fa1fcf92f42f6 kmobiletools-0.5.0_beta2.ebuild 816
-SHA256 df1ec3945af8533ad02d2af445093771a2332e9e2848890993cad3301932de20 kmobiletools-0.5.0_beta2.ebuild 816
+EBUILD kmobiletools-0.5.0_beta2.ebuild 813 RMD160 8e34c82c1c9b93b1a00b11188b528ade3e9e64ec SHA1 728909e7781a54563ee28dec055d06c605977b30 SHA256 37ffc561abb54478e7ce20fa56868657f394591fb6e384e6f1cfd925ca0eed17
+MD5 4d9a44cf76e4c6e00f1c3aad63e51be9 kmobiletools-0.5.0_beta2.ebuild 813
+RMD160 8e34c82c1c9b93b1a00b11188b528ade3e9e64ec kmobiletools-0.5.0_beta2.ebuild 813
+SHA256 37ffc561abb54478e7ce20fa56868657f394591fb6e384e6f1cfd925ca0eed17 kmobiletools-0.5.0_beta2.ebuild 813
+EBUILD kmobiletools-0.5.0_beta3.ebuild 1669 RMD160 6346924c04469304948670ca9ba3c77d8d557bff SHA1 ad84e6f185dbfec69845f63b62266814b26b918c SHA256 5b701f2410238ec372bde4842c53982a0c748ec1f0b789ed73da1d97d4cc9118
+MD5 34547c34648fa6f944c391b64d5294de kmobiletools-0.5.0_beta3.ebuild 1669
+RMD160 6346924c04469304948670ca9ba3c77d8d557bff kmobiletools-0.5.0_beta3.ebuild 1669
+SHA256 5b701f2410238ec372bde4842c53982a0c748ec1f0b789ed73da1d97d4cc9118 kmobiletools-0.5.0_beta3.ebuild 1669
 EBUILD kmobiletools-0.5_beta1.ebuild 722 RMD160 94eeaf65219f962c9d752cc95e79239608641e95 SHA1 331c1a186a7479c863b5761f69cb9568ce594180 SHA256 da027dc6e6231ef0193645ab09c73286225e811ead2ce526876b3334721fc025
 MD5 8c4da5cfb992f2198f5dfedc2339d1ff kmobiletools-0.5_beta1.ebuild 722
 RMD160 94eeaf65219f962c9d752cc95e79239608641e95 kmobiletools-0.5_beta1.ebuild 722
 SHA256 da027dc6e6231ef0193645ab09c73286225e811ead2ce526876b3334721fc025 kmobiletools-0.5_beta1.ebuild 722
-MISC ChangeLog 3757 RMD160 9214d26a2f950fb67bfa9f4f17017b53d9a0da86 SHA1 c1513cac11edd4e03c88fa8ec06bf83d2d81aaa9 SHA256 2516f7657d56defb2a2c6f8b3463ff85f6e830657e808c83a675ccab6e6bce24
-MD5 cada376a9828f1d5880c2117bd591e38 ChangeLog 3757
-RMD160 9214d26a2f950fb67bfa9f4f17017b53d9a0da86 ChangeLog 3757
-SHA256 2516f7657d56defb2a2c6f8b3463ff85f6e830657e808c83a675ccab6e6bce24 ChangeLog 3757
+MISC ChangeLog 4104 RMD160 20ba99951a499d5285688beda6b3d1afaabbb379 SHA1 4be8f40bbfe307acc5c6dc53b92c7855f4c68ee8 SHA256 fbcf155a837e9543a3b2735a9c82154bc420b38c8b3c907d935e133f33510d5b
+MD5 a134f3eefffdfddcc871cb387b8fad8a ChangeLog 4104
+RMD160 20ba99951a499d5285688beda6b3d1afaabbb379 ChangeLog 4104
+SHA256 fbcf155a837e9543a3b2735a9c82154bc420b38c8b3c907d935e133f33510d5b ChangeLog 4104
 MISC metadata.xml 451 RMD160 fac3a5f7d5a7a6e5e5f0f686a562dd0644ce9c65 SHA1 2ae641b00c3afa469cbca09d6e670135dc1fa2e9 SHA256 8dbf5c48aa6262f409345cc2a5da27bbf32d2ef2ff16c8a2d6f4405c7635637c
 MD5 1ac8d8cc2a0fdd0d3aab66d6d48d1cb0 metadata.xml 451
 RMD160 fac3a5f7d5a7a6e5e5f0f686a562dd0644ce9c65 metadata.xml 451
@@ -27,6 +36,9 @@ SHA256 8b67c01a6b89acb3a0d75f2bd4e65a4cec660c7e8cd8b8dd8ed81215c4ef2d3c files/di
 MD5 3c9c43c0d4cc23050ecfb4a214918877 files/digest-kmobiletools-0.5.0_beta2 280
 RMD160 5189add2a529cf79ba3ef3694c0ab8afc82dee06 files/digest-kmobiletools-0.5.0_beta2 280
 SHA256 7b91b3962a54a83d7148033442f844a6809222390aa1899b2bee3af6966cc845 files/digest-kmobiletools-0.5.0_beta2 280
+MD5 8d8876132f48703de4d5b199870c5df4 files/digest-kmobiletools-0.5.0_beta3 280
+RMD160 5c71a6333c4b0127f81f3ee324b4a87fa9a8a4f2 files/digest-kmobiletools-0.5.0_beta3 280
+SHA256 e2be20ed3f8c156714590a77606b9daae88ce9d328c5465795395c65f472a80b files/digest-kmobiletools-0.5.0_beta3 280
 MD5 ef1121410a54cfe09ff4bcc8e25d6281 files/digest-kmobiletools-0.5_beta1 271
 RMD160 fde7bd9c28b3988c33e76f926cde845edcedbcc1 files/digest-kmobiletools-0.5_beta1 271
 SHA256 7578cf62b327155bc87fc9c4c05bc9d420a185379108d1f55b8f46ff1ce2ba50 files/digest-kmobiletools-0.5_beta1 271
diff --git a/app-mobilephone/kmobiletools/files/digest-kmobiletools-0.5.0_beta3 b/app-mobilephone/kmobiletools/files/digest-kmobiletools-0.5.0_beta3
new file mode 100644
index 000000000000..dac981ca1b3a
--- /dev/null
+++ b/app-mobilephone/kmobiletools/files/digest-kmobiletools-0.5.0_beta3
@@ -0,0 +1,3 @@
+MD5 2880ca9b21ba4f70088be64b6ef6a39b kmobiletools-0.5.0-beta3.tar.bz2 1282637
+RMD160 767637c697ecfeb2800635a47a9c59ed299ffe63 kmobiletools-0.5.0-beta3.tar.bz2 1282637
+SHA256 ef30d9d2ff8f0cb86c3b00137fa7a21d926a01f567e8375d4c7032dd41da346e kmobiletools-0.5.0-beta3.tar.bz2 1282637
diff --git a/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch b/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch
new file mode 100644
index 000000000000..259baa60323d
--- /dev/null
+++ b/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch
@@ -0,0 +1,90 @@
+diff -Nru kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in kmobiletools-0.5.0-beta3-shl/kmobiletools/configure.in.in
+--- kmobiletools-0.5.0-beta3/kmobiletools/configure.in.in	2007-06-05 16:18:07.000000000 +0200
++++ kmobiletools-0.5.0-beta3-shl/kmobiletools/configure.in.in	2007-06-16 19:59:20.000000000 +0200
+@@ -8,7 +8,7 @@
+ # BEGIN KONTACT CHECK
+ ###############################################################################
+ 
+-AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact-plugin], [disable KMobileTools Kontact plugin (default: check)]),
++AC_ARG_ENABLE(kontact, AC_HELP_STRING([--disable-kontact], [disable KMobileTools Kontact plugin (default: check)]),
+ 	[enable_kontact=$enableval], [enable_kontact=yes])
+ if test "$enable_kontact" = "yes"; then
+ 	KDE_CHECK_HEADER(kontact/plugin.h, [have_kontact="yes"], [have_kontact="no"])
+@@ -72,18 +72,22 @@
+ #AC_SUBST(LIB_GAMMU)
+ #AM_CONDITIONAL(with_gammu, test $have_gammu = yes)
+ 
+-AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [enable KIOSlaves for filesystem access (default: disable)]),
++AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]),
+     [enable_kioslaves=$enableval], [enable_kioslaves=yes])
+ 
+-if test "x$enable_kioslaves" = "xyes"; then
+-	KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no)
+-	AM_CONDITIONAL(with_p2kmoto, test $have_p2k = yes)
+-	KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no)
+-	AM_CONDITIONAL(compile_obex, test $have_obexftp = yes)
+-else
+-	AM_CONDITIONAL(with_p2kmoto, false)
+-	AM_CONDITIONAL(compile_obex, false)
++AC_ARG_ENABLE(p2kmoto, AC_HELP_STRING([--disable-p2kmoto], [disable p2kmoto kioslave (default: check)]),
++    [enable_p2kmoto=$enableval], [enable_p2kmoto=yes])
++if test "x$enable_p2kmoto" = "xyes" && test "x$enable_kioslaves" = "xyes"; then
++	KDE_CHECK_HEADER(p2kmoto.h, have_p2k=yes, have_p2k=no) 
++fi
++AM_CONDITIONAL(with_p2kmoto, test "x$have_p2k" = "xyes")
++
++AC_ARG_ENABLE(obexftp, AC_HELP_STRING([--disable-obexftp], [disable obex kioslave (default: check)]),
++    [enable_obexftp=$enableval], [enable_obexftp=yes])
++if test "x$enable_obexftp" = "xyes" && test "x$enable_kioslaves" = "xyes"; then
++	KDE_CHECK_HEADER(obexftp/client.h, have_obexftp=yes, have_obexftp=no) 
+ fi
++AM_CONDITIONAL(compile_obex, test "x$have_obexftp" = "xyes")
+ 
+ if test "x$have_p2k" = "xyes"; then
+ 	AC_DEFINE(HAVE_P2KLIB, 1, [p2k filesystem support])
+@@ -117,9 +121,14 @@
+     [enable_tests=$enableval], [enable_tests=no])
+ AM_CONDITIONAL(compile_tests, test x$enable_tests = xyes)
+ 
+-KDE_CHECK_HEADER(kdebluetooth/rfcommsocketdevice.h, have_kbluetooth=yes, have_kbluetooth=no)
+-AM_CONDITIONAL(with_kdebluetooth, test $have_kbluetooth = yes)
+-if test "$have_kbluetooth" = "yes"; then
++AC_ARG_ENABLE(kdebluetooth, AC_HELP_STRING([--disable-kdebluetooth], [disable kdebluetooth integration (default: check)]),
++    [enable_kdebluetooth=$enableval], [enable_kdebluetooth=yes])
++if test "x$enable_kdebluetooth" = "xyes"; then
++	KDE_CHECK_HEADER(kdebluetooth/rfcommsocketdevice.h, have_kbluetooth=yes, have_kbluetooth=no)
++fi
++
++AM_CONDITIONAL(with_kdebluetooth, test "x$have_kbluetooth" = "xyes")
++if test "x$have_kbluetooth" = "xyes"; then
+ 	AC_DEFINE(KBLUETOOTH, 1, [use kdebluetooth rfcomm socket])
+ 	AC_SUBST(KBLUETOOTH)
+ 	LIB_KBLUETOOTH="-lkbluetooth"
+@@ -135,9 +144,12 @@
+ CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE"
+ 
+ 
+-KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no)
+-AM_CONDITIONAL(with_kdebluetooth_new, test x$have_new_kbluetooth = xyes)
+-if test "$have_new_kbluetooth" = "yes"; then
++if test "x$enable_kdebluetooth" = "xyes"; then
++	KDE_CHECK_HEADER(libkbluetooth/adapter.h, have_new_kbluetooth=yes, have_new_kbluetooth=no)
++fi
++
++AM_CONDITIONAL(with_kdebluetooth_new, test "x$have_new_kbluetooth" = "xyes")
++if test "x$have_new_kbluetooth" = "xyes"; then
+        PKG_CHECK_MODULES(BLUEZ, "bluez")
+        AC_DEFINE(KBLUETOOTH_NEW, 1, [use new kdebluetooth])
+        AC_SUBST(KBLUETOOTH_NEW)
+diff -Nru kmobiletools-0.5.0-beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp kmobiletools-0.5.0-beta3-shl/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp
+--- kmobiletools-0.5.0-beta3/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp	2007-06-05 16:18:07.000000000 +0200
++++ kmobiletools-0.5.0-beta3-shl/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp	2007-06-14 17:18:55.000000000 +0200
+@@ -572,7 +572,7 @@
+     GSM_CallShowNumber showNumber = GSM_CALL_DefaultNumberPresence;
+ 
+     m_mutex.lock();
+-    m_error = m_phoneFunctions->DialVoice( &m_stateMachine, (char*) number.data(),
++    m_error = m_phoneFunctions->DialVoice( &m_stateMachine, (number.utf8().data() ),
+                                            showNumber );
+     if( m_error != ERR_NONE ) {
+         printErrorMessage( m_error, "dial" );
diff --git a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild
index 03c97c78c6ad..145dfe0cb24c 100644
--- a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild
+++ b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild,v 1.1 2007/04/08 07:34:08 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta2.ebuild,v 1.2 2007/06/18 20:15:34 philantrop Exp $
 
 inherit kde
 
@@ -14,7 +14,7 @@ IUSE="kde"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="kde? ( || ( ( kde-base/libkcal kde-base/kontact ) kde-base/kdepim ) )
-        >=net-wireless/kdebluetooth-1.0_beta2"
+		>=net-wireless/kdebluetooth-1.0_beta2"
 
 need-kde 3.4
 
diff --git a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
new file mode 100644
index 000000000000..2419b2b31df6
--- /dev/null
+++ b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild,v 1.1 2007/06/18 20:15:34 philantrop Exp $
+
+inherit kde eutils
+
+MY_P=${P/_beta/-beta}
+DESCRIPTION="KMobiletools is a KDE-based application that allows to control mobile phones with your PC."
+SRC_URI="http://download.berlios.de/kmobiletools/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.kmobiletools.org/"
+LICENSE="GPL-2"
+
+IUSE="bluetooth gammu kde obex"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="kde? ( || ( ( kde-base/libkcal kde-base/kontact ) kde-base/kdepim ) )
+		bluetooth? ( >=net-wireless/kdebluetooth-1.0_beta2 )
+		gammu? ( >=app-mobilephone/gammu-1.10.6 )
+		obex? ( >=app-mobilephone/obexftp-0.21 )"
+
+need-kde 3.4
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${P}-no-automagic-deps.patch
+	# remove configure script to trigger it's rebuild during kde_src_compile
+	rm -f ${S}/configure
+}
+
+src_compile() {
+	myconf="$(use_enable kde libkcal)
+		$(use_enable kde kontact)
+		$(use_with gammu)
+		$(use_enable bluetooth kdebluetooth)
+		$(use_enable obex obexftp)
+		--disable-p2kmoto"
+	# the last 3 configure switches have only effect when above automagic deps patch is applied
+
+	kde_src_compile
+}
+
+pkg_postinst() {
+	if use gammu ; then
+		echo
+		elog "You have enabled gammu engine backend. Please note that support for this"
+		elog "engine in ${PN} is considered experimental and may not work as expected."
+		elog "More information and configuration steps for gammu engine can be found here:"
+		elog "http://www.kmobiletools.org/gammu"
+		echo
+	fi
+}