Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xorg-cf-files: xorg-cf-files-1.0.4-r1.ebuild ChangeLog
Date: Tue, 28 May 2013 21:18:03
Message-Id: 20130528211756.7AE8E2171D@flycatcher.gentoo.org
1 blueness 13/05/28 21:17:56
2
3 Modified: ChangeLog
4 Added: xorg-cf-files-1.0.4-r1.ebuild
5 Log:
6 Support multilib-nosymlink, bug #343461
7
8 (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
9
10 Revision Changes Path
11 1.48 x11-misc/xorg-cf-files/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog?rev=1.48&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog?rev=1.48&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog?r1=1.47&r2=1.48
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v
20 retrieving revision 1.47
21 retrieving revision 1.48
22 diff -u -r1.47 -r1.48
23 --- ChangeLog 21 Feb 2013 18:47:07 -0000 1.47
24 +++ ChangeLog 28 May 2013 21:17:56 -0000 1.48
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-misc/xorg-cf-files
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.47 2013/02/21 18:47:07 zmedico Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xorg-cf-files/ChangeLog,v 1.48 2013/05/28 21:17:56 blueness Exp $
30 +
31 +*xorg-cf-files-1.0.4-r1 (28 May 2013)
32 +
33 + 28 May 2013; Anthony G. Basile <blueness@g.o>
34 + +xorg-cf-files-1.0.4-r1.ebuild:
35 + Support multilib-nosymlink, bug #343461
36
37 21 Feb 2013; Zac Medico <zmedico@g.o> xorg-cf-files-1.0.4.ebuild:
38 Add ~arm-linux keyword.
39
40
41
42 1.1 x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: xorg-cf-files-1.0.4-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/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild,v 1.1 2013/05/28 21:17:56 blueness Exp $
52
53 EAPI="5"
54
55 inherit xorg-2
56
57 DESCRIPTION="Old Imake-related build files"
58 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
59 IUSE=""
60
61 RDEPEND=""
62 DEPEND="${RDEPEND}"
63
64 PATCHES=(
65 "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
66 )
67
68 src_install() {
69 xorg-2_src_install
70 echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
71 sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
72 sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
73 sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
74 sed -i -e "/# define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
75 sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
76
77 sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
78 sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
79 sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
80 }