diff options
author | Michael Januszewski <spock@gentoo.org> | 2008-12-11 15:36:30 +0000 |
---|---|---|
committer | Michael Januszewski <spock@gentoo.org> | 2008-12-11 15:36:30 +0000 |
commit | b0418b772876b614c5440326456779ef20163050 (patch) | |
tree | 9d14943f0ee6ec9154fc1e3476b114e93df5db7d /net-im/ekg | |
parent | Fix bug #248009. Apparently eautoreconf fixes the problems with --as-needed. (diff) | |
download | gentoo-2-b0418b772876b614c5440326456779ef20163050.tar.gz gentoo-2-b0418b772876b614c5440326456779ef20163050.tar.bz2 gentoo-2-b0418b772876b614c5440326456779ef20163050.zip |
Add a fix for bug #247993.
(Portage version: 2.1.6/cvs/Linux 2.6.27 x86_64)
Diffstat (limited to 'net-im/ekg')
-rw-r--r-- | net-im/ekg/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/ekg/ekg-1.8_rc1.ebuild | 6 | ||||
-rw-r--r-- | net-im/ekg/files/ekg-1.8_rc1-as-needed.patch | 107 |
3 files changed, 116 insertions, 3 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/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 |