1 |
mgorny 14/03/01 10:18:35 |
2 |
|
3 |
Modified: ChangeLog gnome2-utils.eclass |
4 |
Log: |
5 |
Add multilib love for gnome2_gdk_pixbuf_update(). |
6 |
|
7 |
Revision Changes Path |
8 |
1.1150 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1149&r2=1.1150 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1149 |
18 |
retrieving revision 1.1150 |
19 |
diff -u -r1.1149 -r1.1150 |
20 |
--- ChangeLog 27 Feb 2014 00:20:57 -0000 1.1149 |
21 |
+++ ChangeLog 1 Mar 2014 10:18:35 -0000 1.1150 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1149 2014/02/27 00:20:57 ottxor Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1150 2014/03/01 10:18:35 mgorny Exp $ |
27 |
+ |
28 |
+ 01 Mar 2014; Michał Górny <mgorny@g.o> gnome2-utils.eclass: |
29 |
+ Add multilib love for gnome2_gdk_pixbuf_update(). |
30 |
|
31 |
27 Feb 2014; Christoph Junghans <ottxor@g.o> unpacker.eclass: |
32 |
added lzip support (bug #501912) |
33 |
|
34 |
|
35 |
|
36 |
1.36 eclass/gnome2-utils.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.35&r2=1.36 |
41 |
|
42 |
Index: gnome2-utils.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v |
45 |
retrieving revision 1.35 |
46 |
retrieving revision 1.36 |
47 |
diff -u -r1.35 -r1.36 |
48 |
--- gnome2-utils.eclass 22 Feb 2014 08:05:45 -0000 1.35 |
49 |
+++ gnome2-utils.eclass 1 Mar 2014 10:18:35 -0000 1.36 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.35 2014/02/22 08:05:45 pacho Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.36 2014/03/01 10:18:35 mgorny Exp $ |
55 |
|
56 |
# @ECLASS: gnome2-utils.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -52,12 +52,6 @@ |
59 |
# Path to glib-compile-schemas |
60 |
: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"} |
61 |
|
62 |
-# @ECLASS-VARIABLE: GDK_PIXBUF_UPDATE_BIN |
63 |
-# @INTERNAL |
64 |
-# @DESCRIPTION: |
65 |
-# Path to gdk-pixbuf-query-loaders |
66 |
-: ${GDK_PIXBUF_UPDATE_BIN:="/usr/bin/gdk-pixbuf-query-loaders"} |
67 |
- |
68 |
# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS |
69 |
# @INTERNAL |
70 |
# @DEFAULT_UNSET |
71 |
@@ -409,7 +403,7 @@ |
72 |
gnome2_gdk_pixbuf_savelist() { |
73 |
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
74 |
pushd "${ED}" 1>/dev/null |
75 |
- export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find "usr/$(get_libdir)/gdk-pixbuf-2.0" -type f 2>/dev/null) |
76 |
+ export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) |
77 |
popd 1>/dev/null |
78 |
} |
79 |
|
80 |
@@ -420,7 +414,11 @@ |
81 |
# This function should be called from pkg_postinst and pkg_postrm. |
82 |
gnome2_gdk_pixbuf_update() { |
83 |
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
84 |
- local updater="${EROOT}${GDK_PIXBUF_UPDATE_BIN}" |
85 |
+ local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders" |
86 |
+ |
87 |
+ if [[ ! -x ${updater} ]]; then |
88 |
+ updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders" |
89 |
+ fi |
90 |
|
91 |
if [[ ! -x ${updater} ]]; then |
92 |
debug-print "${updater} is not executable" |