Respect LDFLAGS #333797. Drop invalid threads use flag. Remove unrecognized configure flags. Use libgif instead of libungif. Add missing prototypes.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

5 files changed, 149 insertions, 2 deletions

diff --git a/net-im/ekg/ChangeLog b/net-im/ekg/ChangeLog
index 90d84514eb77..798a1df61bfc 100644
--- a/net-im/ekg/ChangeLog
+++ b/net-im/ekg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/ekg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.46 2011/03/02 19:54:53 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.47 2011/03/21 17:04:44 signals Exp $
+
+*ekg-1.8_rc1-r1 (21 Mar 2011)
+
+  21 Mar 2011; Kevin McCarthy <signals@gentoo.org> +ekg-1.8_rc1-r1.ebuild,
+  +files/ekg-1.8_rc1-libgif.patch, +files/ekg-1.8_rc1-missing-prototypes.patch:
+  Respect LDFLAGS #333797. Drop invalid threads use flag. Remove unrecognized
+  configure flags. Use libgif instead of libungif. Add missing prototypes.
 
   02 Mar 2011; Kevin McCarthy <signals@gentoo.org> ekg-1.8_rc1.ebuild:
   Slotted gtk+ depend and EAPI=2 bump to support it.
diff --git a/net-im/ekg/Manifest b/net-im/ekg/Manifest
index cd29e11517f0..9d12ed65d4dd 100644
--- a/net-im/ekg/Manifest
+++ b/net-im/ekg/Manifest
@@ -3,9 +3,12 @@ AUX ekg-1.7_rc2-giflib.patch 1281 RMD160 42e24852c2eda1253f17dc9cac16e9abb65b886
 AUX ekg-1.8_rc1-as-needed.patch 3314 RMD160 3ee5716482db2626595df8b6de4b453332d5f7cc SHA1 4c4d763dfb8e44c52ac29dd022b538e7a2753974 SHA256 a3a239cc084c4c88861ca23a0004848ab791463cb6627046896f9cf7856371d2
 AUX ekg-1.8_rc1-gtk.patch 415 RMD160 2c7db5315b469abdacc0449c8ea77a1d09b60faf SHA1 d9dc6f568907f686fa17cf2626c2565236dbe900 SHA256 05ebfd72504e2b6ad8530374fc5cb0bd798cbe5f7b246a90422dfabc6e463c1a
 AUX ekg-1.8_rc1-gtkutil-button-decl.patch 478 RMD160 a7a0bedd25f98e2d77170b83e3a59a1a698ea669 SHA1 aa446728dc9fc547cf1ff799e6de901f948b985d SHA256 46659665c808d90f0c9018841a62ca7908cd00895e6cbc21780dccbdd0c40cb0
+AUX ekg-1.8_rc1-libgif.patch 1136 RMD160 0fb9eccd8460597faddff18d1cfcaffa0b661413 SHA1 32671b15fb64a51bff45c13363c4df6be9a4ccb6 SHA256 78b1d4a2e27ae0b423bceedd074cdb0ffa3cecba4c25f864e39db9ad67bdae43
+AUX ekg-1.8_rc1-missing-prototypes.patch 341 RMD160 5ffaa754253f8736def74fdb81e608824a9d2c4d SHA1 c5c108b568132a25d3ccd3ddc2d52cc4df145dcb SHA256 20032f832cc36034e46025e5bc41a6037cb63fab84ce2443f2f07392ac734bc8
 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 1677 RMD160 e40ff2eaa81e603b41e96477f4a125d8eede5277 SHA1 b7da612b73f32179d082725cd5d5d5f8dfb8dc3c SHA256 62b9df56d6667d87b74edd34bbed8739c08bc6192d5bd33b83ac3557a76d8614
+EBUILD ekg-1.8_rc1-r1.ebuild 1942 RMD160 8e9181dc9d2e7c812dfd6b190feb5aa9f11281ba SHA1 53010d29a0ebf1db6fc0a01a146bf191bfee8bf0 SHA256 f1c3e0bf2940ec2669d2ef84afa96e9e9faee548576bcb0f3850f74d4f0954fe
 EBUILD ekg-1.8_rc1.ebuild 1813 RMD160 2aaa6164701ca7d0489799764600f9de97e6b4cc SHA1 a836ae8f4d53028f8c98aea907c3259ffecc4154 SHA256 e98dd4a488ca6227022a1aa03cdc89ea0e6b1cfb0a2d58f58f049e6ca9672076
-MISC ChangeLog 6588 RMD160 53d42ebbaa6d058408d9ba179b644e26621950c4 SHA1 89433b9212fd7f75d30ea44c0a681efeab102594 SHA256 46d6ac68ea1c195c7f0b3f7ed99d66005f9128282863a81418e0d30ddb7dd974
+MISC ChangeLog 6928 RMD160 36e8df2a755b098f946c2a621ba5eafc6f3db8d6 SHA1 e413ccdee6de1b1a4f273194b94ecc565dac6a37 SHA256 d0fc9994f588cd22cca2256819b6ea1ab2faf3403721c78d807e043addb44dee
 MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908
diff --git a/net-im/ekg/ekg-1.8_rc1-r1.ebuild b/net-im/ekg/ekg-1.8_rc1-r1.ebuild
new file mode 100644
index 000000000000..47f3732dafd7
--- /dev/null
+++ b/net-im/ekg/ekg-1.8_rc1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/03/21 17:04:44 signals Exp $
+
+EAPI=2
+inherit autotools eutils
+
+IUSE="gif gtk jpeg ncurses python readline spell ssl zlib"
+
+DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
+HOMEPAGE="http://ekg.chmurka.net/"
+SRC_URI="http://ekg.chmurka.net/${P/_/}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/${P/_/}"
+
+RDEPEND="net-libs/libgadu
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ncurses? ( sys-libs/ncurses )
+	readline? ( sys-libs/readline )
+	zlib? ( sys-libs/zlib )
+	python? ( dev-lang/python )
+	spell? ( >=app-text/aspell-0.50.3 )
+	gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg )
+	gtk? ( x11-libs/gtk+:2 )"
+
+DEPEND=">=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.50
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/"${P}-gtkutil-button-decl.patch \
+		"${FILESDIR}/"${P}-as-needed.patch \
+		"${FILESDIR}/"${P}-gtk.patch \
+		"${FILESDIR}/"${P}-libgif.patch \
+		"${FILESDIR}/"${P}-missing-prototypes.patch
+	sed -i -e 's/ioctld.c -o/$(LDFLAGS) ioctld.c -o/' \
+		src/Makefile.in || die #333797
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--enable-ioctld" # --disable-static --enable-dynamic"
+	if use ncurses; then
+		myconf="$myconf --enable-force-ncurses"
+	else
+		myconf="$myconf --disable-ui-ncurses"
+	fi
+	use readline && myconf="$myconf --enable-ui-readline"
+
+	econf ${myconf} \
+		`use_with python` \
+		`use_with jpeg libjpeg` \
+		`use_with zlib` \
+		`use_with gif libgif` \
+		`use_enable spell aspell` \
+		`use_with ssl openssl` \
+		`use_enable ssl openssl` \
+		`use_enable gtk ui-gtk` \
+	|| die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc docs/{*.txt,ULOTKA,TODO,README,FAQ}
+}
diff --git a/net-im/ekg/files/ekg-1.8_rc1-libgif.patch b/net-im/ekg/files/ekg-1.8_rc1-libgif.patch
new file mode 100644
index 000000000000..19ad65b9b0ee
--- /dev/null
+++ b/net-im/ekg/files/ekg-1.8_rc1-libgif.patch
@@ -0,0 +1,49 @@
+Use libgif instead of libungif
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.in
++++ configure.in
+@@ -286,20 +286,20 @@
+ fi
+ 
+ dnl
+-dnl  Sprawdzamy libungif.so i <gif_lib.h>
++dnl  Sprawdzamy libgif.so i <gif_lib.h>
+ dnl
+   
+-AC_ARG_WITH(libungif,
+-	[  --without-libungif      Compile without GIF token support])
++AC_ARG_WITH(libgif,
++	[  --without-libgif      Compile without GIF token support])
+ 
+-if test "x$with_libungif" != "xno"; then
+-	AC_CHECK_LIB(ungif, DGifSlurp,
++if test "x$with_libgif" != "xno"; then
++	AC_CHECK_LIB(gif, DGifSlurp,
+ 	[ 
+ 		AC_CHECK_HEADERS(gif_lib.h,
+ 		[
+-			AC_DEFINE(HAVE_LIBUNGIF, 1, [define if you have libungif])
+-			LIBS="$LIBS -lungif"
+-			have_libungif=yes
++			AC_DEFINE(HAVE_LIBUNGIF, 1, [define if you have libgif])
++			LIBS="$LIBS -lgif"
++			have_libgif=yes
+ 		])
+ 	])
+ fi
+@@ -478,10 +478,10 @@
+ 	echo " - zlib: disabled"
+ fi
+ 
+-if test "x$have_libungif" = "xyes"; then
+-	echo " - libungif: enabled"
++if test "x$have_libgif" = "xyes"; then
++	echo " - libgif: enabled"
+ else
+-	echo " - libungif: disabled"
++	echo " - libgif: disabled"
+ fi
+ 
+ if test "x$have_libjpeg" = "xyes"; then
diff --git a/net-im/ekg/files/ekg-1.8_rc1-missing-prototypes.patch b/net-im/ekg/files/ekg-1.8_rc1-missing-prototypes.patch
new file mode 100644
index 000000000000..796a61c653c5
--- /dev/null
+++ b/net-im/ekg/files/ekg-1.8_rc1-missing-prototypes.patch
@@ -0,0 +1,14 @@
+Add missing prototypes so compile doesn't complain.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- src/ui-gtk.h
++++ src/ui-gtk.h
+@@ -131,4 +131,7 @@
+ 
+ int key_handle_key_press(GtkWidget *wid, GdkEventKey *evt, window_t *sess);
+ 
++void mg_changui_new(window_t *sess, int tab, int focus);
++void fe_close_window(window_t *sess);
++
+ #endif