Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ChangeLog ati-drivers-8.660.ebuild
Date: Mon, 07 Sep 2009 12:50:19
Message-Id: E1Mkdfl-0004uN-9y@stork.gentoo.org
1 scarabeus 09/09/07 12:50:17
2
3 Modified: ChangeLog ati-drivers-8.660.ebuild
4 Log:
5 Fix slashing around FOLDER_PREFIX variable.
6 (Portage version: 2.2_rc38/cvs/Linux i686)
7
8 Revision Changes Path
9 1.186 x11-drivers/ati-drivers/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.186&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.186&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.185&r2=1.186
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
18 retrieving revision 1.185
19 retrieving revision 1.186
20 diff -u -r1.185 -r1.186
21 --- ChangeLog 7 Sep 2009 11:38:10 -0000 1.185
22 +++ ChangeLog 7 Sep 2009 12:50:16 -0000 1.186
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-drivers/ati-drivers
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.185 2009/09/07 11:38:10 scarabeus Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.186 2009/09/07 12:50:16 scarabeus Exp $
28 +
29 + 07 Sep 2009; Tomáš Chvátal <scarabeus@g.o>
30 + ati-drivers-8.660.ebuild:
31 + Fix slashing around FOLDER_PREFIX variable.
32
33 07 Sep 2009; Tomáš Chvátal <scarabeus@g.o>
34 ati-drivers-8.660.ebuild:
35
36
37
38 1.3 x11-drivers/ati-drivers/ati-drivers-8.660.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild?rev=1.3&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild?rev=1.3&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild?r1=1.2&r2=1.3
43
44 Index: ati-drivers-8.660.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v
47 retrieving revision 1.2
48 retrieving revision 1.3
49 diff -u -r1.2 -r1.3
50 --- ati-drivers-8.660.ebuild 7 Sep 2009 11:38:10 -0000 1.2
51 +++ ati-drivers-8.660.ebuild 7 Sep 2009 12:50:17 -0000 1.3
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2009 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v 1.2 2009/09/07 11:38:10 scarabeus Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v 1.3 2009/09/07 12:50:17 scarabeus Exp $
57
58 EAPI="2"
59
60 @@ -244,12 +244,12 @@
61 sed -i \
62 -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
63 -e "s:/var/lib/gdm/:/var/gdm/:" \
64 - "${S}/${FOLDER_PREFIX}/etc/ati/authatieventsd.sh" \
65 + "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
66 || die "sed failed."
67
68 # Since "who" is in coreutils, we're using that one instead of "finger".
69 sed -i -e 's:finger:who:' \
70 - "${S}/${FOLDER_PREFIX}/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
71 + "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
72 || die "Replacing 'finger' with 'who' failed."
73 # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
74 # add function to detect default state.
75 @@ -273,7 +273,7 @@
76
77 mkdir extra || die "mkdir failed"
78 cd extra
79 - unpack ./../${FOLDER_PREFIX}/usr/src/ati/fglrx_sample_source.tgz
80 + unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
81 sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
82 lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
83 # Add a category.
84 @@ -292,7 +292,7 @@
85 # The -DUSE_GLU is needed to compile using nvidia headers
86 # according to a comment in ati-drivers-extra-8.33.6.ebuild.
87 "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
88 - -I"${S}"/${FOLDER_PREFIX}/usr/include fgl_glxgears.c \
89 + -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
90 -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
91 eend $?
92
93 @@ -308,7 +308,7 @@
94 ebegin "Building fglrx_gamma util"
95 cd "${S}"/extra/programs/fglrx_gamma
96 "$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
97 - -I../../../${FOLDER_PREFIX}/usr/X11R6/include -L../../lib/fglrx_gamma \
98 + -I../../../${FOLDER_PREFIX}usr/X11R6/include -L../../lib/fglrx_gamma \
99 fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
100 || die "fglrx_gamma util build failed"
101 eend $?
102 @@ -395,34 +395,34 @@
103 # etc.
104 insinto /etc/ati
105 # Everything except for the authatieventsd.sh script.
106 - doins ${FOLDER_PREFIX}/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
107 + doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
108 insopts -m0755
109 - doins ${FOLDER_PREFIX}/etc/ati/authatieventsd.sh || die
110 + doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die
111
112 # include.
113 insinto /usr
114 - doins -r ${FOLDER_PREFIX}/usr/include || die
115 + doins -r ${FOLDER_PREFIX}usr/include || die
116 insinto /usr/include/X11/extensions
117 - doins ${FOLDER_PREFIX}/usr/X11R6/include/X11/extensions/fglrx_gamma.h || die
118 + doins ${FOLDER_PREFIX}usr/X11R6/include/X11/extensions/fglrx_gamma.h || die
119
120 # Just the atigetsysteminfo.sh script.
121 into /usr
122 - dosbin ${FOLDER_PREFIX}/usr/sbin/* || die
123 + dosbin ${FOLDER_PREFIX}usr/sbin/* || die
124
125 # data files for the control panel.
126 insinto /usr/share
127 - doins -r ${FOLDER_PREFIX}/usr/share/ati || die
128 + doins -r ${FOLDER_PREFIX}usr/share/ati || die
129 insinto /usr/share/pixmaps
130 - doins ${FOLDER_PREFIX}/usr/share/icons/ccc_{large,small}.xpm || die
131 + doins ${FOLDER_PREFIX}usr/share/icons/ccc_{large,small}.xpm || die
132 make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
133 ccc_large System
134
135 # doc.
136 - dohtml -r ${FOLDER_PREFIX}/usr/share/doc/fglrx || die
137 + dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die
138
139 - doman ${FOLDER_PREFIX}/usr/share/man/man8/atieventsd.8 || die
140 + doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die
141
142 - pushd ${FOLDER_PREFIX}/usr/share/doc/fglrx/examples/etc/acpi > /dev/null
143 + pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
144
145 exeinto /etc/acpi
146 doexe ati-powermode.sh || die