arts USE flag added- bug #112147. remove older version

(Portage version: 2.0.53_rc7)

6 files changed, 23 insertions, 133 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 1d56598f0655..55dc8f959cfd 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2005/11/07 10:54:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.4 2005/11/13 11:22:21 dragonheart Exp $
+
+*twinkle-0.3.2-r1 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-0.3-parallel.patch, -twinkle-0.3.ebuild,
+  +twinkle-0.3.2-r1.ebuild:
+  arts USE flag added- bug #112147 thanks to Felix Tiede
 
 *twinkle-0.3.2 (07 Nov 2005)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 2f3ed7a515ce..cce336212938 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f7d960797ad53646dcbc3368ea594a2d ChangeLog 827
 MD5 26e3bc4492a54c2f58604cad013570e9 files/digest-twinkle-0.3 63
 MD5 dc5a3058857036eb5ca33a35819f1164 files/digest-twinkle-0.3.1 65
 MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2 65
+MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2-r1 65
 MD5 70aa928120e8267e9314805c95cd3903 files/twinkle-0.3-parallel.patch 3724
 MD5 bd526be23363739d99a572793a4340fa files/twinkle-0.3.1-badcflags.patch 1850
 MD5 e5260d884a6822201c94886d32c5154d files/twinkle-0.3.2-amd64.patch 503
 MD5 9a6bdc1d520938fd26446b34f7414d06 files/twinkle-0.3.2-badcflags.patch 14878
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
 MD5 7abbf78091ee015b297347fb0b1c9d09 twinkle-0.3.1.ebuild 855
+MD5 92e21d893617c95ab5013d0a40a955d6 twinkle-0.3.2-r1.ebuild 1028
 MD5 6927584c0ecd78f39a77a33016dc3df8 twinkle-0.3.2.ebuild 892
 MD5 5ee9abadb66d2cf29ef33f147f67a3bb twinkle-0.3.ebuild 852
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDbzJgmdTrptrqvGERAhW/AJ9UUHDtkuEgqt0NbPNF6P3YpnocpQCdGK7e
-8b0yXPfdj66VAwwTusSZGY4=
-=nwgQ
------END PGP SIGNATURE-----
diff --git a/net-im/twinkle/files/digest-twinkle-0.3 b/net-im/twinkle/files/digest-twinkle-0.3
deleted file mode 100644
index 7efe7cb40edc..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0af1fcbe0450aab056e1d79ccfab9fe8 twinkle-0.3.tar.gz 641423
diff --git a/net-im/twinkle/files/digest-twinkle-0.3.2-r1 b/net-im/twinkle/files/digest-twinkle-0.3.2-r1
new file mode 100644
index 000000000000..d899566ea8ae
--- /dev/null
+++ b/net-im/twinkle/files/digest-twinkle-0.3.2-r1
@@ -0,0 +1 @@
+MD5 5c4490880a150c28aeba2c38e3403a7a twinkle-0.3.2.tar.gz 723589
diff --git a/net-im/twinkle/files/twinkle-0.3-parallel.patch b/net-im/twinkle/files/twinkle-0.3-parallel.patch
deleted file mode 100644
index b07c11f46a54..000000000000
--- a/net-im/twinkle/files/twinkle-0.3-parallel.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- src/Makefile.in.orig	2005-10-11 19:50:29.000000000 +1000
-+++ src/Makefile.in	2005-10-11 19:54:00.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,
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libtwinkle_a_SOURCES) $(twinkle_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -67,7 +65,7 @@
- am_twinkle_OBJECTS = main.$(OBJEXT)
- twinkle_OBJECTS = $(am_twinkle_OBJECTS)
- am__DEPENDENCIES_1 =
--twinkle_DEPENDENCIES = $(top_builddir)/src/libtwinkle.a \
-+twinkle_DEPENDENCIES = libtwinkle.a \
- 	$(top_builddir)/src/parser/libsipparser.a \
- 	$(top_builddir)/src/sdp/libsdpparser.a \
- 	$(top_builddir)/src/sockets/libsocket.a \
-@@ -166,6 +164,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@
-@@ -201,7 +200,7 @@
- AM_CPPFLAGS = -DDATADIR=\"$(pkgdatadir)\"
- noinst_LIBRARIES = libtwinkle.a
- twinkle_SOURCES = main.cpp
--twinkle_LDADD = $(top_builddir)/src/libtwinkle.a\
-+twinkle_LDADD = libtwinkle.a\
- 	$(top_builddir)/src/parser/libsipparser.a\
-         $(top_builddir)/src/sdp/libsdpparser.a\
-         $(top_builddir)/src/sockets/libsocket.a\
---- src/Makefile.am.orig	2005-10-11 19:50:19.000000000 +1000
-+++ src/Makefile.am	2005-10-11 19:51:00.000000000 +1000
-@@ -10,7 +10,7 @@
- 
- twinkle_SOURCES = main.cpp
- 
--twinkle_LDADD = $(top_builddir)/src/libtwinkle.a\
-+twinkle_LDADD = libtwinkle.a\
- 	$(top_builddir)/src/parser/libsipparser.a\
-         $(top_builddir)/src/sdp/libsdpparser.a\
-         $(top_builddir)/src/sockets/libsocket.a\
---- 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.ebuild b/net-im/twinkle/twinkle-0.3.2-r1.ebuild
index eb39def21b1a..2ab5f761dbad 100644
--- a/net-im/twinkle/twinkle-0.3.ebuild
+++ b/net-im/twinkle/twinkle-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2005/10/11 11:10:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.3.2-r1.ebuild,v 1.1 2005/11/13 11:22:21 dragonheart Exp $
 
 inherit eutils qt3
 
@@ -10,20 +10,27 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="arts"
 
 # 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"
+	>=dev-cpp/commoncpp2-1.3.0
+	arts? ( kde-base/arts )"
 
-DEPEND="${REDEPEND}
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-parallel.patch
+	epatch ${FILESDIR}/${P}-badcflags.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
+
+src_compile() {
+	econf $(use_with arts) || die 'Error: conf failed'
+	emake || die "Error: emake failed!"
 }
 
 src_install() {