Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libzen: ChangeLog libzen-0.4.23.ebuild
Date: Mon, 28 Nov 2011 03:03:14
Message-Id: 20111128030301.55C042004C@flycatcher.gentoo.org
1 radhermit 11/11/28 03:03:01
2
3 Modified: ChangeLog libzen-0.4.23.ebuild
4 Log:
5 Fix autotools-utils usage (bug #392155).
6
7 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.26 media-libs/libzen/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?rev=1.26&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?rev=1.26&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/ChangeLog?r1=1.25&r2=1.26
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v
19 retrieving revision 1.25
20 retrieving revision 1.26
21 diff -u -r1.25 -r1.26
22 --- ChangeLog 27 Nov 2011 04:07:20 -0000 1.25
23 +++ ChangeLog 28 Nov 2011 03:03:00 -0000 1.26
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-libs/libzen
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.25 2011/11/27 04:07:20 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/ChangeLog,v 1.26 2011/11/28 03:03:00 radhermit Exp $
29 +
30 + 28 Nov 2011; Tim Harder <radhermit@g.o> libzen-0.4.23.ebuild:
31 + Fix autotools-utils usage (bug #392155).
32
33 27 Nov 2011; Tim Harder <radhermit@g.o> libzen-0.4.23.ebuild:
34 Build in the source tree.
35
36
37
38 1.3 media-libs/libzen/libzen-0.4.23.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild?r1=1.2&r2=1.3
43
44 Index: libzen-0.4.23.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- libzen-0.4.23.ebuild 27 Nov 2011 04:07:20 -0000 1.2
51 +++ libzen-0.4.23.ebuild 28 Nov 2011 03:03:00 -0000 1.3
52 @@ -1,10 +1,10 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.2 2011/11/27 04:07:20 radhermit Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libzen/libzen-0.4.23.ebuild,v 1.3 2011/11/28 03:03:00 radhermit Exp $
57
58 EAPI="4"
59
60 -inherit autotools-utils multilib eutils
61 +inherit autotools-utils multilib
62
63 MY_PN="ZenLib"
64 DESCRIPTION="Shared library for libmediainfo and mediainfo"
65 @@ -22,35 +22,37 @@
66
67 S="${WORKDIR}/${MY_PN}/Project/GNU/Library"
68
69 -AUTOTOOLS_IN_SOURCE_BUILD=1
70 +PATCHES=(
71 + "${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
72 +)
73
74 src_prepare() {
75 - epatch "${FILESDIR}"/${PN}-0.4.21-no-tinyxml.patch
76 + autotools-utils_src_prepare
77 sed -i -e "s:-O2::" configure.ac
78 eautoreconf
79 }
80
81 src_configure() {
82 - econf \
83 - --enable-unicode \
84 - --enable-shared \
85 - $(use_enable static-libs static)
86 + myeconfargs=(
87 + --enable-unicode
88 + )
89 + autotools-utils_src_configure
90 }
91
92 src_compile() {
93 - default
94 + autotools-utils_src_compile
95
96 - if use doc; then
97 + if use doc ; then
98 cd "${WORKDIR}"/${MY_PN}/Source/Doc
99 doxygen Doxyfile || die
100 fi
101 }
102
103 src_install() {
104 - default
105 + autotools-utils_src_install
106
107 insinto /usr/$(get_libdir)/pkgconfig
108 - doins "${S}"/${PN}.pc
109 + doins "${AUTOTOOLS_BUILD_DIR}"/${PN}.pc
110
111 for x in ./ Base64 Format/Html Format/Http HTTP_Client ; do
112 insinto /usr/include/${MY_PN}/${x}
113 @@ -58,9 +60,7 @@
114 done
115
116 dodoc "${WORKDIR}"/${MY_PN}/History.txt
117 - if use doc; then
118 + if use doc ; then
119 dohtml "${WORKDIR}"/${MY_PN}/Doc/*
120 fi
121 -
122 - remove_libtool_files all
123 }