Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-9.8.ebuild
Date: Fri, 04 Sep 2009 09:53:30
Message-Id: E1MjaIa-0001Y2-9J@stork.gentoo.org
1 scarabeus 09/09/04 15:02:00
2
3 Modified: ChangeLog ati-drivers-9.8.ebuild
4 Log:
5 Adjust ebuild. Acpi is MANDATORY. Remove amd64 wrapping on multilib useflag, just wasting space.
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.183 x11-drivers/ati-drivers/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.183&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.183&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.182&r2=1.183
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
18 retrieving revision 1.182
19 retrieving revision 1.183
20 diff -u -r1.182 -r1.183
21 --- ChangeLog 4 Sep 2009 13:50:42 -0000 1.182
22 +++ ChangeLog 4 Sep 2009 15:02:00 -0000 1.183
23 @@ -1,6 +1,11 @@
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.182 2009/09/04 13:50:42 scarabeus Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.183 2009/09/04 15:02:00 scarabeus Exp $
28 +
29 + 04 Sep 2009; Tomáš Chvátal <scarabeus@g.o>
30 + ati-drivers-9.8.ebuild:
31 + Adjust ebuild. Acpi is MANDATORY. Remove amd64 wrapping on multilib
32 + useflag, just wasting space.
33
34 03 Sep 2009; Tomáš Chvátal <scarabeus@g.o>
35 ati-drivers-9.8.ebuild:
36
37
38
39 1.14 x11-drivers/ati-drivers/ati-drivers-9.8.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild?rev=1.14&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild?rev=1.14&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild?r1=1.13&r2=1.14
44
45 Index: ati-drivers-9.8.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild,v
48 retrieving revision 1.13
49 retrieving revision 1.14
50 diff -u -r1.13 -r1.14
51 --- ati-drivers-9.8.ebuild 4 Sep 2009 13:50:42 -0000 1.13
52 +++ ati-drivers-9.8.ebuild 4 Sep 2009 15:02:00 -0000 1.14
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2009 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild,v 1.13 2009/09/04 13:50:42 scarabeus Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild,v 1.14 2009/09/04 15:02:00 scarabeus Exp $
58
59 EAPI="2"
60
61 @@ -10,7 +10,7 @@
62 HOMEPAGE="http://www.ati.com"
63 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
64 SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
65 -IUSE="acpi debug +modules multilib"
66 +IUSE="debug +modules multilib"
67
68 LICENSE="AMD GPL-2 QPL-1.0 as-is"
69 KEYWORDS="~amd64 ~x86"
70 @@ -20,14 +20,12 @@
71 !x11-drivers/ati-drivers:0
72 !x11-apps/ati-drivers-extra
73 >=app-admin/eselect-opengl-1.0.7
74 + sys-power/acpid
75 + x11-apps/xauth
76 >=x11-base/xorg-server-1.5.3-r7
77 x11-libs/libXinerama
78 x11-libs/libXrandr
79 - acpi? (
80 - sys-power/acpid
81 - x11-apps/xauth
82 - )
83 - amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs ) )
84 + multilib? ( app-emulation/emul-linux-x86-xlibs )
85 "
86
87 DEPEND="${RDEPEND}
88 @@ -231,21 +229,20 @@
89 "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
90 || die "bin rm failed"
91
92 - if use acpi; then
93 - sed -i \
94 - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
95 - -e "s:/var/lib/gdm/:/var/gdm/:" \
96 - "${S}/common/etc/ati/authatieventsd.sh" \
97 - || die "sed failed."
98 -
99 - # Since "who" is in coreutils, we're using that one instead of "finger".
100 - sed -i -e 's:finger:who:' \
101 - "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
102 - || die "Replacing 'finger' with 'who' failed."
103 - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
104 - # add function to detect default state.
105 - epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
106 - fi
107 + # ACPI fixups
108 + sed -i \
109 + -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
110 + -e "s:/var/lib/gdm/:/var/gdm/:" \
111 + "${S}/common/etc/ati/authatieventsd.sh" \
112 + || die "sed failed."
113 +
114 + # Since "who" is in coreutils, we're using that one instead of "finger".
115 + sed -i -e 's:finger:who:' \
116 + "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
117 + || die "Replacing 'finger' with 'who' failed."
118 + # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
119 + # add function to detect default state.
120 + epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
121
122 cd "${MODULE_DIR}"
123 ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
124 @@ -370,9 +367,7 @@
125 # Arch-specific files.
126 # (s)bin.
127 into /opt
128 - if use acpi; then
129 - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die
130 - fi
131 + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die
132 # We cleaned out the compilable stuff in src_unpack
133 dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die
134
135 @@ -390,10 +385,8 @@
136 insinto /etc/ati
137 # Everything except for the authatieventsd.sh script.
138 doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
139 - if use acpi; then
140 - insopts -m0755
141 - doins common/etc/ati/authatieventsd.sh || die
142 - fi
143 + insopts -m0755
144 + doins common/etc/ati/authatieventsd.sh || die
145
146 # include.
147 insinto /usr
148 @@ -416,18 +409,16 @@
149 # doc.
150 dohtml -r common/usr/share/doc/fglrx || die
151
152 - if use acpi; then
153 - doman common/usr/share/man/man8/atieventsd.8 || die
154 + doman common/usr/share/man/man8/atieventsd.8 || die
155
156 - pushd common/usr/share/doc/fglrx/examples/etc/acpi > /dev/null
157 + pushd common/usr/share/doc/fglrx/examples/etc/acpi > /dev/null
158
159 - exeinto /etc/acpi
160 - doexe ati-powermode.sh || die
161 - insinto /etc/acpi/events
162 - doins events/* || die
163 + exeinto /etc/acpi
164 + doexe ati-powermode.sh || die
165 + insinto /etc/acpi/events
166 + doins events/* || die
167
168 - popd > /dev/null
169 - fi
170 + popd > /dev/null
171
172 # Done with the "source" tree. Install tools we rebuilt:
173 dobin extra/fgl_glxgears/fgl_glxgears || die
174 @@ -441,12 +432,10 @@
175 newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma || die
176
177 # Gentoo-specific stuff:
178 - if use acpi; then
179 - newinitd "${FILESDIR}"/atieventsd.init atieventsd \
180 - || die "Failed to install atieventsd.init.d"
181 - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
182 - newconfd "${T}"/atieventsd.conf atieventsd || die
183 - fi
184 + newinitd "${FILESDIR}"/atieventsd.init atieventsd \
185 + || die "Failed to install atieventsd.init.d"
186 + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
187 + newconfd "${T}"/atieventsd.conf atieventsd || die
188 }
189
190 src_install-libs() {
Report Message
Find on MARC Find on Google Groups