fixed fails due to new kde-eclass - bug #269805 thanks Florian Manschwetus

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

9 files changed, 12 insertions, 186 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 8e903d3cced6..548e91cebec2 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.49 2009/04/26 15:03:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.50 2009/05/14 22:09:25 dragonheart Exp $
+
+  14 May 2009; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-0.4.1-badcflags.patch, -files/twinkle-1.0.1-icmp.patch,
+  -files/twinkle-1.3.1-withoutkde.patch, -files/twinkle.desktop.patch,
+  -twinkle-1.0.1-r1.ebuild, -twinkle-1.3.1.ebuild, twinkle-1.4.1.ebuild,
+  twinkle-1.4.2.ebuild:
+  fixed fails due to new kde-eclass - bug #269805 thanks Florian Manschwetus
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org> twinkle-1.4.1.ebuild:
   stable ppc, bug 264505
diff --git a/net-im/twinkle/files/twinkle-0.4.1-badcflags.patch b/net-im/twinkle/files/twinkle-0.4.1-badcflags.patch
deleted file mode 100644
index 5b45ef1776df..000000000000
--- a/net-im/twinkle/files/twinkle-0.4.1-badcflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/parser/Makefile.in.orig	2005-11-20 11:33:48.000000000 +1100
-+++ src/parser/Makefile.in	2005-11-20 11:36:14.000000000 +1100
-@@ -127,11 +127,7 @@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--
--# The output of bison cannot be compiled with the -O2 flag.
--# With the -O2 flag g++ crashes. The -O2 flag is stripped from
--# CXXFLAGS by configure.
--CXXFLAGS = @PARSER_CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DCOPIDL = @DCOPIDL@
- DCOPIDL2CPP = @DCOPIDL2CPP@
diff --git a/net-im/twinkle/files/twinkle-1.0.1-icmp.patch b/net-im/twinkle/files/twinkle-1.0.1-icmp.patch
deleted file mode 100644
index fdd326364979..000000000000
--- a/net-im/twinkle/files/twinkle-1.0.1-icmp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/sockets/socket.cpp
-===================================================================
---- src/sockets/socket.cpp	(revision 327)
-+++ src/sockets/socket.cpp	(working copy)
-@@ -18,6 +18,7 @@
- 
- #include <cstdio>
- #include <cerrno>
-+#include <cstring>
- #include <sys/un.h>
- #include "twinkle_config.h"
- #include "socket.h"
-@@ -184,6 +185,7 @@
- 	
- 	// Initialize message header to receive the ancillary data for
- 	// an ICMP message.
-+	memset(&msgh, 0, sizeof(struct msghdr));
- 	msgh.msg_control = buf;
- 	msgh.msg_controllen = 256;
- 	msgh.msg_name = &dest_addr;
diff --git a/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch b/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch
deleted file mode 100644
index 5c74a98b1f6c..000000000000
--- a/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- twinkle-1.3.1/src/gui/twinkleapplication.h.orig	2008-08-24 13:44:29.000000000 +1000
-+++ twinkle-1.3.1/src/gui/twinkleapplication.h	2008-08-24 13:44:42.000000000 +1000
-@@ -36,7 +36,7 @@
- #ifdef HAVE_KDE
- 	t_twinkle_application();
- #else
--	t_twinkle_application(int &argv, char **argv);
-+	t_twinkle_application(int &argc, char **argv);
- #endif
- 	virtual void commitData ( QSessionManager &sm );
- };
diff --git a/net-im/twinkle/files/twinkle.desktop.patch b/net-im/twinkle/files/twinkle.desktop.patch
deleted file mode 100644
index 9dd515d6aab8..000000000000
--- a/net-im/twinkle/files/twinkle.desktop.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- twinkle.desktop.in.orig	2007-07-23 18:50:01.000000000 +1000
-+++ twinkle.desktop.in	2007-07-23 19:31:11.320146603 +1000
-@@ -8,4 +8,4 @@
- StartupNotify=true
- Terminal=false
--Categories=Qt;KDE;Network;Telephony
-+Categories=Qt;KDE;Network;Telephony;
diff --git a/net-im/twinkle/twinkle-1.0.1-r1.ebuild b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
deleted file mode 100644
index 0cd8f3442846..000000000000
--- a/net-im/twinkle/twinkle-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.11 2008/07/27 22:07:12 carlo Exp $
-
-EAPI=1
-ARTS_REQUIRED="never"
-inherit eutils qt3 kde
-
-DESCRIPTION="a soft phone for your VOIP communcations using SIP"
-HOMEPAGE="http://www.twinklephone.com/"
-SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="arts speex ilbc zrtp kdehiddenvisibility"
-
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-RDEPEND=">=net-libs/ccrtp-1.5.0
-	>=dev-cpp/commoncpp2-1.4.2
-	x11-libs/qt:3
-	media-libs/libsndfile
-	dev-libs/boost
-	speex? ( media-libs/speex )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( ~net-libs/libzrtpcpp-0.9.0 )
-	media-libs/alsa-lib"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
-		! built_with_use 'media-libs/speex' 'wideband' ; then
-		eerror "You need to build media-libs/speex with USE=wideband enabled."
-		die "Speex w/o wideband-support detected."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
-	epatch "${FILESDIR}"/${P}-icmp.patch
-	epatch "${FILESDIR}"/twinkle.desktop.patch
-}
-
-src_compile() {
-	local myconf=" \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex)"
-	set-kdedir
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	dodoc THANKS
-	domenu twinkle.desktop
-}
-
-pkg_postinst() {
-	elog "if you get crashes on startup re-emerge commoncpp2 ccrtp and	twinkle"
-	elog "see http://www.xs4all.nl/~mfnboer/twinkle/faq.html#crash_startup"
-	kde_pkg_postinst
-}
diff --git a/net-im/twinkle/twinkle-1.3.1.ebuild b/net-im/twinkle/twinkle-1.3.1.ebuild
deleted file mode 100644
index 4b2121447bd4..000000000000
--- a/net-im/twinkle/twinkle-1.3.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.3.1.ebuild,v 1.1 2008/08/24 03:57:46 dragonheart Exp $
-
-EAPI=1
-ARTS_REQUIRED="never"
-inherit eutils qt3 kde
-
-DESCRIPTION="a soft phone for your VOIP communcations using SIP"
-HOMEPAGE="http://www.twinklephone.com/"
-SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="kde arts speex ilbc zrtp kdehiddenvisibility"
-
-# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
-RDEPEND=">=net-libs/ccrtp-1.6.0
-	>=dev-cpp/commoncpp2-1.6.1
-	x11-libs/qt:3
-	media-libs/libsndfile
-	dev-libs/boost
-	speex? ( media-libs/speex )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
-	media-libs/alsa-lib"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
-		! built_with_use 'media-libs/speex' 'wideband' ; then
-		eerror "You need to build media-libs/speex with USE=wideband enabled."
-		die "Speex w/o wideband-support detected."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-withoutkde.patch
-}
-
-src_compile() {
-	local myconf=" \
-			$(use_with kde) \
-			$(use_with ilbc) \
-			$(use_with arts) \
-			$(use_with zrtp) \
-			$(use_with speex)"
-	set-kdedir
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	dodoc THANKS
-	domenu twinkle.desktop
-}
diff --git a/net-im/twinkle/twinkle-1.4.1.ebuild b/net-im/twinkle/twinkle-1.4.1.ebuild
index efed5746823e..c1deab50da71 100644
--- a/net-im/twinkle/twinkle-1.4.1.ebuild
+++ b/net-im/twinkle/twinkle-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.4 2009/04/26 15:03:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.1.ebuild,v 1.5 2009/05/14 22:09:25 dragonheart Exp $
 
 EAPI=2
 ARTS_REQUIRED="never"
@@ -50,7 +50,7 @@ src_configure() {
 			$(use_with zrtp) \
 			$(use_with speex)"
 	set-kdedir
-	kde_src_compile configure
+	kde_src_configure myconf configure
 }
 
 src_compile() {
diff --git a/net-im/twinkle/twinkle-1.4.2.ebuild b/net-im/twinkle/twinkle-1.4.2.ebuild
index f940cc548393..676344eca84e 100644
--- a/net-im/twinkle/twinkle-1.4.2.ebuild
+++ b/net-im/twinkle/twinkle-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2009/04/14 23:07:44 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.2.ebuild,v 1.2 2009/05/14 22:09:25 dragonheart Exp $
 
 EAPI=2
 ARTS_REQUIRED="never"
@@ -50,7 +50,7 @@ src_configure() {
 			$(use_with zrtp) \
 			$(use_with speex)"
 	set-kdedir
-	kde_src_compile configure
+	kde_src_configure myconf configure
 }
 
 src_compile() {