Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/fontconfig: fontconfig-2.11.1.ebuild ChangeLog
Date: Wed, 30 Apr 2014 17:33:54
Message-Id: 20140430173347.A8F132004B@flycatcher.gentoo.org
1 mgorny 14/04/30 17:33:47
2
3 Modified: fontconfig-2.11.1.ebuild ChangeLog
4 Log:
5 Use multilib_src_install*() instead of direct multilib_foreach_abi().
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.2 media-libs/fontconfig/fontconfig-2.11.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild?r1=1.1&r2=1.2
15
16 Index: fontconfig-2.11.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- fontconfig-2.11.1.ebuild 29 Mar 2014 20:42:28 -0000 1.1
23 +++ fontconfig-2.11.1.ebuild 30 Apr 2014 17:33:47 -0000 1.2
24 @@ -1,11 +1,11 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild,v 1.1 2014/03/29 20:42:28 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.11.1.ebuild,v 1.2 2014/04/30 17:33:47 mgorny Exp $
29
30 EAPI=5
31 AUTOTOOLS_AUTORECONF=yes
32
33 -inherit autotools-multilib readme.gentoo
34 +inherit eutils readme.gentoo autotools-multilib
35
36 DESCRIPTION="A library for configuring and customizing font access"
37 HOMEPAGE="http://fontconfig.org/"
38 @@ -76,19 +76,22 @@
39 autotools-multilib_src_configure
40 }
41
42 -src_install() {
43 - autotools-multilib_src_install
44 +multilib_src_install() {
45 + default
46
47 # XXX: avoid calling this multiple times, bug #459210
48 - install_others() {
49 + if multilib_is_native_abi; then
50 # stuff installed from build-dir
51 - autotools-utils_src_compile \
52 - DESTDIR="${D}" -C doc install-man
53 + emake -C doc DESTDIR="${D}" install-man
54
55 insinto /etc/fonts
56 - doins "${BUILD_DIR}"/fonts.conf
57 - }
58 - multilib_foreach_abi install_others
59 + doins fonts.conf
60 + fi
61 +}
62 +
63 +multilib_src_install_all() {
64 + einstalldocs
65 + prune_libtool_files --all
66
67 #fc-lang directory contains language coverage datafiles
68 #which are needed to test the coverage of fonts.
69 @@ -98,7 +101,7 @@
70 dodoc doc/fontconfig-user.{txt,pdf}
71
72 if [[ -e ${ED}usr/share/doc/fontconfig/ ]]; then
73 - mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P}
74 + mv "${ED}"usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die
75 rm -rf "${ED}"usr/share/doc/fontconfig
76 fi
77
78
79
80
81 1.192 media-libs/fontconfig/ChangeLog
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?rev=1.192&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?rev=1.192&content-type=text/plain
85 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/fontconfig/ChangeLog?r1=1.191&r2=1.192
86
87 Index: ChangeLog
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v
90 retrieving revision 1.191
91 retrieving revision 1.192
92 diff -u -r1.191 -r1.192
93 --- ChangeLog 29 Mar 2014 20:42:28 -0000 1.191
94 +++ ChangeLog 30 Apr 2014 17:33:47 -0000 1.192
95 @@ -1,6 +1,9 @@
96 # ChangeLog for media-libs/fontconfig
97 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
98 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.191 2014/03/29 20:42:28 vapier Exp $
99 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.192 2014/04/30 17:33:47 mgorny Exp $
100 +
101 + 30 Apr 2014; Michał Górny <mgorny@g.o> fontconfig-2.11.1.ebuild:
102 + Use multilib_src_install*() instead of direct multilib_foreach_abi().
103
104 *fontconfig-2.11.1 (29 Mar 2014)