Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/zvbi: ChangeLog zvbi-0.2.33.ebuild
Date: Fri, 20 Aug 2010 13:46:41
Message-Id: 20100820134636.617452004E@flycatcher.gentoo.org
1 ssuominen 10/08/20 13:46:36
2
3 Modified: ChangeLog zvbi-0.2.33.ebuild
4 Log:
5 Fix building with recent glibc wrt #333621 by Charlie Gehlin.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.46 media-libs/zvbi/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/ChangeLog?rev=1.46&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/ChangeLog?rev=1.46&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/ChangeLog?r1=1.45&r2=1.46
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v
18 retrieving revision 1.45
19 retrieving revision 1.46
20 diff -u -r1.45 -r1.46
21 --- ChangeLog 19 May 2010 20:06:23 -0000 1.45
22 +++ ChangeLog 20 Aug 2010 13:46:36 -0000 1.46
23 @@ -1,6 +1,10 @@
24 # ChangeLog for media-libs/zvbi
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.45 2010/05/19 20:06:23 armin76 Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/ChangeLog,v 1.46 2010/08/20 13:46:36 ssuominen Exp $
28 +
29 + 20 Aug 2010; Samuli Suominen <ssuominen@g.o> zvbi-0.2.33.ebuild,
30 + +files/zvbi-0.2.33-glibc212.patch:
31 + Fix building with recent glibc wrt #333621 by Charlie Gehlin.
32
33 19 May 2010; Raúl Porcel <armin76@g.o> zvbi-0.2.33.ebuild:
34 ia64 stable wrt #319539
35
36
37
38 1.10 media-libs/zvbi/zvbi-0.2.33.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild?rev=1.10&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild?rev=1.10&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild?r1=1.9&r2=1.10
43
44 Index: zvbi-0.2.33.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v
47 retrieving revision 1.9
48 retrieving revision 1.10
49 diff -u -r1.9 -r1.10
50 --- zvbi-0.2.33.ebuild 19 May 2010 20:06:23 -0000 1.9
51 +++ zvbi-0.2.33.ebuild 20 Aug 2010 13:46:36 -0000 1.10
52 @@ -1,41 +1,50 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.9 2010/05/19 20:06:23 armin76 Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.10 2010/08/20 13:46:36 ssuominen Exp $
57
58 -inherit libtool
59 +EAPI=2
60 +inherit eutils libtool
61
62 DESCRIPTION="VBI Decoding Library for Zapping"
63 SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
64 HOMEPAGE="http://zapping.sourceforge.net"
65
66 -LICENSE="GPL-2"
67 +LICENSE="GPL-2 LGPL-2"
68 SLOT="0"
69 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
70 -IUSE="X nls v4l dvb doc"
71 +IUSE="doc dvb nls static-libs v4l X"
72
73 -RDEPEND="X? ( x11-libs/libX11 )
74 - media-libs/libpng
75 +RDEPEND=">=media-libs/libpng-1.4
76 sys-libs/zlib
77 - nls? ( virtual/libintl )"
78 + nls? ( virtual/libintl )
79 + X? ( x11-libs/libX11 )"
80 DEPEND="${RDEPEND}
81 - X? ( x11-libs/libXt )
82 virtual/os-headers
83 + doc? ( app-doc/doxygen )
84 nls? ( sys-devel/gettext )
85 - doc? ( app-doc/doxygen )"
86 + X? ( x11-libs/libXt )"
87
88 -src_compile() {
89 +src_prepare() {
90 + epatch "${FILESDIR}"/${P}-glibc212.patch
91 elibtoolize
92 - econf $(use_enable nls) \
93 +}
94 +
95 +src_configure() {
96 + econf \
97 + --disable-dependency-tracking \
98 + $(use_enable static-libs static) \
99 $(use_enable v4l) \
100 $(use_enable dvb) \
101 + $(use_enable nls) \
102 $(use_with X x) \
103 - $(use_with doc doxygen) \
104 - || die "econf failed."
105 - emake || die "emake failed."
106 + $(use_with doc doxygen)
107 }
108
109 -src_install () {
110 - emake DESTDIR="${D}" install || die "einstall failed."
111 - dodoc AUTHORS ChangeLog NEWS README TODO
112 +src_install() {
113 + emake DESTDIR="${D}" install || die
114 +
115 + dodoc AUTHORS BUGS ChangeLog NEWS README TODO
116 use doc && dohtml -a png,gif,html,css doc/html/*
117 +
118 + find "${D}" -name '*.la' -delete
119 }