Dropped p.mask beta version with no final release since >2 years with scarabeus' blessing since it has a broken deptree (gammu-1.11 isn't part of the tree anymore since more than a half year).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 10 insertions, 276 deletions

diff --git a/app-mobilephone/kmobiletools/ChangeLog b/app-mobilephone/kmobiletools/ChangeLog
index 6543f34d3682..742c6fee4346 100644
--- a/app-mobilephone/kmobiletools/ChangeLog
+++ b/app-mobilephone/kmobiletools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-mobilephone/kmobiletools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.25 2008/07/31 20:05:44 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/kmobiletools/ChangeLog,v 1.26 2009/03/01 15:01:39 dev-zero Exp $
+
+  01 Mar 2009; Tiziano Müller <dev-zero@gentoo.org>
+  -files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch,
+  -files/kmobiletools-0.5.0_beta3-obexftp-file-collision-fix.patch,
+  -kmobiletools-0.5.0_beta3.ebuild:
+  Dropped p.mask beta version with no final release since >2 years with
+  scarabeus' blessing since it has a broken deptree (gammu-1.11 isn't part
+  of the tree anymore since more than a half year).
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
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
deleted file mode 100644
index 259baa60323d..000000000000
--- a/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-no-automagic-deps.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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/files/kmobiletools-0.5.0_beta3-obexftp-file-collision-fix.patch b/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-obexftp-file-collision-fix.patch
deleted file mode 100644
index 55fd3c499320..000000000000
--- a/app-mobilephone/kmobiletools/files/kmobiletools-0.5.0_beta3-obexftp-file-collision-fix.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- branches/extragear/kde3/pim/kmobiletools/configure.in.bot	2007/06/26 19:31:05	680638
-+++ branches/extragear/kde3/pim/kmobiletools/configure.in.bot	2007/06/26 19:37:45	680639
-@@ -10,10 +10,10 @@
- 
- # kdebluetooth
- KDEBLUETOOTH_VER=$DISABLED
--if test x$have_kbluetooth = xyes; then
-+if test "x$have_kbluetooth" = "xyes"; then
- 	KDEBLUETOOTH_VER="1.0-beta2"
- fi
--if test x$have_new_kbluetooth = xyes; then
-+if test "x$have_new_kbluetooth" = "xyes"; then
- 	KDEBLUETOOTH_VER="with dbus integration"
- fi
- echo -e "KDEBluetooth Integration\t\t$KDEBLUETOOTH_VER"
-@@ -44,7 +44,10 @@
- fi
- 
- echo -e "\n*************************************************\n"
--if test x$have_gammu != xyes; then
-+if test "x$have_gammu" != "xyes"; then
-     echo -e "Please note that you need EXACTLY gammu (or libgammu) 1.10.6.\nIf your distribution has another version,\nread http://www.kmobiletools.org/gammu for more details."
- fi
- 
-+if test "x$have_new_kbluetooth" = "xyes" && test "x$have_obexftp" != "xyes"; then
-+    echo -e "ObexFTP Kioslave support was disabled since it seems you have installed KDEBluetooth 1.0-beta3 or upper version, which does provide exactly the same obexftp kioslave included in kmobiletools."
-+fi
---- branches/extragear/kde3/pim/kmobiletools/configure.in.in	2007/06/26 19:31:05	680638
-+++ branches/extragear/kde3/pim/kmobiletools/configure.in.in	2007/06/26 19:37:45	680639
-@@ -72,44 +72,6 @@
- #AC_SUBST(LIB_GAMMU)
- #AM_CONDITIONAL(with_gammu, test $have_gammu = yes)
- 
--AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]),
--    [enable_kioslaves=$enableval], [enable_kioslaves=yes])
--
--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])
--	AC_SUBST(HAVE_P2KLIB)
--fi
--
--if test "x$have_obexftp" = "xyes"; then
--	AC_DEFINE(HAVE_OBEXFTP, 1, [ObexFTP filesystem support])
--	AC_SUBST(HAVE_OBEXFTP)
--fi
--
--if test "x$have_p2k" = "xyes" || test "x$have_obexftp" = "xyes"; then
--    ENABLE_KIOSLAVES="yes";
--    else ENABLE_KIOSLAVES="no";
--fi
--
--AM_CONDITIONAL(compile_kioslaves, test "x$ENABLE_KIOSLAVES" = "xyes" )
--if test "x$ENABLE_KIOSLAVES" = "xyes"; then
--    AC_DEFINE(ENABLE_FS, 1, [filesystem support])
--    AC_SUBST(ENABLE_FS)
--fi
--
- AC_ARG_ENABLE(crashhandler, AC_HELP_STRING([--disable-crashhandler], [disable KMobileTools Crash Handler(default: enable)]),
-     [enable_crashhandler=$enableval], [enable_crashhandler=yes])
- if test "x$enable_crashhandler" = "xyes"; then
-@@ -156,6 +118,45 @@
- AC_SUBST(LIB_KBLUETOOTH)
- 
- 
-+AC_ARG_ENABLE(kioslaves, AC_HELP_STRING([--disable-kioslaves], [disable all KIOSlaves for filesystem access (default: enable)]),
-+    [enable_kioslaves=$enableval], [enable_kioslaves=yes])
-+
-+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$enable_p2kmoto" = "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" && test "x$have_new_kbluetooth" != "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])
-+	AC_SUBST(HAVE_P2KLIB)
-+fi
-+
-+if test "x$have_obexftp" = "xyes"; then
-+	AC_DEFINE(HAVE_OBEXFTP, 1, [ObexFTP filesystem support])
-+	AC_SUBST(HAVE_OBEXFTP)
-+fi
-+
-+if test "x$have_p2k" = "xyes" || test "x$have_obexftp" = "xyes"; then
-+    ENABLE_KIOSLAVES="yes";
-+    else ENABLE_KIOSLAVES="no";
-+fi
-+
-+AM_CONDITIONAL(compile_kioslaves, test "x$ENABLE_KIOSLAVES" = "xyes" )
-+if test "x$ENABLE_KIOSLAVES" = "xyes"; then
-+    AC_DEFINE(ENABLE_FS, 1, [filesystem support])
-+    AC_SUBST(ENABLE_FS)
-+fi
-+
-+
- SVNREV=`svn st -v $srcdir/kmobiletools | grep -v '?' | awk '{ print $1 }' | sort -rn | head -n 1`
- AC_DEFINE_UNQUOTED( SVNREVISION, "$SVNREV", [Subversion revision] )
- 
diff --git a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild b/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
deleted file mode 100644
index 1527a9f650f6..000000000000
--- a/app-mobilephone/kmobiletools/kmobiletools-0.5.0_beta3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 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.6 2008/05/29 21:29:54 mrness 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="mirror://berlios/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-3.5* =kde-base/kontact-3.5* )
-			=kde-base/kdepim-3.5* )
-		)
-	bluetooth? ( >=net-wireless/kdebluetooth-1.0_beta2 )
-	gammu? ( ~app-mobilephone/gammu-1.11.0 net-wireless/bluez-libs )
-	obex? ( >=app-mobilephone/obexftp-0.21 net-wireless/bluez-libs )"
-RDEPEND=""
-
-need-kde 3.4
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
-
-	# Fixing file collision between kmobiletools and kdebluetooth when
-	# USE="obex" is set, see bug 183245
-	epatch "${FILESDIR}"/${P}-obexftp-file-collision-fix.patch
-
-	# remove configure script to trigger it's rebuild during kde_src_compile
-	rm -f "${S}"/configure || die "Failed to remove ./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
-}