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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 66 insertions, 20 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/Manifest b/media-libs/zvbi/Manifest
index 5f3823517f9f..cc33a2e8ff92 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,4 +1,5 @@
+AUX zvbi-0.2.33-glibc212.patch 735 RMD160 22fe14393112db821f33a4365115b3978acd9f72 SHA1 eca0a01efde94aa925bc1d1cd715c2c94509ff3b SHA256 b281cc25fc6a3780ae59c1d11d99fe154999ffd38e8b90d4211cd6972d1ec637
 DIST zvbi-0.2.33.tar.bz2 935601 RMD160 05086ffeb3cb4219931a16f8798facb33c92a7f5 SHA1 0e32cb71357dc629305dd15027bc76533fcb69a3 SHA256 09a709f6de5f42e7039cca2732a6ea211a397bb666b9110ee52658603be4fb7e
-EBUILD zvbi-0.2.33.ebuild 1070 RMD160 c78f3d983ff420fd9a1b9439fdbdbf6bd05e2966 SHA1 6f40b2a0c2d1f96d2c13a93b736815eabb1bd739 SHA256 3090c33fb79e699839b26788cad6d006b12b3fac06822a4ab026f3cf123c3a87
-MISC ChangeLog 5068 RMD160 581c6d57f3b18cf370464e37cfdc78ffeed12f93 SHA1 f8d964ecacef42e7f643947c7f5c6573ff2c5b1b SHA256 661f1e7c79bc9ca670606672ad662afbddf8eb5fa85f8bb18b4b63a986f01d62
+EBUILD zvbi-0.2.33.ebuild 1214 RMD160 11df05a4ac4e7b3fb0282100beef535c096b29bb SHA1 e2130d33ce24aefdc55f1ec6f0f454c63eba17e4 SHA256 7e3971081b37c88199f2238343cefa5fc821b11aa47b4decae044c8e54f2908a
+MISC ChangeLog 5246 RMD160 e9e679915bd8054b13ad17436ce0d80491df59db SHA1 4f0f0850779b40e8fd6567c22f74344636e140dd SHA256 d9f0bbd1b6386b6bc8341243f3797a832e4fb3efbea01dc1918d5d2eefa453e5
 MISC metadata.xml 288 RMD160 e46eefe47000d00f62fc48323c5d7cf17d1662e3 SHA1 ace0e2e3d4ad1f4d56f4bb8dcecbb75c637fd73b SHA256 85f1a198e9f35e7711481a80743c3ffb7849924b2ef733168f4dad22798529dc
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
 }