Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-gtklibs: ChangeLog emul-linux-x86-gtklibs-20131008-r1.ebuild
Date: Sat, 26 Oct 2013 08:58:28
Message-Id: 20131026085824.86EC92004E@flycatcher.gentoo.org
1 aballier 13/10/26 08:58:24
2
3 Modified: ChangeLog
4 Added: emul-linux-x86-gtklibs-20131008-r1.ebuild
5 Log:
6 Revision bump featuring pixman multilib conversion.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
9
10 Revision Changes Path
11 1.113 app-emulation/emul-linux-x86-gtklibs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?rev=1.113&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?rev=1.113&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog?r1=1.112&r2=1.113
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v
20 retrieving revision 1.112
21 retrieving revision 1.113
22 diff -u -r1.112 -r1.113
23 --- ChangeLog 8 Oct 2013 20:59:42 -0000 1.112
24 +++ ChangeLog 26 Oct 2013 08:58:24 -0000 1.113
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.112 2013/10/08 20:59:42 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.113 2013/10/26 08:58:24 aballier Exp $
30 +
31 +*emul-linux-x86-gtklibs-20131008-r1 (26 Oct 2013)
32 +
33 + 26 Oct 2013; Alexis Ballier <aballier@g.o>
34 + +emul-linux-x86-gtklibs-20131008-r1.ebuild, +files/remove-native:
35 + Revision bump featuring pixman multilib conversion.
36
37 *emul-linux-x86-gtklibs-20131008 (08 Oct 2013)
38
39
40
41
42 1.1 app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: emul-linux-x86-gtklibs-20131008-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2013 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r1.ebuild,v 1.1 2013/10/26 08:58:24 aballier Exp $
52
53 EAPI=5
54 inherit emul-linux-x86
55
56 LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
57 KEYWORDS="-* ~amd64"
58 IUSE="abi_x86_32"
59
60 DEPEND=""
61 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
62 ~app-emulation/emul-linux-x86-xlibs-${PV}
63 ~app-emulation/emul-linux-x86-opengl-${PV}
64 abi_x86_32? (
65 >=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
66 )"
67 # RDEPEND on opengl stuff needed due cairo, bug #410213
68
69 my_gdk_pixbuf_query_loaders() {
70 # causes segfault if set
71 unset __GL_NO_DSO_FINALIZER
72
73 local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
74 if [ -z "${tmp_file}" ]; then
75 ewarn "Cannot create temporary file"
76 return 1
77 fi
78
79 if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
80 cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
81 else
82 ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
83 fi
84 rm "${tmp_file}"
85 }
86
87 my_pango_querymodules() {
88 PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
89 einfo "Generating pango modules listing..."
90
91 mkdir -p "${PANGO_CONFDIR}"
92 local pango_conf="${PANGO_CONFDIR}/pango.modules"
93 local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
94 if [ -z "${tmp_file}" ]; then
95 ewarn "Cannot create temporary file"
96 return 1
97 fi
98
99 if pango-querymodules32 > "${tmp_file}"; then
100 cat "${tmp_file}" > "${pango_conf}"
101 else
102 ewarn "Cannot update pango.modules, file generation failed"
103 fi
104 rm "${tmp_file}"
105 }
106
107 my_gtk_query_immodules() {
108 GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
109 einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
110
111 mkdir -p "${GTK2_CONFDIR}"
112 local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
113 local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
114 if [ -z "${tmp_file}" ]; then
115 ewarn "Cannot create temporary file"
116 return 1
117 fi
118
119 if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
120 cat "${tmp_file}" > "${gtk_conf}"
121 else
122 ewarn "Cannot update gtk.immodules, file generation failed"
123 fi
124 rm "${tmp_file}"
125 }
126
127 src_prepare() {
128 query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
129 ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
130 emul-linux-x86_src_prepare
131
132 # these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
133 mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
134 mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
135 mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
136
137 # Remove migrated stuff.
138 use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
139 }
140
141 pkg_preinst() {
142 #bug 169058
143 for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
144 [[ -L ${l} ]] && rm -f ${l}
145 done
146 }
147
148 pkg_postinst() {
149 my_pango_querymodules
150 my_gtk_query_immodules
151 my_gdk_pixbuf_query_loaders
152
153 # gdk-pixbuf.loaders should be in their CHOST directories respectively.
154 if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
155 ewarn
156 ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
157 ewarn "multilib systems, please remove it by hand."
158 ewarn
159 fi
160 }