version bump

(Portage version: 2.0.53_rc3)

5 files changed, 105 insertions, 11 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index d17b5d2e38cb..77a8c8b4e2fc 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.1 2005/10/11 11:10:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.2 2005/10/17 19:14:36 dragonheart Exp $
+
+*twinkle-0.3.1 (17 Oct 2005)
+
+  17 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-0.3.1-badcflags.patch, +twinkle-0.3.1.ebuild:
+  version bump
 
 *twinkle-0.3 (11 Oct 2005)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 1b0319813b0e..8d3e7362edb0 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d83bac60554951de4500fd866fffec27 ChangeLog 416
 MD5 26e3bc4492a54c2f58604cad013570e9 files/digest-twinkle-0.3 63
+MD5 dc5a3058857036eb5ca33a35819f1164 files/digest-twinkle-0.3.1 65
 MD5 70aa928120e8267e9314805c95cd3903 files/twinkle-0.3-parallel.patch 3724
+MD5 bd526be23363739d99a572793a4340fa files/twinkle-0.3.1-badcflags.patch 1850
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
+MD5 2432690f640ed98cf2314fb15db97fff twinkle-0.3.1.ebuild 853
 MD5 5ee9abadb66d2cf29ef33f147f67a3bb twinkle-0.3.ebuild 852
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDS524mdTrptrqvGERArWzAJ9hUynjR0B7A5vEvHS03f0KZ5fEdACgnNV3
-/FNsKcvAiN9kMS2Vhr0ype8=
-=psSu
------END PGP SIGNATURE-----
diff --git a/net-im/twinkle/files/digest-twinkle-0.3.1 b/net-im/twinkle/files/digest-twinkle-0.3.1
new file mode 100644
index 000000000000..39e176699b73
--- /dev/null
+++ b/net-im/twinkle/files/digest-twinkle-0.3.1
@@ -0,0 +1 @@
+MD5 1bb5c88624074cf65138fe5be33ec5a5 twinkle-0.3.1.tar.gz 643877
diff --git a/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch b/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch
new file mode 100644
index 000000000000..d2104b85bb62
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch
@@ -0,0 +1,62 @@
+--- src/parser/Makefile.am.orig	2005-10-11 19:53:10.000000000 +1000
++++ src/parser/Makefile.am	2005-10-11 19:53:24.000000000 +1000
+@@ -7,7 +7,7 @@
+ # With the -O2 flag g++ crashes. The -O2 flag is stripped from
+ # CXXFLAGS by configure.
+ 
+-CXXFLAGS = @PARSER_CXXFLAGS@
++# CXXFLAGS = @PARSER_CXXFLAGS@
+ 
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+--- src/parser/Makefile.in.orig	2005-10-11 20:01:34.000000000 +1000
++++ src/parser/Makefile.in	2005-10-11 20:01:54.000000000 +1000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -14,8 +14,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libsipparser_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -120,11 +118,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@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -171,6 +165,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -205,6 +200,12 @@
+ AM_YFLAGS = -d
+ AM_LFLAGS = -is
+ 
++# 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@
++
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+ 
diff --git a/net-im/twinkle/twinkle-0.3.1.ebuild b/net-im/twinkle/twinkle-0.3.1.ebuild
new file mode 100644
index 000000000000..af8e89e01847
--- /dev/null
+++ b/net-im/twinkle/twinkle-0.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.3.1.ebuild,v 1.1 2005/10/17 19:14:36 dragonheart Exp $
+
+inherit eutils qt3
+
+DESCRIPTION="Twinkle is 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="~x86"
+IUSE=""
+
+# 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.3.0"
+
+DEPEND="${REDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-badcflags.patch
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS NEWS README THANKS
+}