1 |
dberkholz 08/09/11 17:48:54 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xorg-x11-7.4.ebuild |
5 |
Log: |
6 |
Version bump. We now pull in the exact packages and versions as 7.4 will be released by X.Org, so you may see some additional fonts and apps. |
7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.595 x11-base/xorg-x11/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-x11/ChangeLog?rev=1.595&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-x11/ChangeLog?rev=1.595&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-x11/ChangeLog?r1=1.594&r2=1.595 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v |
19 |
retrieving revision 1.594 |
20 |
retrieving revision 1.595 |
21 |
diff -u -r1.594 -r1.595 |
22 |
--- ChangeLog 9 Oct 2007 07:43:49 -0000 1.594 |
23 |
+++ ChangeLog 11 Sep 2008 17:48:53 -0000 1.595 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for x11-base/xorg-x11 |
26 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.594 2007/10/09 07:43:49 dberkholz Exp $ |
28 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.595 2008/09/11 17:48:53 dberkholz Exp $ |
30 |
+ |
31 |
+*xorg-x11-7.4 (11 Sep 2008) |
32 |
+ |
33 |
+ 11 Sep 2008; Donnie Berkholz <dberkholz@g.o>; +xorg-x11-7.4.ebuild: |
34 |
+ Version bump. We now pull in the exact packages and versions as 7.4 will |
35 |
+ be released by X.Org, so you may see some additional fonts and apps. |
36 |
|
37 |
09 Oct 2007; Donnie Berkholz <dberkholz@g.o>; xorg-x11-7.2.ebuild, |
38 |
xorg-x11-7.3.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-base/xorg-x11/xorg-x11-7.4.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: xorg-x11-7.4.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4.ebuild,v 1.1 2008/09/11 17:48:53 dberkholz Exp $ |
52 |
|
53 |
inherit eutils |
54 |
|
55 |
DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)" |
56 |
HOMEPAGE="http://xorg.freedesktop.org" |
57 |
|
58 |
LICENSE="as-is" |
59 |
SLOT="0" |
60 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
61 |
|
62 |
# Collision protect will scream bloody murder if we install over old versions |
63 |
RDEPEND="!<=x11-base/xorg-x11-6.9" |
64 |
|
65 |
# Server |
66 |
RDEPEND="${RDEPEND} |
67 |
>=x11-base/xorg-server-1.5.0" |
68 |
|
69 |
# Applications |
70 |
RDEPEND="${RDEPEND} |
71 |
>=x11-apps/appres-1.0.1 |
72 |
>=x11-apps/bitmap-1.0.3 |
73 |
>=x11-apps/iceauth-1.0.2 |
74 |
>=x11-apps/luit-1.0.3 |
75 |
>=x11-apps/mkfontdir-1.0.4 |
76 |
>=x11-apps/mkfontscale-1.0.5 |
77 |
>=x11-apps/sessreg-1.0.4 |
78 |
>=x11-apps/setxkbmap-1.0.4 |
79 |
>=x11-apps/smproxy-1.0.2 |
80 |
>=x11-apps/x11perf-1.5 |
81 |
>=x11-apps/xauth-1.0.3 |
82 |
>=x11-apps/xbacklight-1.1 |
83 |
>=x11-apps/xcmsdb-1.0.1 |
84 |
>=x11-apps/xcursorgen-1.0.2 |
85 |
>=x11-apps/xdpyinfo-1.0.3 |
86 |
>=x11-apps/xdriinfo-1.0.2 |
87 |
>=x11-apps/xev-1.0.3 |
88 |
>=x11-apps/xf86dga-1.0.2 |
89 |
>=x11-apps/xgamma-1.0.2 |
90 |
>=x11-apps/xhost-1.0.2 |
91 |
>=x11-misc/xinput-1.3.0 |
92 |
>=x11-apps/xkbcomp-1.0.5 |
93 |
>=x11-apps/xkbevd-1.0.2 |
94 |
>=x11-apps/xkbutils-1.0.1 |
95 |
>=x11-apps/xkill-1.0.1 |
96 |
>=x11-apps/xlsatoms-1.0.1 |
97 |
>=x11-apps/xlsclients-1.0.1 |
98 |
>=x11-apps/xmodmap-1.0.3 |
99 |
>=x11-apps/xpr-1.0.2 |
100 |
>=x11-apps/xprop-1.0.4 |
101 |
>=x11-apps/xrandr-1.2.3 |
102 |
>=x11-apps/xrdb-1.0.5 |
103 |
>=x11-apps/xrefresh-1.0.2 |
104 |
>=x11-apps/xset-1.0.4 |
105 |
>=x11-apps/xsetmode-1.0.0 |
106 |
>=x11-apps/xsetroot-1.0.2 |
107 |
>=x11-apps/xvinfo-1.0.2 |
108 |
>=x11-apps/xwd-1.0.2 |
109 |
>=x11-apps/xwininfo-1.0.4 |
110 |
>=x11-apps/xwud-1.0.1 |
111 |
" |
112 |
|
113 |
# Libraries |
114 |
# AppleWM, WindowsWM, and dmx removed from upstream list |
115 |
RDEPEND="${RDEPEND} |
116 |
>=x11-libs/libFS-1.0.1 |
117 |
>=x11-libs/libICE-1.0.4 |
118 |
>=x11-libs/libSM-1.1.0 |
119 |
>=x11-libs/libX11-1.1.5 |
120 |
>=x11-libs/libXScrnSaver-1.1.3 |
121 |
>=x11-libs/libXau-1.0.4 |
122 |
>=x11-libs/libXaw-1.0.4 |
123 |
>=x11-libs/libXcomposite-0.4.0 |
124 |
>=x11-libs/libXcursor-1.1.9 |
125 |
>=x11-libs/libXdamage-1.1.1 |
126 |
>=x11-libs/libXdmcp-1.0.2 |
127 |
>=x11-libs/libXext-1.0.4 |
128 |
>=x11-libs/libXfixes-4.0.3 |
129 |
>=x11-libs/libXfont-1.3.3 |
130 |
>=x11-libs/libXfontcache-1.0.4 |
131 |
>=x11-libs/libXft-2.1.13 |
132 |
>=x11-libs/libXi-1.1.3 |
133 |
>=x11-libs/libXinerama-1.0.3 |
134 |
>=x11-libs/libXmu-1.0.4 |
135 |
>=x11-libs/libXpm-3.5.7 |
136 |
>=x11-libs/libXrandr-1.2.3 |
137 |
>=x11-libs/libXrender-0.9.4 |
138 |
>=x11-libs/libXres-1.0.3 |
139 |
>=x11-libs/libXt-1.0.5 |
140 |
>=x11-libs/libXtst-1.0.3 |
141 |
>=x11-libs/libXv-1.0.4 |
142 |
>=x11-libs/libXvMC-1.0.4 |
143 |
>=x11-libs/libXxf86dga-1.0.2 |
144 |
>=x11-libs/libXxf86misc-1.0.1 |
145 |
>=x11-libs/libXxf86vm-1.0.2 |
146 |
>=x11-libs/libfontenc-1.0.4 |
147 |
>=x11-libs/libpciaccess-0.10.3 |
148 |
>=x11-libs/libxkbfile-1.0.5 |
149 |
>=x11-libs/xtrans-1.2.1 |
150 |
" |
151 |
|
152 |
# Protocol headers |
153 |
# AppleWM, WindowsWM, and dmx removed from upstream list |
154 |
DEPEND="${DEPEND} |
155 |
>=x11-proto/bigreqsproto-1.0.2 |
156 |
>=x11-proto/compositeproto-0.4 |
157 |
>=x11-proto/damageproto-1.1.0 |
158 |
>=x11-proto/evieext-1.0.2 |
159 |
>=x11-proto/fixesproto-4.0 |
160 |
>=x11-proto/fontcacheproto-0.1.2 |
161 |
>=x11-proto/fontsproto-2.0.2 |
162 |
>=x11-proto/glproto-1.4.9 |
163 |
>=x11-proto/inputproto-1.4.4 |
164 |
>=x11-proto/kbproto-1.0.3 |
165 |
>=x11-proto/randrproto-1.2.1 |
166 |
>=x11-proto/recordproto-1.13.2 |
167 |
>=x11-proto/renderproto-0.9.3 |
168 |
>=x11-proto/resourceproto-1.0.2 |
169 |
>=x11-proto/scrnsaverproto-1.1.0 |
170 |
>=x11-proto/trapproto-3.4.3 |
171 |
>=x11-proto/videoproto-2.2.2 |
172 |
>=x11-proto/xcmiscproto-1.1.2 |
173 |
>=x11-proto/xextproto-7.0.3 |
174 |
>=x11-proto/xf86bigfontproto-1.1.2 |
175 |
>=x11-proto/xf86dgaproto-2.0.3 |
176 |
>=x11-proto/xf86driproto-2.0.4 |
177 |
>=x11-proto/xf86miscproto-0.9.2 |
178 |
>=x11-proto/xf86vidmodeproto-2.2.2 |
179 |
>=x11-proto/xineramaproto-1.1.2 |
180 |
>=x11-proto/xproto-7.0.13 |
181 |
" |
182 |
|
183 |
# Data |
184 |
RDEPEND="${RDEPEND} |
185 |
>=x11-misc/xbitmaps-1.0.1 |
186 |
>=x11-themes/xcursor-themes-1.0.1 |
187 |
" |
188 |
|
189 |
# Utilities |
190 |
RDEPEND="${RDEPEND} |
191 |
>=x11-misc/makedepend-1.0.1 |
192 |
>=x11-misc/util-macros-1.1.6-r1 |
193 |
" |
194 |
|
195 |
# Fonts |
196 |
RDEPEND="${RDEPEND} |
197 |
>=media-fonts/font-adobe-100dpi-1.0.0 |
198 |
>=media-fonts/font-adobe-75dpi-1.0.0 |
199 |
>=media-fonts/font-adobe-utopia-100dpi-1.0.1 |
200 |
>=media-fonts/font-adobe-utopia-75dpi-1.0.1 |
201 |
>=media-fonts/font-adobe-utopia-type1-1.0.1 |
202 |
>=media-fonts/font-alias-1.0.1 |
203 |
>=media-fonts/font-arabic-misc-1.0.0 |
204 |
>=media-fonts/font-bh-100dpi-1.0.0 |
205 |
>=media-fonts/font-bh-75dpi-1.0.0 |
206 |
>=media-fonts/font-bh-lucidatypewriter-100dpi-1.0.0 |
207 |
>=media-fonts/font-bh-lucidatypewriter-75dpi-1.0.0 |
208 |
>=media-fonts/font-bh-ttf-1.0.0 |
209 |
>=media-fonts/font-bh-type1-1.0.0 |
210 |
>=media-fonts/font-bitstream-100dpi-1.0.0 |
211 |
>=media-fonts/font-bitstream-75dpi-1.0.0 |
212 |
>=media-fonts/font-bitstream-speedo-1.0.0 |
213 |
>=media-fonts/font-bitstream-type1-1.0.0 |
214 |
>=media-fonts/font-cronyx-cyrillic-1.0.0 |
215 |
>=media-fonts/font-cursor-misc-1.0.0 |
216 |
>=media-fonts/font-daewoo-misc-1.0.0 |
217 |
>=media-fonts/font-dec-misc-1.0.0 |
218 |
>=media-fonts/font-ibm-type1-1.0.0 |
219 |
>=media-fonts/font-isas-misc-1.0.0 |
220 |
>=media-fonts/font-jis-misc-1.0.0 |
221 |
>=media-fonts/font-micro-misc-1.0.0 |
222 |
>=media-fonts/font-misc-cyrillic-1.0.0 |
223 |
>=media-fonts/font-misc-ethiopic-1.0.0 |
224 |
>=media-fonts/font-misc-meltho-1.0.0 |
225 |
>=media-fonts/font-misc-misc-1.0.0 |
226 |
>=media-fonts/font-mutt-misc-1.0.0 |
227 |
>=media-fonts/font-schumacher-misc-1.0.0 |
228 |
>=media-fonts/font-screen-cyrillic-1.0.1 |
229 |
>=media-fonts/font-sony-misc-1.0.0 |
230 |
>=media-fonts/font-sun-misc-1.0.0 |
231 |
>=media-fonts/font-util-1.0.1 |
232 |
>=media-fonts/font-winitzki-cyrillic-1.0.0 |
233 |
>=media-fonts/font-xfree86-type1-1.0.1 |
234 |
|
235 |
>=media-fonts/font-alias-1.0.1 |
236 |
>=media-fonts/font-util-1.0.1 |
237 |
>=media-fonts/encodings-1.0.2 |
238 |
" |
239 |
|
240 |
# Documentation |
241 |
RDEPEND="${RDEPEND} |
242 |
>=app-doc/xorg-sgml-doctools-1.2 |
243 |
" |
244 |
# Not released yet |
245 |
# >=app-doc/xorg-docs-1.5.0 |
246 |
|
247 |
DEPEND="${RDEPEND}" |
248 |
|
249 |
src_install() { |
250 |
# Make /usr/X11R6 a symlink to ../usr. |
251 |
dodir /usr |
252 |
dosym ../usr /usr/X11R6 |
253 |
} |
254 |
|
255 |
pkg_preinst() { |
256 |
# Check for /usr/X11R6 -> /usr symlink |
257 |
if [[ -e "${ROOT}usr/X11R6" ]] && |
258 |
[[ $(readlink "${ROOT}usr/X11R6") != "../usr" ]]; then |
259 |
eerror "${ROOT}usr/X11R6 isn't a symlink to ../usr. Please delete it." |
260 |
ewarn "First, save a list of all the packages installing there:" |
261 |
ewarn " equery belongs ${ROOT}usr/X11R6 > usr-x11r6-packages" |
262 |
ewarn "This requires gentoolkit to be installed." |
263 |
die "${ROOT}usr/X11R6 is not a symlink to ../usr." |
264 |
fi |
265 |
|
266 |
# Filter out ModulePath line since it often holds a now-invalid path |
267 |
# Bug #112924 |
268 |
# For RC3 - filter out RgbPath line since it also seems to break things |
269 |
XORGCONF="/etc/X11/xorg.conf" |
270 |
if [[ -e ${ROOT}${XORGCONF} ]]; then |
271 |
mkdir -p "${D}/etc/X11" |
272 |
sed "/ModulePath/d" "${ROOT}${XORGCONF}" > "${D}${XORGCONF}" |
273 |
sed -i "/RgbPath/d" "${D}${XORGCONF}" |
274 |
fi |
275 |
} |
276 |
|
277 |
pkg_postinst() { |
278 |
elog |
279 |
elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}." |
280 |
elog "Any custom cursor sets should be placed in that directory." |
281 |
elog |
282 |
elog "If you wish to set system-wide default cursors, please create" |
283 |
elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme" |
284 |
elog "with content: \"Inherits=theme_name\" so that future" |
285 |
elog "emerges will not overwrite those settings." |
286 |
elog |
287 |
elog "Listening on TCP is disabled by default with startx." |
288 |
elog "To enable it, edit ${ROOT}usr/bin/startx." |
289 |
elog |
290 |
|
291 |
elog "If you encounter any non-configuration issues, please file a bug at" |
292 |
elog "http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux" |
293 |
elog "and attach ${ROOT}etc/X11/xorg.conf, ${ROOT}var/log/Xorg.0.log and emerge info" |
294 |
elog |
295 |
elog "You can choose which drivers are installed with the VIDEO_CARDS" |
296 |
elog "and INPUT_DEVICES settings. Set these like any other Portage" |
297 |
elog "variable in ${ROOT}etc/make.conf or on the command line." |
298 |
elog |
299 |
|
300 |
# (#76985) |
301 |
elog "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" |
302 |
elog "for more information on configuring X." |
303 |
elog |
304 |
|
305 |
# Try to get people to read this, pending #11359 |
306 |
ebeep 5 |
307 |
epause 10 |
308 |
} |