version bump as per bug #259071 - patch for kde4 as per bug #257247 thanks to Michael Davidsaver. removed 1.4 because of bug #256561

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

3 files changed, 43 insertions, 7 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 26a27c7b40fb..a89533cdec52 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.44 2009/01/27 17:57:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.45 2009/02/15 12:54:20 dragonheart Exp $
+
+*twinkle-1.4.1 (15 Feb 2009)
+
+  15 Feb 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-1.4.1-kdedetect.patch, -twinkle-1.4.ebuild,
+  +twinkle-1.4.1.ebuild:
+  version bump as per bug #259071 - patch for kde4 as per bug #257247 thanks
+  to Michael Davidsaver. removed 1.4 because of bug #256561
 
 *twinkle-1.4 (27 Jan 2009)
 
diff --git a/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch b/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch
new file mode 100644
index 000000000000..cee696e33d81
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.4.1-kdedetect.patch
@@ -0,0 +1,24 @@
+diff -ur twinkle-1.4.1-orig/acinclude.m4 twinkle-1.4.1/acinclude.m4
+--- twinkle-1.4.1-orig/acinclude.m4	2007-11-27 14:43:29.000000000 -0600
++++ twinkle-1.4.1/acinclude.m4	2009-02-01 10:58:17.000000000 -0600
+@@ -1780,7 +1780,7 @@
+   kde_check_header="ksock.h"
+   kde_check_lib="libkdecore.la"
+ else
+-  kde_check_header="ksharedptr.h"
++  kde_check_header="ksock.h"
+   kde_check_lib="libkio.la"
+ fi
+ 
+diff -ur twinkle-1.4.1-orig/configure.in twinkle-1.4.1/configure.in
+--- twinkle-1.4.1-orig/configure.in	2009-01-30 22:48:30.000000000 -0600
++++ twinkle-1.4.1/configure.in	2009-02-01 10:41:56.000000000 -0600
+@@ -159,7 +159,7 @@
+ 	KDE_SET_PREFIX
+ 	AC_PATH_KDE
+ 
+-	AC_CHECK_FILES(${kde_includes}/kapplication.h,
++	AC_CHECK_FILES(${kde_includes}/ksystemtray.h,
+ 		[], 
+ 		[AC_MSG_ERROR([kde header files missing (kdelibs3-devel package)])])
+ 	AC_DEFINE(HAVE_KDE, 1, [Define to 1 if you have KDE.])
diff --git a/net-im/twinkle/twinkle-1.4.ebuild b/net-im/twinkle/twinkle-1.4.1.ebuild
index a6f484ff0b40..010df0746aa4 100644
--- a/net-im/twinkle/twinkle-1.4.ebuild
+++ b/net-im/twinkle/twinkle-1.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.ebuild,v 1.1 2009/01/27 17:57:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.1.ebuild,v 1.1 2009/02/15 12:54:20 dragonheart Exp $
 
-EAPI=1
+EAPI=2
 ARTS_REQUIRED="never"
-inherit eutils qt3 kde
+inherit eutils qt3 kde autotools
 
 DESCRIPTION="a soft phone for your VOIP communcations using SIP"
 HOMEPAGE="http://www.twinklephone.com/"
@@ -37,7 +37,12 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-kdedetect.patch
+	eautoreconf
+}
+
+src_configure() {
 	local myconf=" \
 			$(use_with kde) \
 			$(use_with ilbc) \
@@ -45,11 +50,10 @@ src_compile() {
 			$(use_with zrtp) \
 			$(use_with speex)"
 	set-kdedir
-	kde_src_compile
 }
 
 src_install() {
 	kde_src_install
-	dodoc THANKS
 	domenu twinkle.desktop
+	dodoc THANKS
 }