Fix building with recent glibc wrt #333621 by Charlie Gehlin.

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

3 files changed, 63 insertions, 18 deletions

diff --git a/media-libs/zvbi/ChangeLog b/media-libs/zvbi/ChangeLog
index 140c1d3986a2..ce550b25db38 100644
--- a/media-libs/zvbi/ChangeLog
+++ b/media-libs/zvbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/zvbi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.45 2010/05/19 20:06:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.46 2010/08/20 13:46:36 ssuominen Exp $
+
+  20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> zvbi-0.2.33.ebuild,
+  +files/zvbi-0.2.33-glibc212.patch:
+  Fix building with recent glibc wrt #333621 by Charlie Gehlin.
 
   19 May 2010; Raúl Porcel <armin76@gentoo.org> zvbi-0.2.33.ebuild:
   ia64 stable wrt #319539
diff --git a/media-libs/zvbi/files/zvbi-0.2.33-glibc212.patch b/media-libs/zvbi/files/zvbi-0.2.33-glibc212.patch
new file mode 100644
index 000000000000..cadf8d1c7b99
--- /dev/null
+++ b/media-libs/zvbi/files/zvbi-0.2.33-glibc212.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/333621
+
+--- contrib/ntsc-cc.c
++++ contrib/ntsc-cc.c
+@@ -34,6 +34,7 @@
+ #include <locale.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #ifdef HAVE_GETOPT_LONG
+ #  include <getopt.h>
+--- src/io-dvb.c
++++ src/io-dvb.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <sys/select.h>
+ #include <sys/ioctl.h>
++#include <sys/stat.h>
+ 
+ #ifndef HAVE_S64_U64
+   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
+--- src/io-v4l.c
++++ src/io-v4l.c
+@@ -42,6 +42,7 @@
+ #include <assert.h>
+ #include <sys/time.h>		/* timeval */
+ #include <sys/types.h>		/* fd_set, uid_t */
++#include <sys/stat.h>
+ #include <sys/ioctl.h>		/* for (_)videodev.h */
+ #include <pthread.h>
+ 
diff --git a/media-libs/zvbi/zvbi-0.2.33.ebuild b/media-libs/zvbi/zvbi-0.2.33.ebuild
index 37191ab3ac35..fc147f4adda3 100644
--- a/media-libs/zvbi/zvbi-0.2.33.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.33.ebuild
@@ -1,41 +1,50 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.9 2010/05/19 20:06:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.10 2010/08/20 13:46:36 ssuominen Exp $
 
-inherit libtool
+EAPI=2
+inherit eutils libtool
 
 DESCRIPTION="VBI Decoding Library for Zapping"
 SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
 HOMEPAGE="http://zapping.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="X nls v4l dvb doc"
+IUSE="doc dvb nls static-libs v4l X"
 
-RDEPEND="X? ( x11-libs/libX11 )
-	media-libs/libpng
+RDEPEND=">=media-libs/libpng-1.4
 	sys-libs/zlib
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt )
 	virtual/os-headers
+	doc? ( app-doc/doxygen )
 	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
+	X? ( x11-libs/libXt )"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc212.patch
 	elibtoolize
-	econf $(use_enable nls) \
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
 		$(use_enable v4l) \
 		$(use_enable dvb) \
+		$(use_enable nls) \
 		$(use_with X x) \
-		$(use_with doc doxygen) \
-		|| die "econf failed."
-	emake || die "emake failed."
+		$(use_with doc doxygen)
 }
 
-src_install () {
-	emake DESTDIR="${D}" install || die "einstall failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 	use doc && dohtml -a png,gif,html,css doc/html/*
+
+	find "${D}" -name '*.la' -delete
 }