version bump. attempting to support --without-kde. Any probs let me know

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64

5 files changed, 27 insertions, 18 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index fdb4470dda02..c8531429c25a 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.42 2008/08/22 23:41:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.43 2008/08/24 03:57:46 dragonheart Exp $
+
+*twinkle-1.3.1 (24 Aug 2008)
+
+  24 Aug 2008; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-1.3-gcc4.3.patch, +files/twinkle-1.3.1-withoutkde.patch,
+  -twinkle-1.3.ebuild, +twinkle-1.3.1.ebuild:
+  version bump. attempting to support --without-kde. Any probs let me know
 
 *twinkle-1.3 (22 Aug 2008)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 6d7d8da52c53..13c824b23651 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,14 +1,14 @@
 AUX twinkle-0.4.1-badcflags.patch 492 RMD160 136c6387c0053d0457e4be766a8bfdbaeaccc5b1 SHA1 12ec8f94c73dd25fb82ed2c556ad72a8f5a394e8 SHA256 7bcb91795fa0e9c0db4dc174151ed9b3850eeca132844330d65d8429949296d9
 AUX twinkle-1.0.1-icmp.patch 569 RMD160 c3d56c9f2221a9ed29e99b7bde9df104a6094dca SHA1 6f5ecbb700af176251c054320e2b5f878b8347e0 SHA256 f1995018874fad61d1b7a49d0c90cf9ad29e150c4947ae5c90e398e169f91cfc
 AUX twinkle-1.2-zrtp.patch 3836 RMD160 c099b5a3c3b0e037734ca3af258e21e07650dcbe SHA1 7d116ed43c37832b681f7d7cde9b924422b944bd SHA256 7db8565ec86bea58feeaedb2854e1c6fdb5eea9944697f300bdac1e7db755662
-AUX twinkle-1.3-gcc4.3.patch 305 RMD160 b8b4bbd97cc1659bced6e758b61b01e72da46e6f SHA1 c7028292feaef46363e1a35f97656b42c4d62fb6 SHA256 27c597eaa1159fb93dc56c39f1ddcdaf441a1aae116aea4d6ceb5ccd4c1f9bc2
+AUX twinkle-1.3.1-withoutkde.patch 401 RMD160 8bb54a4017be0a168ebcc964d6f2803bc498f591 SHA1 2e1afa7ba0457b7d4968f4ee9b689cd6a7269996 SHA256 9206e92ef9da362993275fe0db50e9eed87ebcc11fb2eba719d85bde36a1ab27
 AUX twinkle.desktop.patch 250 RMD160 788925b507d7fcfb8456bbef6dade0e9dae31c7e SHA1 510f834035f698f805514ea1bde0f5703d1736f7 SHA256 c384de5a69863d6dddbfc8f4376fb2e7ac6fa18acc3ba55676d02ef69f90f600
 DIST twinkle-1.0.1.tar.gz 1256457 RMD160 094aa44f014427ff919831e4fa02976736390a8d SHA1 d8894d803e2cc08e181cd71001a4f5e0fa9434ef SHA256 91beee47027d25c746acf92afd4cb3efbe906c005dbb929b496dd31b6b9d3b99
 DIST twinkle-1.2.tar.gz 1445224 RMD160 d4b21f46a6e40f4e796eb4d401b8de971c3dbbe2 SHA1 e54a9d451fb109fd66349e65028cba8c8372b165 SHA256 978a220eb5b40458d52fce8e0e7ab38fc6a81adb477a9d0673bdf77bcae1b4a3
-DIST twinkle-1.3.tar.gz 1502029 RMD160 61b4cc4c0b5982929de18aad07e84170775330c4 SHA1 994b455c2df7d5cb1a8776421c424de10e892c71 SHA256 a96faf96312186cf42a6a41fbf939a974287be04e671fd4eac816b28cfbbd513
+DIST twinkle-1.3.1.tar.gz 1505752 RMD160 69e90cd14a407c3b9986ca9a585697a8b43e9e3e SHA1 6b0c1f2bcd3fa04e873686d63e5387766152c79b SHA256 eba60ee98a0c8845234c76785aa451971aa1851bc98353b682a3afbdb5180f12
 EBUILD twinkle-1.0.1-r1.ebuild 1753 RMD160 da820bce962fc6b862a3fa059d7ee97a8a4cb7a3 SHA1 181c742cc6a27319f45821bb9b846b1edf0c7c9b SHA256 69146ff8234349b94ce01386dce4f677c8ac97963b34809bc6f5a19280406956
 EBUILD twinkle-1.2-r1.ebuild 1696 RMD160 cba01c86e9673c8e5243b43c4f4b0d08f70dc014 SHA1 64c01ad95ec1b00d240d795cda4f42d9d1eca2e4 SHA256 b6e0dcc98cae874da4446b2230b5542a86d697d50398dbc332fcf905cca4c7fe
 EBUILD twinkle-1.2.ebuild 1590 RMD160 6f25c90fb4f1ff489857aab0a98d432d682514cf SHA1 ea69d6e9a471b1f69caef90b5fd024cdcc1ebb4f SHA256 436da5d1cdac3d089ace2cd1b817d054714ac1980705a9d11e1deb0ee15e1528
-EBUILD twinkle-1.3.ebuild 1473 RMD160 08cc349964bdeab4f56ac43109bc2d331045efab SHA1 c9ed9fd46a2a7d4fc1fff0db4ec563538610fc86 SHA256 476d7507d7e61277a46f3d2a1dcdfc238de056e6388cadc27b412c2ad1b2128b
-MISC ChangeLog 7990 RMD160 8905073328326137021e843524f3f6b937711626 SHA1 e4e21fe148b1da9ef2fb6381a8521016243c82e4 SHA256 aa4487c08d644471dcf1986fd8a9f4da8bf87418a54115d84a1754f0e2af5975
+EBUILD twinkle-1.3.1.ebuild 1504 RMD160 887fa9780ead20052ee8b8b4d068f4fb70661caa SHA1 bd8f906e6cf60171cad4c712b6384c300b46ce31 SHA256 d4b368a244522d8113df7aefeb8813598a967199f59d65fe1cf4532655510a86
+MISC ChangeLog 8269 RMD160 e7599182bf95d5158981b43a178af6adc4e962ab SHA1 2de14d98cded2b3195205d11bf24cc4d7afd6fc3 SHA256 905f507524ce8c95aef47840edc2414376c72ca7e475c6bec93a7b9e43e80bb5
 MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6
diff --git a/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch b/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch
deleted file mode 100644
index 7859e85950fd..000000000000
--- a/net-im/twinkle/files/twinkle-1.3-gcc4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- twinkle-1.3/src/utils/file_utils.cpp.orig	2008-08-23 09:13:35.000000000 +1000
-+++ twinkle-1.3/src/utils/file_utils.cpp	2008-08-23 09:14:14.000000000 +1000
-@@ -24,6 +24,7 @@
- #include <vector>
- #include <cerrno>
- #include <unistd.h>
-+#include <stdlib.h>
- 
- using namespace std;
- using namespace utils;
diff --git a/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch b/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch
new file mode 100644
index 000000000000..5c74a98b1f6c
--- /dev/null
+++ b/net-im/twinkle/files/twinkle-1.3.1-withoutkde.patch
@@ -0,0 +1,11 @@
+--- twinkle-1.3.1/src/gui/twinkleapplication.h.orig	2008-08-24 13:44:29.000000000 +1000
++++ twinkle-1.3.1/src/gui/twinkleapplication.h	2008-08-24 13:44:42.000000000 +1000
+@@ -36,7 +36,7 @@
+ #ifdef HAVE_KDE
+ 	t_twinkle_application();
+ #else
+-	t_twinkle_application(int &argv, char **argv);
++	t_twinkle_application(int &argc, char **argv);
+ #endif
+ 	virtual void commitData ( QSessionManager &sm );
+ };
diff --git a/net-im/twinkle/twinkle-1.3.ebuild b/net-im/twinkle/twinkle-1.3.1.ebuild
index 4e7a7005a6a2..4b2121447bd4 100644
--- a/net-im/twinkle/twinkle-1.3.ebuild
+++ b/net-im/twinkle/twinkle-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.3.ebuild,v 1.1 2008/08/22 23:41:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.3.1.ebuild,v 1.1 2008/08/24 03:57:46 dragonheart Exp $
 
 EAPI=1
 ARTS_REQUIRED="never"
@@ -13,7 +13,7 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="arts speex ilbc zrtp kdehiddenvisibility"
+IUSE="kde arts speex ilbc zrtp kdehiddenvisibility"
 
 # Requires libqt-mt actually...  Is that *always* built, or do we need to check?
 RDEPEND=">=net-libs/ccrtp-1.6.0
@@ -39,11 +39,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	epatch "${FILESDIR}"/${P}-withoutkde.patch
 }
 
 src_compile() {
 	local myconf=" \
+			$(use_with kde) \
 			$(use_with ilbc) \
 			$(use_with arts) \
 			$(use_with zrtp) \