Removed USE=gtk as the GTK+ plugin is known not to work with any GTK+-2 version in gx86. Added a patch to fix building with USE="oss static".

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

4 files changed, 59 insertions, 13 deletions

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index 2c7ffe0b2b7c..570b80196938 100644
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.32 2010/10/08 18:18:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.33 2010/10/22 17:24:29 mgorny Exp $
+
+  22 Oct 2010; Michał Górny <mgorny@gentoo.org>
+  +files/0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch,
+  ekg2-0.3_pre20101008.ebuild:
+  Removed USE=gtk as the GTK+ plugin is known not to work with any GTK+-2
+  version in gx86. Added a patch to fix building with USE="oss static".
 
 *ekg2-0.3_pre20101008 (08 Oct 2010)
 
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index f186fabaf003..00e7a9aa90a6 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch 1155 RMD160 b2874efdfb3965dc7961f51d9cf498ea5b62f964 SHA1 9358908b9fcc20573b0d0edd8d0a5740665f71c9 SHA256 a3c596d740cbe82744b37373f7df9df7c95b81ae090aade60df8f5ecac70e272
 DIST ekg2-0.3_pre20101008.tar.bz2 915719 RMD160 828491ab3c3026cfa3a021ad5858fc0dc68e0b3d SHA1 0971d76185aa0e6f6f73c534d61103d39257ff9b SHA256 acf4a176e2a68c22f7092492812fb3f28ffaf2b81b1eff848e5032226734be2c
-EBUILD ekg2-0.3_pre20101008.ebuild 5860 RMD160 75f57ee93616f17aa980a706da68e41f7086c0b9 SHA1 4d1ede2e70d36e7dc82b394c77c1d14042709908 SHA256 e0e4317dc7173084a242044bd9f55182c632f80c564ad66abd0135850357940f
+EBUILD ekg2-0.3_pre20101008.ebuild 5890 RMD160 a430f9ab453c69ece48bde71c868057862959fc0 SHA1 9af75ff647cc831fddcc201ab81913413a1b15b0 SHA256 382974bfe807cf3bbf874f4bc998849de4d70a5586f40c7f4899ff20f95a86e6
 EBUILD ekg2-9999.ebuild 5845 RMD160 42037c33331663a691519a0dbe901b9833654bd1 SHA1 4c76319f0bb484dceba8cbd878e321095fa4555a SHA256 d06a801f390fc5b78b35df860045edca97e85add1a7dda525be1eeb91783e8b8
-MISC ChangeLog 579 RMD160 b714733f0cf27725de2e321ae7fae2c91285abe8 SHA1 ff69b829b2f7b3cc48d1f14598573136275f1ed1 SHA256 782a67e2d04c8d195ca9845c2cd680365b66d99642ea1d45f5e8bd94a9ece5a0
+MISC ChangeLog 881 RMD160 b8683fb7a5dba5be9081a8d3e92c7d456496fe3b SHA1 164c99d76df224e213bc26c8386f5ae223fd6901 SHA256 4f93fbd159c4bfbc48e7333bc0c87a517b1dcb8501262c9157a394bc0a400c72
 MISC metadata.xml 2502 RMD160 4ce3d9d0f6e73ac7642095537f8d8a7e5ebb594d SHA1 d0ceffd8497bd97671b39ba3ea47c894301b20d4 SHA256 9599f31b7d4d7878dce3565b1cc8c4a2b178ca4cb31926555204cedd2fb2edaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyvYG8ACgkQnGSe5QXeB7tZUQCeLluNDTUiESETGP9RADNwrfhM
-rVEAoKRvEMMBybUgyPveHRlcPz7r9zDr
-=0Ojd
+iEYEARECAAYFAkzByJsACgkQnGSe5QXeB7uLDQCgtjhzKy7/iDPYs8uZC38RSGjO
+7EQAoM7CzbxjJbC2+l2yauBjyIL9Gypu
+=DsaF
 -----END PGP SIGNATURE-----
diff --git a/net-im/ekg2/ekg2-0.3_pre20101008.ebuild b/net-im/ekg2/ekg2-0.3_pre20101008.ebuild
index f64cb1aaa125..8fddefcb48f4 100644
--- a/net-im/ekg2/ekg2-0.3_pre20101008.ebuild
+++ b/net-im/ekg2/ekg2-0.3_pre20101008.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3_pre20101008.ebuild,v 1.1 2010/10/08 18:18:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3_pre20101008.ebuild,v 1.2 2010/10/22 17:24:29 mgorny Exp $
 
 EAPI=2
 
-inherit multilib perl-module scons-utils toolchain-funcs
+inherit base multilib perl-module scons-utils toolchain-funcs
 
 DESCRIPTION="Text-based, multi-protocol instant messenger"
 HOMEPAGE="http://www.ekg2.org"
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/downloads/mgorny/${PN}-scons/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="dbus extra gadu gif gnutls gpg gpm gsm gtk icq idn inotify irc
+IUSE="dbus extra gadu gif gnutls gpg gpm gsm icq idn inotify irc
 	jabber jogger jpeg mail minimal ncurses nls nntp oracle oss pcap
 	perl python readline remote rss ruby sim sms spell
 	sqlite sqlite3 srv ssl static unicode web xosd zlib"
@@ -28,7 +28,6 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	gpg? ( app-crypt/gpgme )
 	gsm? ( media-sound/gsm )
-	gtk? ( x11-libs/gtk+:2 )
 	idn? ( net-dns/libidn )
 	nls? ( virtual/libintl )
 	oracle?	( dev-db/oracle-instantclient-basic )
@@ -59,11 +58,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch
+)
+
 pkg_setup() {
-	if ! use gtk && ! use ncurses && ! use readline && ! use remote && ! use web; then
+	if ! use ncurses && ! use readline && ! use remote && ! use web; then
 		ewarn 'ekg2 is being compiled without any frontend, you should consider'
 		ewarn 'enabling at least one of following USEflags:'
-		ewarn '  gtk, ncurses, readline, remote, web.'
+		ewarn '  ncurses, readline, remote, web.'
 	fi
 }
 
@@ -81,7 +84,6 @@ build_plugin_list() {
 	$(use_plug gadu gg) \
 	$(use_plug gpg) \
 	$(use_plug gsm) \
-	$(use_plug gtk) \
 	$(use_plug icq) \
 	$(use_plug irc) \
 	$(use_plug jabber jabber) \
diff --git a/net-im/ekg2/files/0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch b/net-im/ekg2/files/0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch
new file mode 100644
index 000000000000..d2183ea3b0cd
--- /dev/null
+++ b/net-im/ekg2/files/0001-Drop-duplicate-config_audio_device-declaration-it-wa.patch
@@ -0,0 +1,37 @@
+From e748db6357c9d6730a4a20c6783d3d0fe19ef133 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 22 Oct 2010 19:08:06 +0200
+Subject: [PATCH] Drop duplicate config_audio_device declaration, it was moved to the OSS plugin.
+
+---
+ trunk/ekg/stuff.c |    1 -
+ trunk/ekg/stuff.h |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/trunk/ekg/stuff.c b/trunk/ekg/stuff.c
+index f4be1bd..12f3490 100644
+--- a/trunk/ekg/stuff.c
++++ b/trunk/ekg/stuff.c
+@@ -170,7 +170,6 @@ int config_display_sent = 1;
+ int config_send_white_lines = 0;
+ int config_sort_windows = 1;
+ int config_keep_reason = 1;
+-char *config_audio_device = NULL;
+ char *config_speech_app = NULL;
+ int config_time_deviation = 300;
+ int config_mesg = MESG_DEFAULT;
+diff --git a/trunk/ekg/stuff.h b/trunk/ekg/stuff.h
+index 08680a9..45683a4 100644
+--- a/trunk/ekg/stuff.h
++++ b/trunk/ekg/stuff.h
+@@ -169,7 +169,6 @@ extern int no_mouse;
+ extern int old_stderr;
+ extern int mesg_startup;
+ 
+-extern char *config_audio_device;
+ extern char *config_away_reason;
+ extern int config_auto_save;
+ extern int config_auto_user_add;
+-- 
+1.7.3.2
+