version bump + remove old versions

(Portage version: 2.1_pre4-r1)

16 files changed, 26 insertions, 698 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 65c4aebcdc7a..7c45fdb33343 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,15 @@
 # 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.7 2006/01/08 10:11:41 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.8 2006/02/12 10:45:28 dragonheart Exp $
+
+*twinkle-0.6.1 (12 Feb 2006)
+
+  12 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-0.3.1-badcflags.patch, -files/twinkle-0.3.2-amd64.patch,
+  -files/twinkle-0.3.2-badcflags.patch, -twinkle-0.3.1.ebuild,
+  -twinkle-0.3.2.ebuild, -twinkle-0.3.2-r1.ebuild, -twinkle-0.4.1.ebuild,
+  -twinkle-0.4.2.ebuild, +twinkle-0.6.1.ebuild:
+  version bump + remove old versions
 
 *twinkle-0.5 (08 Jan 2006)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index c471baf971a4..818a456aed9f 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,64 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e7e9cac98b773cf57a24d132b4669ebc ChangeLog 1545
-RMD160 00db4240bfbd9fa6dab49122879721cdd9d1dd65 ChangeLog 1545
-SHA256 42d83fb371abf187258d19e4112d8459bac5bd6e14b25017f22c7bad46e026f9 ChangeLog 1545
-MD5 dc5a3058857036eb5ca33a35819f1164 files/digest-twinkle-0.3.1 65
-RMD160 17c41aaa7b3486cbdd5ad32728e3e6517bc14fd4 files/digest-twinkle-0.3.1 65
-SHA256 32acb84eb1827562382f3466cba556cedda20cdc8e81032a59ae7af9b33ab9bd files/digest-twinkle-0.3.1 65
-MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2 65
-RMD160 d78b3476de10c0b3134cae73a094d5a97d35a048 files/digest-twinkle-0.3.2 65
-SHA256 2eb1c8e87a64a4cf5210088dba6202efcbf989c8d6dbe37189fd8fad9f8f2f13 files/digest-twinkle-0.3.2 65
-MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2-r1 65
-RMD160 d78b3476de10c0b3134cae73a094d5a97d35a048 files/digest-twinkle-0.3.2-r1 65
-SHA256 2eb1c8e87a64a4cf5210088dba6202efcbf989c8d6dbe37189fd8fad9f8f2f13 files/digest-twinkle-0.3.2-r1 65
-MD5 849a2819d504bbbdf7d3cb372179f8bd files/digest-twinkle-0.4.1 65
-RMD160 8a0789ff09ddcc11badc8fa04daf088f8a2e02ed files/digest-twinkle-0.4.1 65
-SHA256 09e7e664c151472f8d8c7e36970b8d1d78049925ecf5a72e4713deb4555f90c0 files/digest-twinkle-0.4.1 65
-MD5 2452597a6d327830aa3d6d13fff65a67 files/digest-twinkle-0.4.2 65
-RMD160 e13765d653263ee78128773f39b979026c9e4434 files/digest-twinkle-0.4.2 65
-SHA256 0aa2fd8658abb7c6c29a9d5c92270c386ae24647ef2bacb83ad1d22314581840 files/digest-twinkle-0.4.2 65
+MD5 0333f13ddd8399beedf26957cb5b4fc0 ChangeLog 1921
+RMD160 e80ea33ed5c6e9be250db79872b8cdaa0c332736 ChangeLog 1921
+SHA256 5d22915c8358e2e77d0a327b3e0615f434d4e4c83cdd9546cac992658b57cc86 ChangeLog 1921
 MD5 e5bcd508b5d591a0e470e4d51ff090ea files/digest-twinkle-0.5 63
 RMD160 343ed06071e0256583c695bbc05007675690aca8 files/digest-twinkle-0.5 63
 SHA256 e9849a9393301c0b7a6cae01f870bc08f29a7e6c7ea8bbc390338f970e75b535 files/digest-twinkle-0.5 63
-MD5 bd526be23363739d99a572793a4340fa files/twinkle-0.3.1-badcflags.patch 1850
-RMD160 37fd2cfe9620f0d940f5dda926f4dc35553528f6 files/twinkle-0.3.1-badcflags.patch 1850
-SHA256 530a8b246f59bc4cd5939e278399e897faef0b2a6769000d6d445e1df516a42c files/twinkle-0.3.1-badcflags.patch 1850
-MD5 e5260d884a6822201c94886d32c5154d files/twinkle-0.3.2-amd64.patch 503
-RMD160 90c8b9d850fb63d2d0b0e4e667857caf47557505 files/twinkle-0.3.2-amd64.patch 503
-SHA256 9e8df785168bf120f600abab49136e608f662e798341dfc0c6b626d300fd2e04 files/twinkle-0.3.2-amd64.patch 503
-MD5 9a6bdc1d520938fd26446b34f7414d06 files/twinkle-0.3.2-badcflags.patch 14878
-RMD160 f7c895eb5aef278335efc0bbe2a073ad1f16fa8b files/twinkle-0.3.2-badcflags.patch 14878
-SHA256 c3e24d50661449eac9a4ee68caad2b8df0e2bfa1d9609e1f7eb2d7d6039843fc files/twinkle-0.3.2-badcflags.patch 14878
+MD5 93b3444eafa21c71fd9751cb4f73674d files/digest-twinkle-0.6.1 241
+RMD160 070b23567c7aadd13b50b445e8b2e1a6ca998a00 files/digest-twinkle-0.6.1 241
+SHA256 a61257fc8c2f65543d5f1ec7d1587c94ad26e9e3af1e9b8243eb38f2b5e51042 files/digest-twinkle-0.6.1 241
 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
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 metadata.xml 458
 SHA256 9ee142b0e5854bae9e0365b52f6f0cf00a3b428c0c199ccce029108d03f42996 metadata.xml 458
-MD5 7abbf78091ee015b297347fb0b1c9d09 twinkle-0.3.1.ebuild 855
-RMD160 3eea0fff20bce988d146b25511e2b3b562a15c9a twinkle-0.3.1.ebuild 855
-SHA256 4f23b2edd73400c8264bed05dda3360764c28fa452b065ecfd80c390d5adfcef twinkle-0.3.1.ebuild 855
-MD5 e2a484f7eed40b4feb94cac24975e8a3 twinkle-0.3.2-r1.ebuild 1031
-RMD160 53ad10102883055d7c0e00d37ea86bd1420d4a30 twinkle-0.3.2-r1.ebuild 1031
-SHA256 317e6234a4bfb1203b24d04a839ddaf0781bef4e3cd775f39c564ca154816177 twinkle-0.3.2-r1.ebuild 1031
-MD5 6927584c0ecd78f39a77a33016dc3df8 twinkle-0.3.2.ebuild 892
-RMD160 12dbc6e4186fc2e882fe3f58004826b89d223a81 twinkle-0.3.2.ebuild 892
-SHA256 e48e45295335d20dfe451f1006b9e8e7bfa5b8980e08d7aed97fc8dbb63a4071 twinkle-0.3.2.ebuild 892
-MD5 10128ef335cfe934c39355c200ec03b7 twinkle-0.4.1.ebuild 995
-RMD160 286e105fcfa8978833691cd07f1a4232d5b5ab65 twinkle-0.4.1.ebuild 995
-SHA256 163aea6f378f2c3963b451bfaf4e1af772873d3dbb2d9266a21b79f5cbb1afed twinkle-0.4.1.ebuild 995
-MD5 297ea0290e47908e78db0014f149a7fa twinkle-0.4.2.ebuild 1002
-RMD160 9880e2f66387c062eda6750f938cb2d527b87f24 twinkle-0.4.2.ebuild 1002
-SHA256 140adcee61eef8037c7f3c69819fd13db6b1eb7373bba741f4aded1d203ed81b twinkle-0.4.2.ebuild 1002
 MD5 8a36bf119ad6f3118041917b2f4b58c5 twinkle-0.5.ebuild 984
 RMD160 a972bc10132a50d3286f91d22df270945aca8b49 twinkle-0.5.ebuild 984
 SHA256 78075b799ee4215b29f6db0d8ea51eedb109128db04d3fb60a60598b66a9cb03 twinkle-0.5.ebuild 984
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5CX62+ySkm8kpY0RAneNAJ0fcrEAkKeIRwl5U+/cWprJ5T/yfQCdFXzA
-ENUF6ekWFZpkb/BPhcZkhzk=
-=ln67
------END PGP SIGNATURE-----
+MD5 8a36bf119ad6f3118041917b2f4b58c5 twinkle-0.6.1.ebuild 984
+RMD160 a972bc10132a50d3286f91d22df270945aca8b49 twinkle-0.6.1.ebuild 984
+SHA256 78075b799ee4215b29f6db0d8ea51eedb109128db04d3fb60a60598b66a9cb03 twinkle-0.6.1.ebuild 984
diff --git a/net-im/twinkle/files/digest-twinkle-0.3.1 b/net-im/twinkle/files/digest-twinkle-0.3.1
deleted file mode 100644
index 39e176699b73..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bb5c88624074cf65138fe5be33ec5a5 twinkle-0.3.1.tar.gz 643877
diff --git a/net-im/twinkle/files/digest-twinkle-0.3.2 b/net-im/twinkle/files/digest-twinkle-0.3.2
deleted file mode 100644
index d899566ea8ae..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c4490880a150c28aeba2c38e3403a7a twinkle-0.3.2.tar.gz 723589
diff --git a/net-im/twinkle/files/digest-twinkle-0.3.2-r1 b/net-im/twinkle/files/digest-twinkle-0.3.2-r1
deleted file mode 100644
index d899566ea8ae..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c4490880a150c28aeba2c38e3403a7a twinkle-0.3.2.tar.gz 723589
diff --git a/net-im/twinkle/files/digest-twinkle-0.4.1 b/net-im/twinkle/files/digest-twinkle-0.4.1
deleted file mode 100644
index 94ffc7d866ef..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a9b2a23d388300f86da04ee7b23aed3 twinkle-0.4.1.tar.gz 778476
diff --git a/net-im/twinkle/files/digest-twinkle-0.4.2 b/net-im/twinkle/files/digest-twinkle-0.4.2
deleted file mode 100644
index 9babe3a62353..000000000000
--- a/net-im/twinkle/files/digest-twinkle-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cffa1f6a477d1342561ce6be8ea58302 twinkle-0.4.2.tar.gz 798159
diff --git a/net-im/twinkle/files/digest-twinkle-0.6.1 b/net-im/twinkle/files/digest-twinkle-0.6.1
new file mode 100644
index 000000000000..58044d5fb4f3
--- /dev/null
+++ b/net-im/twinkle/files/digest-twinkle-0.6.1
@@ -0,0 +1,3 @@
+MD5 10f234f73511b7593fea02a4d761205f twinkle-0.6.1.tar.gz 871645
+RMD160 aac921dfc4de9691787b80823c6ba1f288c9e39d twinkle-0.6.1.tar.gz 871645
+SHA256 8e0db6a0c067afb3562c21fe887956c66c8fc051eff337f0fa521fbdca7785c9 twinkle-0.6.1.tar.gz 871645
diff --git a/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch b/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch
deleted file mode 100644
index d2104b85bb62..000000000000
--- a/net-im/twinkle/files/twinkle-0.3.1-badcflags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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/files/twinkle-0.3.2-amd64.patch b/net-im/twinkle/files/twinkle-0.3.2-amd64.patch
deleted file mode 100644
index 673e0d8934a0..000000000000
--- a/net-im/twinkle/files/twinkle-0.3.2-amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: twinkle-0.3.1/src/events.cpp
-===================================================================
---- twinkle-0.3.1.orig/src/events.cpp
-+++ twinkle-0.3.1/src/events.cpp
-@@ -325,7 +325,7 @@ t_event_queue::~t_event_queue() {
- 		log_file->write_raw("Type: ");
- 		log_file->write_raw(event_type2str(e->get_type()));
- 		log_file->write_raw(", Pointer: ");
--		log_file->write_raw(int2str(int(e), "0x%x"));
-+		log_file->write_raw(ptr2str(e));
- 		log_file->write_endl();
- 		MEMMAN_DELETE(e);
- 		delete e;
diff --git a/net-im/twinkle/files/twinkle-0.3.2-badcflags.patch b/net-im/twinkle/files/twinkle-0.3.2-badcflags.patch
deleted file mode 100644
index bfcf613b3e2c..000000000000
--- a/net-im/twinkle/files/twinkle-0.3.2-badcflags.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/Makefile.in twinkle-0.3.2/Makefile.in
---- twinkle-0.3.2.orig/Makefile.in	2005-10-22 22:09:43.000000000 +1000
-+++ twinkle-0.3.2/Makefile.in	2005-11-07 21:32:48.000000000 +1100
-@@ -223,6 +223,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/aclocal.m4 twinkle-0.3.2/aclocal.m4
---- twinkle-0.3.2.orig/aclocal.m4	2005-10-22 22:09:29.000000000 +1000
-+++ twinkle-0.3.2/aclocal.m4	2005-11-07 21:32:38.000000000 +1100
-@@ -239,63 +239,120 @@
- dnl #undef HAVE_FOX_FX_H
- dnl END ACCONFIG
- 
-+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-+# 
-+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
- 
--dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
--dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
--dnl also defines GSTUFF_PKG_ERRORS on error
--AC_DEFUN([PKG_CHECK_MODULES], [
--  succeeded=no
--
--  if test -z "$PKG_CONFIG"; then
--    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--  fi
--
--  if test "$PKG_CONFIG" = "no" ; then
--     echo "*** The pkg-config script could not be found. Make sure it is"
--     echo "*** in your path, or set the PKG_CONFIG environment variable"
--     echo "*** to the full path to pkg-config."
--     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
--  else
--     PKG_CONFIG_MIN_VERSION=0.9.0
--     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        AC_MSG_CHECKING(for $2)
--
--        if $PKG_CONFIG --exists "$2" ; then
--            AC_MSG_RESULT(yes)
--            succeeded=yes
--
--            AC_MSG_CHECKING($1_CFLAGS)
--            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
--            AC_MSG_RESULT($$1_CFLAGS)
--
--            AC_MSG_CHECKING($1_LIBS)
--            $1_LIBS=`$PKG_CONFIG --libs "$2"`
--            AC_MSG_RESULT($$1_LIBS)
--        else
--            $1_CFLAGS=""
--            $1_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but 
--            ## do set a variable so people can do so.
--            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
--            ifelse([$4], ,echo $$1_PKG_ERRORS,)
--        fi
--
--        AC_SUBST($1_CFLAGS)
--        AC_SUBST($1_LIBS)
--     else
--        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
--        echo "*** See http://www.freedesktop.org/software/pkgconfig"
--     fi
--  fi
--
--  if test $succeeded = yes; then
--     ifelse([$3], , :, [$3])
--  else
--     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
--  fi
--])
--
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
-+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		AC_MSG_RESULT([yes])
-+	else
-+		AC_MSG_RESULT([no])
-+		PKG_CONFIG=""
-+	fi
-+		
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
-+
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
-+	pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
-+elif test -n "$PKG_CONFIG"; then
-+	if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
-+		pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+	else
-+		pkg_failed=yes
-+	fi
-+else
-+	pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
-+
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
-+	[_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
-+AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
-+	[_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
-+
-+if test $pkg_failed = yes; then
-+	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
-+
-+	ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met.
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-+to avoid the need to call pkg-config.  See the pkg-config man page for
-+more details.])],
-+		[$4])
-+elif test $pkg_failed = untried; then
-+	ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old.  Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-+to avoid the need to call pkg-config.  See the pkg-config man page for
-+more details.
- 
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-+		[$4])
-+else
-+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+	ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
- 
- # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
- #
-@@ -314,7 +371,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-Only in twinkle-0.3.2: autom4te.cache
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/Makefile.in twinkle-0.3.2/src/Makefile.in
---- twinkle-0.3.2.orig/src/Makefile.in	2005-10-22 22:09:40.000000000 +1000
-+++ twinkle-0.3.2/src/Makefile.in	2005-11-07 21:32:45.000000000 +1100
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libtwinkle_a_SOURCES) $(twinkle_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -241,6 +239,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audio/Makefile.in twinkle-0.3.2/src/audio/Makefile.in
---- twinkle-0.3.2.orig/src/audio/Makefile.in	2005-10-22 22:09:41.000000000 +1000
-+++ twinkle-0.3.2/src/audio/Makefile.in	2005-11-07 21:32:45.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libaudio_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -222,6 +220,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audio/gsm/Makefile.in twinkle-0.3.2/src/audio/gsm/Makefile.in
---- twinkle-0.3.2.orig/src/audio/gsm/Makefile.in	2005-10-22 22:09:41.000000000 +1000
-+++ twinkle-0.3.2/src/audio/gsm/Makefile.in	2005-11-07 21:32:46.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libgsm_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -217,6 +215,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/audits/Makefile.in twinkle-0.3.2/src/audits/Makefile.in
---- twinkle-0.3.2.orig/src/audits/Makefile.in	2005-10-22 22:09:41.000000000 +1000
-+++ twinkle-0.3.2/src/audits/Makefile.in	2005-11-07 21:32:46.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libaudits_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -210,6 +208,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/parser/Makefile.am twinkle-0.3.2/src/parser/Makefile.am
---- twinkle-0.3.2.orig/src/parser/Makefile.am	2005-10-21 04:15:07.000000000 +1000
-+++ twinkle-0.3.2/src/parser/Makefile.am	2005-11-07 21:31:36.000000000 +1100
-@@ -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
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/parser/Makefile.in twinkle-0.3.2/src/parser/Makefile.in
---- twinkle-0.3.2.orig/src/parser/Makefile.in	2005-10-22 22:09:41.000000000 +1000
-+++ twinkle-0.3.2/src/parser/Makefile.in	2005-11-07 21:32:47.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libsipparser_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -124,11 +122,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@
- DCOPIDL = @DCOPIDL@
- DCOPIDL2CPP = @DCOPIDL2CPP@
-@@ -246,6 +240,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -316,6 +311,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
- 
-Only in twinkle-0.3.2/src/parser: Makefile.in.orig
-Only in twinkle-0.3.2/src/parser: Makefile.in.rej
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/sdp/Makefile.in twinkle-0.3.2/src/sdp/Makefile.in
---- twinkle-0.3.2.orig/src/sdp/Makefile.in	2005-10-22 22:09:42.000000000 +1000
-+++ twinkle-0.3.2/src/sdp/Makefile.in	2005-11-07 21:32:47.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libsdpparser_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -214,6 +212,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/sockets/Makefile.in twinkle-0.3.2/src/sockets/Makefile.in
---- twinkle-0.3.2.orig/src/sockets/Makefile.in	2005-10-22 22:09:42.000000000 +1000
-+++ twinkle-0.3.2/src/sockets/Makefile.in	2005-11-07 21:32:47.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libsocket_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -211,6 +209,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/stun/Makefile.in twinkle-0.3.2/src/stun/Makefile.in
---- twinkle-0.3.2.orig/src/stun/Makefile.in	2005-10-22 22:09:42.000000000 +1000
-+++ twinkle-0.3.2/src/stun/Makefile.in	2005-11-07 21:32:48.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libstun_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -211,6 +209,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-diff -ru --ignore-matching-lines='^#' twinkle-0.3.2.orig/src/threads/Makefile.in twinkle-0.3.2/src/threads/Makefile.in
---- twinkle-0.3.2.orig/src/threads/Makefile.in	2005-10-22 22:09:42.000000000 +1000
-+++ twinkle-0.3.2/src/threads/Makefile.in	2005-11-07 21:32:48.000000000 +1100
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libthread_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -211,6 +209,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@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
diff --git a/net-im/twinkle/twinkle-0.3.1.ebuild b/net-im/twinkle/twinkle-0.3.1.ebuild
deleted file mode 100644
index af8e89e01847..000000000000
--- a/net-im/twinkle/twinkle-0.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-}
diff --git a/net-im/twinkle/twinkle-0.3.2-r1.ebuild b/net-im/twinkle/twinkle-0.3.2-r1.ebuild
deleted file mode 100644
index 2ab5f761dbad..000000000000
--- a/net-im/twinkle/twinkle-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.2-r1.ebuild,v 1.1 2005/11/13 11:22:21 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="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
-	arts? ( kde-base/arts )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/net-im/twinkle/twinkle-0.3.2.ebuild b/net-im/twinkle/twinkle-0.3.2.ebuild
deleted file mode 100644
index a2313cf05fb7..000000000000
--- a/net-im/twinkle/twinkle-0.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.2.ebuild,v 1.1 2005/11/07 10:54:11 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
-	epatch ${FILESDIR}/${P}-amd64.patch
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/net-im/twinkle/twinkle-0.4.1.ebuild b/net-im/twinkle/twinkle-0.4.1.ebuild
deleted file mode 100644
index 44243f377a83..000000000000
--- a/net-im/twinkle/twinkle-0.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.4.1.ebuild,v 1.1 2005/11/20 09:45:48 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="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
-	arts? ( kde-base/arts )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-badcflags.patch
-}
-
-src_compile() {
-	econf $(use_with arts) || die 'Error: conf failed'
-	emake -j1 || die "Error: emake failed!"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS NEWS README THANKS
-}
diff --git a/net-im/twinkle/twinkle-0.4.2.ebuild b/net-im/twinkle/twinkle-0.6.1.ebuild
index f8ed25ff1ce0..5e3a230472c3 100644
--- a/net-im/twinkle/twinkle-0.4.2.ebuild
+++ b/net-im/twinkle/twinkle-0.6.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.4.2.ebuild,v 1.1 2005/11/29 09:47:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.6.1.ebuild,v 1.1 2006/02/12 10:45:28 dragonheart Exp $
 
 inherit eutils qt3
 
-DESCRIPTION="Twinkle is a soft phone for your VOIP communcations using SIP."
+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="~x86"