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".

(Portage version: 2.2_rc98_p5/cvs/Linux x86_64)

3 files changed, 53 insertions, 8 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/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
+