version bump and cleanout

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64)

4 files changed, 15 insertions, 178 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index c8531429c25a..26a27c7b40fb 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/twinkle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.43 2008/08/24 03:57:46 dragonheart Exp $
+# 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 $
+
+*twinkle-1.4 (27 Jan 2009)
+
+  27 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-1.2-zrtp.patch, -twinkle-1.2.ebuild,
+  -twinkle-1.2-r1.ebuild, +twinkle-1.4.ebuild:
+  version bump and cleanout
 
 *twinkle-1.3.1 (24 Aug 2008)
 
diff --git a/net-im/twinkle/files/twinkle-1.2-zrtp.patch b/net-im/twinkle/files/twinkle-1.2-zrtp.patch
deleted file mode 100644
index 1163884b6ad2..000000000000
--- a/net-im/twinkle/files/twinkle-1.2-zrtp.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -ru twinkle-1.2-orig/configure.in twinkle-1.2/configure.in
---- twinkle-1.2-orig/configure.in	2008-03-09 19:28:14.000000000 +1100
-+++ twinkle-1.2/configure.in	2008-05-01 22:19:00.000000000 +1000
-@@ -256,6 +256,10 @@
- 		AC_CHECK_HEADER(libzrtpcpp/ZrtpQueue.h, [],
- 			[AC_MSG_ERROR([zrtp header files missing])])
- 		AC_DEFINE(HAVE_ZRTP, 1, [Define to 1 if you have the <libzrtpcpp> library.])
-+		AC_CHECK_HEADER(libzrtpcpp/ZrtpCodes.h,
-+			[AC_DEFINE(HAVE_ZRTP_1_1, 1, [Define to 1 if you have the <libzrtpcpp> library version 1.1 or later.])
-+			AC_DEFINE(ZRTP_NAMESPACE(x), GnuZrtpCodes::x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])],
-+			[AC_DEFINE(ZRTP_NAMESPACE(x), x, [namespace macro required to cause compatiblity beween zrtp 1.1 and previous versions])])
- 		LIBS="-lzrtpcpp $LIBS"
- 		echo "LIBS += -lzrtpcpp" >> $QT_INCL_PRO
- 		have_zrtp="yes"
-diff -ru twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h twinkle-1.2/src/audio/twinkle_zrtp_ui.h
---- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.h	2008-02-27 08:10:48.000000000 +1100
-+++ twinkle-1.2/src/audio/twinkle_zrtp_ui.h	2008-05-01 22:25:01.000000000 +1000
-@@ -30,6 +30,9 @@
- #include <iostream>
- #include <libzrtpcpp/ZrtpQueue.h>
- #include <libzrtpcpp/ZrtpUserCallback.h>
-+#ifdef HAVE_ZRTP_1_1
-+#include <libzrtpcpp/ZrtpCodes.h>
-+#endif
- #include "audio_session.h"
- #include "userintf.h"
- 
-@@ -44,8 +47,8 @@
-         virtual void secureOff();
-         virtual void showSAS(std::string sas); 
-         virtual void confirmGoClear();
--        virtual void showMessage(MessageSeverity sev, std::string message);
--        virtual void zrtpNegotiationFailed(MessageSeverity severity, std::string msg);
-+        virtual void showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message);
-+        virtual void zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg);
-         virtual void zrtpNotSuppOther();
- 
-     private:
---- twinkle-1.2-orig/src/audio/twinkle_zrtp_ui.cpp	2008-02-27 08:10:50.000000000 +1100
-+++ twinkle-1.2/src/audio/twinkle_zrtp_ui.cpp	2008-05-01 22:49:54.000000000 +1000
-@@ -32,7 +32,11 @@
- extern t_phone *phone;
- 
- TwinkleZrtpUI::TwinkleZrtpUI(ZrtpQueue* queue, t_audio_session* session) :
-+#ifdef HAVE_ZRTP_1_1
-+            ZrtpUserCallback((const ZrtpUserCallback&) queue), audioSession(session) 
-+#else
-             ZrtpUserCallback(queue), audioSession(session) 
-+#endif
- {}
- 
- void TwinkleZrtpUI::secureOn(std::string cipher) {
-@@ -96,7 +100,7 @@
- 	ui->cb_async_zrtp_confirm_go_clear(lineno);
- }
- 
--void TwinkleZrtpUI::showMessage(MessageSeverity sev, std::string message) {
-+void TwinkleZrtpUI::showMessage(ZRTP_NAMESPACE(MessageSeverity) sev, std::string message) {
- 	t_line *line = audioSession->get_line();
- 	int lineno = line->get_line_number();
- 	
-@@ -106,11 +110,11 @@
- 	msg += message;
- 	
- 	switch (sev) {
--	case Info:
-+	case ZRTP_NAMESPACE(Info):
- 		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
- 			LOG_INFO);
- 		break;
--	case Warning:
-+	case ZRTP_NAMESPACE(Warning):
- 		log_file->write_report(msg, "TwinkleZrtpUI::showMessage", LOG_NORMAL,
- 			LOG_WARNING);
- 		break;
-@@ -120,7 +124,7 @@
- 	}
- }
- 
--void TwinkleZrtpUI::zrtpNegotiationFailed(MessageSeverity severity, std::string msg) {
-+void TwinkleZrtpUI::zrtpNegotiationFailed(ZRTP_NAMESPACE(MessageSeverity) severity, std::string msg) {
- 	t_line *line = audioSession->get_line();
- 	int lineno = line->get_line_number();
- 	
-@@ -130,11 +134,11 @@
- 	m += msg;
- 	
- 	switch (severity) {
--	case Info:
-+	case ZRTP_NAMESPACE(Info):
- 		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
- 			LOG_INFO);
- 		break;
--	case Warning:
-+	case ZRTP_NAMESPACE(Warning):
- 		log_file->write_report(m, "TwinkleZrtpUI::zrtpNegotiationFailed", LOG_NORMAL,
- 			LOG_WARNING);
- 		break;
diff --git a/net-im/twinkle/twinkle-1.2-r1.ebuild b/net-im/twinkle/twinkle-1.2-r1.ebuild
deleted file mode 100644
index d56b961c70d3..000000000000
--- a/net-im/twinkle/twinkle-1.2-r1.ebuild
+++ /dev/null
@@ -1,67 +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.2-r1.ebuild,v 1.3 2008/08/22 23:41:37 dragonheart Exp $
-
-EAPI=1
-ARTS_REQUIRED="never"
-inherit eutils qt3 kde autotools
-
-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="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-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}-zrtp.patch
-	cd "${S}"
-	eautoreconf
-}
-
-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.2.ebuild b/net-im/twinkle/twinkle-1.4.ebuild
index 1718e0cea640..a6f484ff0b40 100644
--- a/net-im/twinkle/twinkle-1.2.ebuild
+++ b/net-im/twinkle/twinkle-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.ebuild,v 1.4 2008/08/22 23:41:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.ebuild,v 1.1 2009/01/27 17:57:49 dragonheart Exp $
 
 EAPI=1
 ARTS_REQUIRED="never"
@@ -13,11 +13,11 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="arts speex ilbc zrtp kdehiddenvisibility"
+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.5.0
-	>=dev-cpp/commoncpp2-1.4.2
+RDEPEND=">=net-libs/ccrtp-1.6.0
+	>=dev-cpp/commoncpp2-1.6.1
 	x11-libs/qt:3
 	media-libs/libsndfile
 	dev-libs/boost
@@ -39,6 +39,7 @@ pkg_setup() {
 
 src_compile() {
 	local myconf=" \
+			$(use_with kde) \
 			$(use_with ilbc) \
 			$(use_with arts) \
 			$(use_with zrtp) \
@@ -52,9 +53,3 @@ 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
-}