Add a fix for bug #247993.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27 x86_64

4 files changed, 122 insertions, 8 deletions

diff --git a/net-im/ekg/ChangeLog b/net-im/ekg/ChangeLog
index 01a4d34db10d..a530b0719d3b 100644
--- a/net-im/ekg/ChangeLog
+++ b/net-im/ekg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ekg
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.41 2008/09/13 20:39:00 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.42 2008/12/11 15:36:30 spock Exp $
+
+  11 Dec 2008; Michał Januszewski <spock@gentoo.org>
+  +files/ekg-1.8_rc1-as-needed.patch, ekg-1.8_rc1.ebuild:
+  Add a fix for bug #247993.
 
 *ekg-1.8_rc1 (13 Sep 2008)
 
diff --git a/net-im/ekg/Manifest b/net-im/ekg/Manifest
index c2f431da7a5d..07649c470f76 100644
--- a/net-im/ekg/Manifest
+++ b/net-im/ekg/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 AUX ekg-1.6_rc3-libgadu.patch 833 RMD160 eb8bce6b255812dbb06d462d0ca6e8bab3522b1b SHA1 b10dcafd6af358d6f5d031cc755b3eb381cc457b SHA256 9bd6f9bf03ca1586a12c7324289950c7b0a5cf16573de48f8962682e12070e6a
 AUX ekg-1.7_rc2-giflib.patch 1281 RMD160 42e24852c2eda1253f17dc9cac16e9abb65b886b SHA1 58ac8b1253117b222cf6fdaa7d3590a3c736fd6a SHA256 eae41ce33f20ad2fe444d09bd0c331172369cf8ac93fb36422aa7bf1ca59dd46
+AUX ekg-1.8_rc1-as-needed.patch 3314 RMD160 3ee5716482db2626595df8b6de4b453332d5f7cc SHA1 4c4d763dfb8e44c52ac29dd022b538e7a2753974 SHA256 a3a239cc084c4c88861ca23a0004848ab791463cb6627046896f9cf7856371d2
 AUX ekg-1.8_rc1-gtkutil-button-decl.patch 478 RMD160 a7a0bedd25f98e2d77170b83e3a59a1a698ea669 SHA1 aa446728dc9fc547cf1ff799e6de901f948b985d SHA256 46659665c808d90f0c9018841a62ca7908cd00895e6cbc21780dccbdd0c40cb0
 DIST ekg-1.7.tar.gz 530314 RMD160 1832b34e5d8081fd8b04c85cd87be8cc07908b05 SHA1 3b02d2e9fff440783a202f343bda62dc6ad24815 SHA256 5fc42c8521c0e178f1b48d0b96578cbb5759202c6025ef9126c34af607897a2a
 DIST ekg-1.8rc1.tar.gz 525335 RMD160 0dc8f2778c750fed75f7fd3f7af685ae43d4d205 SHA1 d62cb5397384b6dddc2bdf69c4025e49afc46e40 SHA256 33156cecd12116914016a284051cc8e0b595d6e637c0b598efaaf821fd4c317f
 EBUILD ekg-1.7.ebuild 1681 RMD160 fac4bee167952a1dd489de7d9fc732de3ff35661 SHA1 6beed87fabd392701ef736ad1b9111cf5a562d82 SHA256 ba1cc6fc7e050c0699db032f71149f4e0cf0d47629526634ca1614f9986124f5
-EBUILD ekg-1.8_rc1.ebuild 1710 RMD160 2c0feb4998644fac339513ef25a46d1ab52fc538 SHA1 5e42dcb9938bba33620c90073ccf082b11372689 SHA256 3b32a5c5fc3849afc5ee04e36ba3992ea1df283fa3e4e1b4f413db729af4d085
-MISC ChangeLog 5948 RMD160 a4f1695df8a47b1d2f45af1e021150b0843625ca SHA1 941c1c27b059215758e651f36cbfa79d52c965d6 SHA256 006721033c1610bbe6663066baf3d0e3dea8051ddc8c900d120023e962e289fe
+EBUILD ekg-1.8_rc1.ebuild 1776 RMD160 87b56ea9eed310fbed4bd712c3dff9270f336290 SHA1 f99781dcc251c93adfe11d64005adbb4f02d54e1 SHA256 ec4a1b01409b5037bb13d8292ed33229b05eacf477eaa4dc66676684ff39ba1a
+MISC ChangeLog 6090 RMD160 48cb9d872ed4810a1e3e0dfe9e9087c93ca41580 SHA1 8521b644098f79033a2f2065a62318398dc46ee1 SHA256 e85810d6483740f2910ec44bc61a9d7cc5e7b96ab5bd48654756d7d690aaf912
 MISC metadata.xml 252 RMD160 37333b41f65c0bb86b1e85296f5a38390ce16391 SHA1 703b268bdc76b083b71adc51ad11c15f96c86068 SHA256 af0e23920b67dbfbd701796b98ee6a0d538d6a4f0e7957e39abc25d2047932a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjMJL8ACgkQchej4aZK9/eevgCdG8fbt1lcfTOMZrtY2purLgqM
-HdMAnj6rOiRzw3XlC7jdrCzaXxppqt9L
-=+vBu
+iEYEARECAAYFAklBM3UACgkQchej4aZK9/e4uwCfY3zeozEI1Jw5RT3usis1NWXh
+nGQAn3bz79IXoeB+Zx0ScqIT26DXynva
+=k91d
 -----END PGP SIGNATURE-----
diff --git a/net-im/ekg/ekg-1.8_rc1.ebuild b/net-im/ekg/ekg-1.8_rc1.ebuild
index 36f54d02c1f6..7bff114339ce 100644
--- a/net-im/ekg/ekg-1.8_rc1.ebuild
+++ b/net-im/ekg/ekg-1.8_rc1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.8_rc1.ebuild,v 1.1 2008/09/13 20:39:00 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.8_rc1.ebuild,v 1.2 2008/12/11 15:36:30 spock Exp $
 
-inherit eutils
+inherit autotools eutils
 
 IUSE="gif gtk jpeg ncurses python readline spell ssl threads zlib"
 
@@ -35,6 +35,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gtkutil-button-decl.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/net-im/ekg/files/ekg-1.8_rc1-as-needed.patch b/net-im/ekg/files/ekg-1.8_rc1-as-needed.patch
new file mode 100644
index 000000000000..a97cb99395e2
--- /dev/null
+++ b/net-im/ekg/files/ekg-1.8_rc1-as-needed.patch
@@ -0,0 +1,107 @@
+diff -Naurp ekg-1.8rc1-orig/configure.in ekg-1.8rc1/configure.in
+--- ekg-1.8rc1-orig/configure.in	2008-12-11 16:11:33.000000000 +0100
++++ ekg-1.8rc1/configure.in	2008-12-11 16:21:32.000000000 +0100
+@@ -115,7 +115,7 @@ AC_ARG_ENABLE(openssl,
+ 
+ if test "x$have_openssl" = "xyes"; then
+ 	OBJS="$OBJS simlite.o"
+-	LDFLAGS="$OPENSSL_LIBS $LDFLAGS"
++	LIBS="$LIBS $OPENSSL_LIBS"
+ 	CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
+ fi
+ 
+@@ -209,7 +209,7 @@ if test "x$enable_ui_ncurses" != "xno"; 
+ 		AC_MSG_ERROR([You need ncurses and ncurses-devel packages.])
+ 	fi
+ 
+-	LDFLAGS="$LDFLAGS $CURSES_LIBS"
++	LIBS="$LIBS $CURSES_LIBS"
+ 	CFLAGS="$CFLAGS $CURSES_INCLUDES"
+ 	echo "CURSES_INCLUDES=$CURSES_INCLUDES"
+ fi
+@@ -220,7 +220,7 @@ if test "x$enable_ui_gtk" != "xno"; then
+ 		AC_DEFINE(WITH_UI_GTK, 1, [define if you want ui-gtk])
+ 		OBJS="$OBJS ui-gtk.o ui-gtk-maingui.o ui-gtk-xtext.o ui-gtk-chanview.o ui-gtk-palette.o ui-gtk-bindings.o"
+ 
+-		LDFLAGS="$LDFLAGS $GTK_LIBS"
++		LIBS="$LIBS $GTK_LIBS"
+ 		CFLAGS="$CFLAGS $GTK_CFLAGS"
+ 	fi
+ fi
+@@ -233,11 +233,11 @@ if test "x$enable_ui_readline" = "xyes";
+ 		TERMCAP_LIB=""
+ 	else
+ 		AC_CHECK_LIB(termcap, tgetent, [TERMCAP_LIB="-ltermcap"])
+-		LDFLAGS="$LDFLAGS $TERMCAP_LIB"
++		LIBS="$LIBS $TERMCAP_LIB"
+ 	fi
+ 		if test "x$TERMCAP_LIB" = "x" -a "x$CURSES_LIBS" = "x"; then
+ 		AC_CHECK_NCURSES
+-		LDFLAGS="$LDFLAGS $CURSES_LIBS"
++		LIBS="$LIBS $CURSES_LIBS"
+ 		CFLAGS="$CFLAGS $CURSES_INCLUDES"
+ 	fi
+      
+@@ -247,7 +247,7 @@ if test "x$enable_ui_readline" = "xyes";
+ 		AC_MSG_ERROR([You need both readline and readline-devel packages.])
+ 	fi
+ 
+-	LDFLAGS="$READLINE_LIBS $LDFLAGS"
++	LIBS="$LIBS $READLINE_LIBS"
+ 	CFLAGS="$CFLAGS $READLINE_INCLUDES"
+ 
+ 	AC_CHECK_FUNCS([rl_set_prompt rl_filename_completion_function rl_get_screen_size rl_set_key rl_bind_key_in_map])
+@@ -279,7 +279,7 @@ if test "x$with_libgsm" != "xno"; then
+ 		AC_CHECK_HEADERS(linux/soundcard.h,
+ 		[
+ 			AC_DEFINE(HAVE_VOIP, 1, [define if you want VOIP support])
+-			LDFLAGS="-lgsm $LDFLAGS"
++			LIBS="$LIBS -lgsm"
+ 			OBJS="$OBJS voice.o"
+ 		])
+ 	fi
+@@ -298,7 +298,7 @@ if test "x$with_libungif" != "xno"; then
+ 		AC_CHECK_HEADERS(gif_lib.h,
+ 		[
+ 			AC_DEFINE(HAVE_LIBUNGIF, 1, [define if you have libungif])
+-			LDFLAGS="-lungif $LDFLAGS"
++			LIBS="$LIBS -lungif"
+ 			have_libungif=yes
+ 		])
+ 	])
+@@ -317,7 +317,7 @@ if test "x$with_libjpeg" != "xno"; then
+ 		AC_CHECK_HEADERS(jpeglib.h,
+ 		[
+ 			AC_DEFINE(HAVE_LIBJPEG, 1, [define if you have libjpeg])
+-			LDFLAGS="-ljpeg $LDFLAGS"
++			LIBS="$LIBS -ljpeg"
+ 			have_libjpeg=yes
+ 		])
+ 	])
+@@ -331,7 +331,7 @@ AC_CHECK_PYTHON
+   
+ if test "x$have_python" = "xyes"; then
+ 	OBJS="$OBJS python.o"
+-	LDFLAGS="$PYTHON_LIBS $LDFLAGS"
++	LIBS="$LIBS $PYTHON_LIBS"
+ 	CFLAGS="$CFLAGS $PYTHON_INCLUDES"
+ fi
+ 
+@@ -348,7 +348,7 @@ if test "x$with_zlib" != "xno"; then
+ 		AC_CHECK_HEADERS(zlib.h,
+ 		[
+ 			AC_DEFINE(HAVE_ZLIB, 1, [define if you want compressed logs])
+-			LDFLAGS="-lz $LDFLAGS"
++			LIBS="$LIBS -lz"
+ 			have_zlib=yes
+ 		])
+ 	])
+@@ -392,7 +392,7 @@ AC_ARG_ENABLE(aspell,
+  	    if test "x$have_aspell_libs" = "xyes"; then
+ 		if test "x$ui_ncurses_default" = "xyes"; then    
+  		    AC_DEFINE(WITH_ASPELL, 1, [define if you want aspell support])
+- 		    LDFLAGS="$LDFLAGS -laspell"		
++ 		    LIBS="$LIBS -laspell"
+ 		fi
+ 	    else 
+ 	        enable_aspell=no