Fix bug #278242.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 47 insertions, 10 deletions

diff --git a/net-im/tleenx2/ChangeLog b/net-im/tleenx2/ChangeLog
index 20c567ef7b1e..6824e766a3f4 100644
--- a/net-im/tleenx2/ChangeLog
+++ b/net-im/tleenx2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/tleenx2
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tleenx2/ChangeLog,v 1.15 2008/12/11 15:04:49 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/tleenx2/ChangeLog,v 1.16 2009/09/26 12:15:48 spock Exp $
+
+  26 Sep 2009; Michał Januszewski <spock@gentoo.org>
+  tleenx2-20060309.ebuild, +files/tleenx2-20060309-asneeded-fix.patch:
+  Fix bug #278242.
 
   11 Dec 2008; Michał Januszewski <spock@gentoo.org>
   +files/tleenx2-20060309-configure.in.patch, tleenx2-20060309.ebuild:
diff --git a/net-im/tleenx2/Manifest b/net-im/tleenx2/Manifest
index 5e1363c4eba7..35f5d10be947 100644
--- a/net-im/tleenx2/Manifest
+++ b/net-im/tleenx2/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tleenx2-20060309-asneeded-fix.patch 1333 RMD160 dce085e25271a572688413f380e6b950b6374cf7 SHA1 6ce59435de58fbf72c24c08c8c04e92e3226ebaf SHA256 88b240d018513a13cdd00aa004bed484c8dabb2d571fe8e5705eb898d63b89f4
 AUX tleenx2-20060309-configure.in.patch 541 RMD160 6f266193019479fcf78cb78f773f69051481dc2d SHA1 2febc6b7e539db25cd8078d6b1e0e69d2cdc409f SHA256 cdd906017d71c79fe5c7278146581ce5cd2edd0ead7537ce848af719001d4010
 DIST TleenX2-20041125.tar.gz 278539 RMD160 906b097bf05d4e1b8f485bd28fea5374288f54a4 SHA1 b5895302211b48deb86c2b9af28655bf1174bc14 SHA256 7e8562933ce0910f45c819b93b6a96bf98316fb395ab575a8806598ea42bba41
 DIST TleenX2-20060309.tar.gz 292236 RMD160 cc2982282bf9dfd480007d9fe3442c57a0defab7 SHA1 c595c0f6176cb56faf22953b40ab6792812c9488 SHA256 2c89ee4974a0f34561391b43c505c1a5e6f75dc8e102718d34789709733d507e
 EBUILD tleenx2-20041125.ebuild 671 RMD160 99358a17ecf35bfcc159ac746f4a05c0cf616ab6 SHA1 1267365821ce5d22b3e18d5ceedc47f61dd541fe SHA256 b04c2dfe9de64a276e338420d1329ae63bc19859c073b8a8a95a13e15b32dd91
-EBUILD tleenx2-20060309.ebuild 816 RMD160 ba557428f5633ee90629a6b1a419ce7ca1f6830a SHA1 a5a4f06946ec3541118845e9a387f433b061a1dc SHA256 f9f8ee276955145d53bb3e3abf86db98b9c6fb7f066540c1cfc7e906dfe1b558
-MISC ChangeLog 2045 RMD160 965cc3a2213babcecc8a83ff95d66652f1bfea99 SHA1 048f67ac455514ee742daf6cbee239acf9499d52 SHA256 92bd57bfa604a13a1de78c893c95e75c8c3cb4ea5af4ba389f0ef84cec20bb7e
+EBUILD tleenx2-20060309.ebuild 874 RMD160 a094ffa0b5e3441cacc4effb1007b3c94c4a8c7b SHA1 1aa3dadd9021dc900ebf0c96b171a15ec8ab3f04 SHA256 097b508c86bb6d227afc66986b8c92de0237f9b674ab6420d622cf60e9ceb503
+MISC ChangeLog 2190 RMD160 a63392df3ec5373f72b84e6efd2455aa8044386f SHA1 abf8ba36bff8e0ae3cdc475520dfd624ee5355fe SHA256 c552d52af4926ade3670567e23ea85b7d2ae70faff172df4c588ee9f2066bbc4
 MISC metadata.xml 263 RMD160 6de2551f82e78b7a77811ab7543dd5a8ec314753 SHA1 6cd4e2afd4c47a3b2c9afe45869ab26f3b14a0ad SHA256 723cd2e5b4d970bb0ee7418f4862323dd9c491c640728cc832bd78b98efde6a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklBLAYACgkQchej4aZK9/fdvQCfU+pzNVrHQR3OR/Qno7C+dWEP
-oR0An1SPovgM9XefylHQConcyAX+CF75
-=bqK+
+iEYEARECAAYFAkq+BgEACgkQchej4aZK9/cf+gCfdPzU9qV0ZgDr/Se4smAYi4FF
+BPIAniUny53SiLiM1DIF+632UgVz2CZZ
+=s3vk
 -----END PGP SIGNATURE-----
diff --git a/net-im/tleenx2/files/tleenx2-20060309-asneeded-fix.patch b/net-im/tleenx2/files/tleenx2-20060309-asneeded-fix.patch
new file mode 100644
index 000000000000..c9955571e767
--- /dev/null
+++ b/net-im/tleenx2/files/tleenx2-20060309-asneeded-fix.patch
@@ -0,0 +1,31 @@
+diff -Naurp TleenX2-20060309-orig/configure.in TleenX2-20060309/configure.in
+--- TleenX2-20060309-orig/configure.in	2009-09-26 13:42:22.000000000 +0200
++++ TleenX2-20060309/configure.in	2009-09-26 13:59:21.000000000 +0200
+@@ -35,7 +35,7 @@ else
+ fi
+ 
+ dnl We need at least 2.2 version of GTK+
+-PKG_CHECK_MODULES(PACKAGE, gtk+-2.0 >= 2.2, , 
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.2 gthread-2.0 >= 2.0], ,
+ AC_MSG_ERROR([$PACKAGE_PKG_ERRORS]
+ ----------------------------------------------------------------
+   At least version 2.2 of GTK+ is required to compile TleenX2.
+@@ -51,7 +51,6 @@ if test "$have_gtk_2_8" = yes ; then
+ 	AC_DEFINE([GTK_2_8], ,[do we have GTK+ >= 2.8?])
+ fi
+ 
+-
+ dnl Use -Wall if we have gcc.
+ changequote(,)dnl
+ if test "x$GCC" = "xyes"; then
+diff -Naurp TleenX2-20060309-orig/src/Makefile.am TleenX2-20060309/src/Makefile.am
+--- TleenX2-20060309-orig/src/Makefile.am	2009-09-26 13:42:22.000000000 +0200
++++ TleenX2-20060309/src/Makefile.am	2009-09-26 13:58:53.000000000 +0200
+@@ -30,6 +30,5 @@ tleenx2_SOURCES = \
+ 	xmms-info.c xmms-info.h \
+ 	notify.c
+ 
+-tleenx2_LDADD = @PACKAGE_LIBS@  ../jabby/libjabby.a ../iksemel/libiksemel.a
+-tleenx2_LDFLAGS = `pkg-config --libs gthread-2.0`
++tleenx2_LDADD = @PACKAGE_LIBS@ ../jabby/libjabby.a ../iksemel/libiksemel.a
+ tleenx2_CFLAGS = -I../jabby -I../iksemel -g
diff --git a/net-im/tleenx2/tleenx2-20060309.ebuild b/net-im/tleenx2/tleenx2-20060309.ebuild
index 76a9f4d7becc..e5e7a562979a 100644
--- a/net-im/tleenx2/tleenx2-20060309.ebuild
+++ b/net-im/tleenx2/tleenx2-20060309.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tleenx2/tleenx2-20060309.ebuild,v 1.5 2008/12/11 15:04:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tleenx2/tleenx2-20060309.ebuild,v 1.6 2009/09/26 12:15:48 spock Exp $
 
 inherit autotools eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/tleenx2-20060309-configure.in.patch"
+	epatch "${FILESDIR}/tleenx2-20060309-asneeded-fix.patch"
 	eautoreconf
 }