[gentoo-commits] proj/gnome:master commit in: media-libs/gmyth/files/, media-libs/gmyth/

[gentoo-commits] proj/gnome:master commit in: media-libs/gmyth/files/, media-libs/gmyth/

[Alexandre Restovtsev]

commit:     c819a214c2fe88e90acb63d87c065a8ed21514ca
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 23:42:07 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Dec  2 23:42:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c819a214

media-libs/gmyth: fix building with modern curl (bug #386889)

Add a patch to not use obsolete curl/types.h (bug #386889, thanks to
alvinwu <wualvin <AT> eternalit.com> for reporting).
Add a patch to fix building with --as-needed.
Port to EAPI4.
Add static-libs USE flag, and drop .la files when building non-static.

---
 media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch |   22 ++++++++++++++++++++
 media-libs/gmyth/files/gmyth-0.7.1-types.h.patch   |   16 ++++++++++++++
 .../{gmyth-0.7.1.ebuild => gmyth-0.7.1-r1.ebuild}  |   20 ++++++++++++-----
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch b/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch
new file mode 100644
index 0000000..2fed1a8
--- /dev/null
+++ b/media-libs/gmyth/files/gmyth-0.7.1-as-needed.patch
@@ -0,0 +1,22 @@
+Patch author: Dominique Leuenberger (dimstar)
+Fixes building with -Wl,--as-nneded
+http://sourceforge.net/tracker/?func=detail&aid=3424823&group_id=177106&atid=879916
+
+Index: gmyth-0.7.1/samples/Makefile.am
+===================================================================
+--- gmyth-0.7.1.orig/samples/Makefile.am
++++ gmyth-0.7.1/samples/Makefile.am
+@@ -6,12 +6,10 @@ gmyth_cat_SOURCES = \
+ gmyth_ls_SOURCES = \
+         gmyth_ls.c
+ 
+-LDADD = \
+-        $(top_builddir)/gmyth/libgmyth.la
+-
+ AM_CFLAGS = -g
+ 
+ AM_LDFLAGS = \
++        $(top_builddir)/gmyth/libgmyth.la \
+         @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@
+ 
+ INCLUDES = \

diff --git a/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch b/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch
new file mode 100644
index 0000000..0f66410
--- /dev/null
+++ b/media-libs/gmyth/files/gmyth-0.7.1-types.h.patch
@@ -0,0 +1,16 @@
+Patch author: Dominique Leuenberger (dimstar)
+Fixes building with >=curl-7.21.7
+http://sourceforge.net/tracker/?func=detail&aid=3424822&group_id=177106&atid=879916
+
+Index: gmyth-0.7.1/gmyth/gmyth_http.h
+===================================================================
+--- gmyth-0.7.1.orig/gmyth/gmyth_http.h
++++ gmyth-0.7.1/gmyth/gmyth_http.h
+@@ -42,7 +42,6 @@
+ #include "gmyth_recprofile.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ G_BEGIN_DECLS

diff --git a/media-libs/gmyth/gmyth-0.7.1.ebuild b/media-libs/gmyth/gmyth-0.7.1-r1.ebuild
similarity index 53%
rename from media-libs/gmyth/gmyth-0.7.1.ebuild
rename to media-libs/gmyth/gmyth-0.7.1-r1.ebuild
index 66823de..871fb94 100644
--- a/media-libs/gmyth/gmyth-0.7.1.ebuild
+++ b/media-libs/gmyth/gmyth-0.7.1-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/gmyth/gmyth-0.7.ebuild,v 1.4 2008/08/08 19:29:34 maekke Exp $
-EAPI=2
+EAPI=4
 
-inherit libtool
+inherit autotools eutils libtool
 
-IUSE="debug"
+IUSE="debug static-libs"
 LICENSE="LGPL-2"
 DESCRIPTION="GObject based library to access mythtv backends"
 HOMEPAGE="http://gmyth.sourceforge.net/"
@@ -19,11 +19,19 @@ RDEPEND="net-misc/curl
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	# bug #386889; http://sourceforge.net/tracker/?func=detail&aid=3424822&group_id=177106&atid=879916
+	epatch "${FILESDIR}/${PN}-0.7.1-types.h.patch"
+	# http://sourceforge.net/tracker/?func=detail&aid=3424823&group_id=177106&atid=879916
+	epatch "${FILESDIR}/${PN}-0.7.1-as-needed.patch"
+	eautoreconf
+}
+
 src_configure() {
-	econf $(use_enable debug)
+	econf $(use_enable debug) $(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
+	default
+	use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
 }