Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-baselibs: emul-linux-x86-baselibs-20131008-r14.ebuild ChangeLog
Date: Sat, 08 Feb 2014 04:44:11
Message-Id: 20140208044407.0EE0B2004C@flycatcher.gentoo.org
1 floppym 14/02/08 04:44:06
2
3 Modified: emul-linux-x86-baselibs-20131008-r14.ebuild
4 ChangeLog
5 Log:
6 Adjust ssuominen's change to work when LIBDIR_x86 != lib32.
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.2 app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild?r1=1.1&r2=1.2
16
17 Index: emul-linux-x86-baselibs-20131008-r14.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- emul-linux-x86-baselibs-20131008-r14.ebuild 7 Feb 2014 12:42:19 -0000 1.1
24 +++ emul-linux-x86-baselibs-20131008-r14.ebuild 8 Feb 2014 04:44:06 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild,v 1.1 2014/02/07 12:42:19 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r14.ebuild,v 1.2 2014/02/08 04:44:06 floppym Exp $
30
31 EAPI=5
32 inherit emul-linux-x86
33 @@ -78,10 +78,11 @@
34 src_install() {
35 emul-linux-x86_src_install
36
37 - LIBDIR=${EPREFIX}/usr/lib32/emul-linux
38 + local x86_libdir=$(get_abi_LIBDIR x86)
39 + LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
40 echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
41 doenvd 99emul-linux-x86-baselibs
42
43 mkdir -p "${ED}${LIBDIR}"
44 - mv "${ED}"/usr/lib32/{libjpeg.so.8*,libturbojpeg.so.0*} "${ED}${LIBDIR}"/
45 + mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
46 }
47
48
49
50 1.180 app-emulation/emul-linux-x86-baselibs/ChangeLog
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?rev=1.180&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?rev=1.180&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?r1=1.179&r2=1.180
55
56 Index: ChangeLog
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v
59 retrieving revision 1.179
60 retrieving revision 1.180
61 diff -u -r1.179 -r1.180
62 --- ChangeLog 7 Feb 2014 12:43:45 -0000 1.179
63 +++ ChangeLog 8 Feb 2014 04:44:06 -0000 1.180
64 @@ -1,6 +1,10 @@
65 # ChangeLog for app-emulation/emul-linux-x86-baselibs
66 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
67 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.179 2014/02/07 12:43:45 ssuominen Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.180 2014/02/08 04:44:06 floppym Exp $
69 +
70 + 08 Feb 2014; Mike Gilbert <floppym@g.o>
71 + emul-linux-x86-baselibs-20131008-r14.ebuild:
72 + Adjust ssuominen's change to work when LIBDIR_x86 != lib32.
73
74 *emul-linux-x86-baselibs-20131008-r14 (07 Feb 2014)