version bump as per bug #138718. Added optional speex libraries. Readded dropped ppc keyword.

(Portage version: 2.1.1_pre2-r4)

4 files changed, 97 insertions, 1 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 36e222fecb0d..025b62a47fe2 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.14 2006/05/25 20:03:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.15 2006/07/06 05:24:37 dragonheart Exp $
+
+*twinkle-0.8 (06 Jul 2006)
+
+  06 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-0.8-autoconfspeex.patch, +twinkle-0.8.ebuild:
+  version bump as per bug #138718. Added optional speex libraries. Readded
+  dropped ppc keyword. Thanks Nicolas Lalevee for bug report
 
 *twinkle-0.7.1 (25 May 2006)
 
diff --git a/net-im/twinkle/files/digest-twinkle-0.8 b/net-im/twinkle/files/digest-twinkle-0.8
new file mode 100644
index 000000000000..391cf9205ef5
--- /dev/null
+++ b/net-im/twinkle/files/digest-twinkle-0.8
@@ -0,0 +1,3 @@
+MD5 390c9f94a519fa58575c1752d7559a89 twinkle-0.8.tar.gz 1033092
+RMD160 1adc000e9c0e6ef76599a968399e8287aec5f158 twinkle-0.8.tar.gz 1033092
+SHA256 075e6358e17a185b089bffeda4643b95f7a485e911c499b62e4f77a971315337 twinkle-0.8.tar.gz 1033092
diff --git a/net-im/twinkle/files/twinkle-0.8-autoconfspeex.patch b/net-im/twinkle/files/twinkle-0.8-autoconfspeex.patch
new file mode 100644
index 000000000000..a588b0b51171
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-0.8-autoconfspeex.patch
@@ -0,0 +1,41 @@
+--- /tmp/configure.in	2006-07-06 14:31:01.000000000 +1000
++++ configure.in	2006-07-06 14:42:18.000000000 +1000
+@@ -14,6 +14,10 @@
+ 	AC_HELP_STRING([--without-ilbc], [do not compile iLBC]),
+ 	[ac_cv_ilbc=$withval], [ac_cv_ilbc=yes])
+ 
++AC_ARG_WITH(speex,
++	AC_HELP_STRING([--without-speex], [do not compile speex]),
++	[ac_cv_speex=$withval], [ac_cv_speex=yes])
++
+ AM_INIT_AUTOMAKE(twinkle,0.8)
+ AC_DEFINE(VERSION_DATE,["July 1 2006"],[Version release date])
+ AC_PROG_CC
+@@ -138,14 +142,19 @@
+ 	], [have_libasound="no"])
+ 	
+ # Check if SPEEX is available
+-AC_CHECK_LIB(speex, main, [
+-	AC_CHECK_HEADER(speex/speex.h, [],
+-		[AC_MSG_ERROR([speex header files missing (speex-devel package)])])
+-	AC_DEFINE(HAVE_SPEEX, 1, [Define to 1 if you have the <speex> library.])
+-	LIBS="-lspeex $LIBS"
+-	echo "LIBS += -lspeex" >> $QT_INCL_PRO
+-	have_speex="yes"
+-	], [have_speex="no"])
++if test "x$ac_cv_speex" = "xyes"
++then
++	AC_CHECK_LIB(speex, main, [
++		AC_CHECK_HEADER(speex/speex.h, [],
++			[AC_MSG_ERROR([speex header files missing (speex-devel package)])])
++		AC_DEFINE(HAVE_SPEEX, 1, [Define to 1 if you have the <speex> library.])
++		LIBS="-lspeex $LIBS"
++		echo "LIBS += -lspeex" >> $QT_INCL_PRO
++		have_speex="yes"
++		], [have_speex="no"])
++else
++	have_speex="no"
++fi
+ 
+ # iLBC
+ if test "x$ac_cv_ilbc" = "xyes"
diff --git a/net-im/twinkle/twinkle-0.8.ebuild b/net-im/twinkle/twinkle-0.8.ebuild
new file mode 100644
index 000000000000..c866c67f8617
--- /dev/null
+++ b/net-im/twinkle/twinkle-0.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.8.ebuild,v 1.1 2006/07/06 05:24:37 dragonheart Exp $
+
+inherit eutils qt3  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 ~x86"
+IUSE="arts speex"
+
+# Requires libqt-mt actually...  Is that *always* built, or do we need to check?
+RDEPEND=">=net-libs/ccrtp-1.3.4
+	>=x11-libs/qt-3.3.4-r6
+	>=dev-cpp/commoncpp2-1.4.1
+	arts? ( kde-base/arts )
+	media-libs/libsndfile
+	media-libs/speex
+	dev-libs/boost
+	speex? ( media-libs/speex )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-0.4.1-badcflags.patch
+	epatch "${FILESDIR}"/${P}-autoconfspeex.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf --with-ilbc $(use_with arts) $(use_with speex) || die 'Error: conf failed'
+	emake || die "Error: emake failed!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README THANKS
+}