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

Package-Manager: portage-2.1.1_pre2-r4

5 files changed, 117 insertions, 9 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/Manifest b/net-im/twinkle/Manifest
index 799297a32ca6..54c2b9460823 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -5,11 +5,16 @@ AUX twinkle-0.4.1-badcflags.patch 492 RMD160 136c6387c0053d0457e4be766a8bfdbaeac
 MD5 bed5e3eed5c8eaef4460598e15633da5 files/twinkle-0.4.1-badcflags.patch 492
 RMD160 136c6387c0053d0457e4be766a8bfdbaeaccc5b1 files/twinkle-0.4.1-badcflags.patch 492
 SHA256 7bcb91795fa0e9c0db4dc174151ed9b3850eeca132844330d65d8429949296d9 files/twinkle-0.4.1-badcflags.patch 492
+AUX twinkle-0.8-autoconfspeex.patch 1310 RMD160 608ab280a0ad17fc9b40571c77ffce127882bc7b SHA1 cf2797491dacc5977b1b50c5bdd77328f0645b49 SHA256 2caaa10216d5ae3b5a41cd29ff847a0ecd7ec88460a5fe49867bf4146d84871e
+MD5 dd2e8f14edbe35a2b3d0180d6a022d08 files/twinkle-0.8-autoconfspeex.patch 1310
+RMD160 608ab280a0ad17fc9b40571c77ffce127882bc7b files/twinkle-0.8-autoconfspeex.patch 1310
+SHA256 2caaa10216d5ae3b5a41cd29ff847a0ecd7ec88460a5fe49867bf4146d84871e files/twinkle-0.8-autoconfspeex.patch 1310
 DIST twinkle-0.5.tar.gz 826746 RMD160 d43f1ae902e50adb23866affca6fcfebb01f8424 SHA1 5f1093282dd725e15460e8af25ba0a7d5b03d01c SHA256 adcb068ca0a69976b08ba4ae620ba1293c72795f7af726011d1d90826e2b7d07
 DIST twinkle-0.6.1.tar.gz 871645 RMD160 aac921dfc4de9691787b80823c6ba1f288c9e39d SHA1 37998f6e3323b466ea59ff2cf84356e35eb4367e SHA256 8e0db6a0c067afb3562c21fe887956c66c8fc051eff337f0fa521fbdca7785c9
 DIST twinkle-0.6.2.tar.gz 872578 RMD160 cc168ff0171775278bc795389fdf4978488993a6 SHA1 bb552774da6d48fb0398e88518b916722c36e185 SHA256 99dc3f98908c15abeee0739a499bf6727383d9f458e25e704358d987d2f1ff09
 DIST twinkle-0.7.1.tar.gz 949844 RMD160 db963f84602b5afcc699bbad3c0cb4918eae05dc SHA1 bee7f29f89612077c958cbe7b55f726d67812084 SHA256 1fc2739aa2cb098e1fed7009b9e1368fdf33637e1909dc946cc6b525c3743f39
 DIST twinkle-0.7.tar.gz 947850 RMD160 d20512417cea563bcf8ca59e4e5d4d3a91a01f35 SHA1 ef3b75966efbcc7d9fb73752213ab9e2f789cdd8 SHA256 f13d555d63f82d10f9cf47c32cbd99bbb4e5070b3d3610acc60980b413a0c7c4
+DIST twinkle-0.8.tar.gz 1033092 RMD160 1adc000e9c0e6ef76599a968399e8287aec5f158 SHA1 816bb482d7a70045d6586929121b22da39571264 SHA256 075e6358e17a185b089bffeda4643b95f7a485e911c499b62e4f77a971315337
 EBUILD twinkle-0.5.ebuild 984 RMD160 a972bc10132a50d3286f91d22df270945aca8b49 SHA1 e3ecde45195ccf69e16283cdd3997284d0d0dccd SHA256 78075b799ee4215b29f6db0d8ea51eedb109128db04d3fb60a60598b66a9cb03
 MD5 8a36bf119ad6f3118041917b2f4b58c5 twinkle-0.5.ebuild 984
 RMD160 a972bc10132a50d3286f91d22df270945aca8b49 twinkle-0.5.ebuild 984
@@ -30,10 +35,14 @@ EBUILD twinkle-0.7.ebuild 1019 RMD160 df9f8147b9131418987f9f8ffaf8b8239cec54a2 S
 MD5 dcfe9fb7a5a0203a041a237c8b2a485a twinkle-0.7.ebuild 1019
 RMD160 df9f8147b9131418987f9f8ffaf8b8239cec54a2 twinkle-0.7.ebuild 1019
 SHA256 60908eb357c717b17d245119417e8152f64696752c91845372b95fdbcb0891cb twinkle-0.7.ebuild 1019
-MISC ChangeLog 2683 RMD160 ed2978454f2636259f6137318562dfb402ed308b SHA1 da9e2ba2aeea3298e7387054da4bc4b7a7ff6607 SHA256 385585ae0349dcab8910cc9adf788c478ba22b958a6623c755274ef82a14c77b
-MD5 eada591d50d11f0658ad39bc97df067a ChangeLog 2683
-RMD160 ed2978454f2636259f6137318562dfb402ed308b ChangeLog 2683
-SHA256 385585ae0349dcab8910cc9adf788c478ba22b958a6623c755274ef82a14c77b ChangeLog 2683
+EBUILD twinkle-0.8.ebuild 1195 RMD160 4f49d5ea45176073e411f7d6035cc99e446dac38 SHA1 949a1212ce2baecae6c668971577754833375935 SHA256 4412911e05bce78cdb057a65c6fe742f2c69cde09065ccf637f4e7fe31fce234
+MD5 48b48786a4e9abff8dad4bd8cf25febe twinkle-0.8.ebuild 1195
+RMD160 4f49d5ea45176073e411f7d6035cc99e446dac38 twinkle-0.8.ebuild 1195
+SHA256 4412911e05bce78cdb057a65c6fe742f2c69cde09065ccf637f4e7fe31fce234 twinkle-0.8.ebuild 1195
+MISC ChangeLog 2964 RMD160 1943da3d2ed4a6dcbafe827b332112c922c5440c SHA1 63669993b9155cb2922648d837c80eb5f3ea3c94 SHA256 aff332622e08f2dcc039b17a0de764a1a0ecb791563b23e477ee772b1c6d9941
+MD5 892db158122313f39cfbbe2d28f0ba41 ChangeLog 2964
+RMD160 1943da3d2ed4a6dcbafe827b332112c922c5440c ChangeLog 2964
+SHA256 aff332622e08f2dcc039b17a0de764a1a0ecb791563b23e477ee772b1c6d9941 ChangeLog 2964
 MISC metadata.xml 458 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 SHA1 789cc96e32af0b71920e2df2c8ab7f45c1e9279d SHA256 9ee142b0e5854bae9e0365b52f6f0cf00a3b428c0c199ccce029108d03f42996
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 metadata.xml 458
@@ -53,10 +62,13 @@ SHA256 55c1623d22a0c18b338f3f4b87952d8a3171e0649786fa758bf1e4ca514c503b files/di
 MD5 13284ec6e9205de1bad465db5a20f0fe files/digest-twinkle-0.7.1 241
 RMD160 b10445f08ec144d4b72b434d0e0b00faff71aa4e files/digest-twinkle-0.7.1 241
 SHA256 b0c9cf780879f541eef397306641b980d519d0199199d52cd5dc7daa8268bdbb files/digest-twinkle-0.7.1 241
+MD5 2a1161c4107812bb4c9107b27f402df5 files/digest-twinkle-0.8 238
+RMD160 e32880e74d8c7893240419e5367ed81fb52419c2 files/digest-twinkle-0.8 238
+SHA256 53f3dfb8d35dbb9ca570b68b19bb2275d3744dc152738bb70ffa2f4dc02fd657 files/digest-twinkle-0.8 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEdg24mdTrptrqvGERAsWVAJ9SVRuj8In6jvT19qu2OoAPmWrhdQCgl+/m
-HIqFumuahd5FoDrvo4y2e0o=
-=QWlU
+iD8DBQFErJ/imdTrptrqvGERAvEeAJ4j8E0wMq+XxeSP3ev70kYMMl0OZwCfcKfs
+e5Gv1LNz23fElhMUi/JB5Rc=
+=wEge
 -----END PGP SIGNATURE-----
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
+}