/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.61 Revision 1.121
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.61 2006/06/28 02:20:31 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.121 2011/08/29 01:28:10 vapier Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# @DEPRECATED
6# This eclass has been superseded by xorg-2
7# Please modify your ebuilds to use that instead
6# 8#
7# This eclass is designed to reduce code duplication in the modularized X11 9# @ECLASS: x-modular.eclass
8# ebuilds. 10# @MAINTAINER:
11# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
12# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
13# @DESCRIPTION:
14# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
15# and more. Many things that would normally be done in various functions
16# can be accessed by setting variables instead, such as patching,
17# running eautoreconf, passing options to configure and installing docs.
9# 18#
10# Using this eclass: 19# All you need to do in a basic ebuild is inherit this eclass and set
11# 20# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches 21# with the other X packages, you don't need to set SRC_URI. Pretty much
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25#
26# Pretty much everything else should be automatic. 22# everything else should be automatic.
27 23
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 24if [[ ${PV} = 9999* ]]; then
29 25 GIT_ECLASS="git"
30inherit eutils libtool toolchain-funcs flag-o-matic autotools 26 SNAPSHOT="yes"
31 27 SRC_URI=""
32# Directory prefix to use for everything
33XDIR="/usr"
34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40
41IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/"
43
44# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI}
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
57elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI}
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI}
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi
73
74SLOT="0"
75
76# Set the license for the package. This can be overridden by setting
77# LICENSE after the inherit.
78LICENSE=${PN}
79
80# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4"
88fi 28fi
89 29
90# If we're a font package, but not the font.alias one 30# If we're a font package, but not the font.alias one
31FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 32if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 33 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 34 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 35 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 36 # Activate font code in the rest of the eclass
96 FONT="yes" 37 FONT="yes"
97 38
39 # Whether to inherit the font eclass
40 FONT_ECLASS="font"
41fi
42
43inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
44 ${FONT_ECLASS} ${GIT_ECLASS}
45
46EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
47
48case "${EAPI:-0}" in
49 0|1)
50 ;;
51 2)
52 EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
53 ;;
54 *)
55 die "Unknown EAPI ${EAPI}"
56 ;;
57esac
58
59# exports must be ALWAYS after inherit
60EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
61
62# @ECLASS-VARIABLE: XDIR
63# @DESCRIPTION:
64# Directory prefix to use for everything. If you want to install to a
65# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
66# recently tested. You may need to uncomment the setting of datadir and
67# mandir in x-modular_src_install() or add it back in if it's no longer
68# there. You may also want to change the SLOT.
69XDIR="/usr"
70
71IUSE=""
72HOMEPAGE="http://xorg.freedesktop.org/"
73
74# @ECLASS-VARIABLE: SNAPSHOT
75# @DESCRIPTION:
76# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
77# before inheriting this eclass.
78: ${SNAPSHOT:=no}
79
80# Set up SRC_URI for individual modular releases
81BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
82# @ECLASS-VARIABLE: MODULE
83# @DESCRIPTION:
84# The subdirectory to download source from. Possible settings are app,
85# doc, data, util, driver, font, lib, proto, xserver. Set above the
86# inherit to override the default autoconfigured module.
87if [[ -z ${MODULE} ]]; then
88 case ${CATEGORY} in
89 app-doc) MODULE="doc" ;;
90 media-fonts) MODULE="font" ;;
91 x11-apps|x11-wm) MODULE="app" ;;
92 x11-misc|x11-themes) MODULE="util" ;;
93 x11-drivers) MODULE="driver" ;;
94 x11-base) MODULE="xserver" ;;
95 x11-proto) MODULE="proto" ;;
96 x11-libs) MODULE="lib" ;;
97 esac
98fi
99
100if [[ -n ${GIT_ECLASS} ]]; then
101 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
102else
103 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
104fi
105
106SLOT="0"
107
108# Set the license for the package. This can be overridden by setting
109# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
110# are under the MIT license. (This is what Red Hat does in their rpms)
111LICENSE="MIT"
112
113# Set up shared dependencies
114if [[ -n "${SNAPSHOT}" ]]; then
115# FIXME: What's the minimal libtool version supporting arbitrary versioning?
116 DEPEND="${DEPEND}
117 >=sys-devel/libtool-1.5
118 >=sys-devel/m4-1.4"
119 WANT_AUTOCONF="latest"
120 WANT_AUTOMAKE="latest"
121fi
122
123if [[ -n "${FONT}" ]]; then
98 RDEPEND="${RDEPEND} 124 RDEPEND="${RDEPEND}
99 media-fonts/encodings 125 media-fonts/encodings
100 x11-apps/mkfontscale 126 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 127 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 128 PDEPEND="${PDEPEND}
103 media-fonts/font-alias" 129 media-fonts/font-alias"
104 130
105 # Starting with 7.0RC3, we can specify the font directory 131 # Starting with 7.0RC3, we can specify the font directory
106 # But oddly, we can't do the same for encodings or font-alias 132 # But oddly, we can't do the same for encodings or font-alias
107 133
108 # Wrap in `if` so ebuilds can set it too 134# @ECLASS-VARIABLE: FONT_DIR
109 if [[ -z ${FONT_DIR} ]]; then 135# @DESCRIPTION:
136# If you're creating a font package and the suffix of PN is not equal to
137# the subdirectory of /usr/share/fonts/ it should install into, set
138# FONT_DIR to that directory or directories. Set before inheriting this
139# eclass.
110 FONT_DIR=${PN##*-} 140 : ${FONT_DIR:=${PN##*-}}
111
112 fi
113 141
114 # Fix case of font directories 142 # Fix case of font directories
115 FONT_DIR=${FONT_DIR/ttf/TTF} 143 FONT_DIR=${FONT_DIR/ttf/TTF}
116 FONT_DIR=${FONT_DIR/otf/OTF} 144 FONT_DIR=${FONT_DIR/otf/OTF}
117 FONT_DIR=${FONT_DIR/type1/Type1} 145 FONT_DIR=${FONT_DIR/type1/Type1}
118 FONT_DIR=${FONT_DIR/speedo/Speedo} 146 FONT_DIR=${FONT_DIR/speedo/Speedo}
119 147
120 # Set up configure option 148 # Set up configure options, wrapped so ebuilds can override if need be
149 if [[ -z ${FONT_OPTIONS} ]]; then
121 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 150 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
151 fi
122 152
123 if [[ -n "${FONT}" ]]; then 153 if [[ -n "${FONT}" ]]; then
124 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 154 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
125 IUSE="${IUSE} nls" 155 IUSE="${IUSE} nls"
126 fi 156 fi
127 fi 157 fi
128fi 158fi
129 159
130# If we're a driver package 160# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 161if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 162 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 163 DRIVER="yes"
134
135 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
138fi 164fi
139 165
140# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
143 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 169 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
144 || [[ "${PN/util-macros}" != "${PN}" ]] \ 170 && [[ "${PN/util-macros}" = "${PN}" ]] \
145 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 171 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
146 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 172 && [[ "${PN/xkbdata}" = "${PN}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 173 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \ 174 && [[ "${PN/xcursor}" = "${PN}" ]] \
149 ; then 175 ; then
150 DEBUGGABLE="yes" 176 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug" 177 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
157fi 178fi
158 179
159DEPEND="${DEPEND} 180DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 181 >=dev-util/pkgconfig-0.18"
161 182
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 183if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 184 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 185 >=x11-misc/util-macros-1.3.0
186 sys-devel/binutils"
165fi 187fi
166 188
167RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
168 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 192# x11-base/x11-env"
171 193
194# @FUNCTION: x-modular_specs_check
195# @USAGE:
196# @DESCRIPTION:
197# Make any necessary changes related to gcc specs (generally hardened)
172x-modular_specs_check() { 198x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 199 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 200 append-ldflags -Wl,-z,lazy
175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
176 eerror "$msg"
177 die "$msg"
178 fi
179
180 # (#116698) breaks loading 201 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 202 filter-ldflags -Wl,-z,now
182 fi 203 fi
183} 204}
184 205
206# @FUNCTION: x-modular_dri_check
207# @USAGE:
208# @DESCRIPTION:
209# Ensures the server supports DRI if building a driver with DRI support
185x-modular_dri_check() { 210x-modular_dri_check() {
186 # (#120057) Enabling DRI in drivers requires that the server was built with 211 # (#120057) Enabling DRI in drivers requires that the server was built with
187 # support for it 212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
188 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
189 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
190 einfo "Checking for direct rendering capabilities ..." 217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
191 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
192 die "You must build x11-base/xorg-server with USE=dri." 224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
193 fi 226 fi
194 fi 227 fi
195 fi 228 fi
196} 229}
197 230
231# @FUNCTION: x-modular_server_supports_drivers_check
232# @USAGE:
233# @DESCRIPTION:
234# Ensures the server SDK is installed if a driver is being built
198x-modular_server_supports_drivers_check() { 235x-modular_server_supports_drivers_check() {
199 # (#135873) Only certain servers will actually use or be capable of 236 # (#135873) Only certain servers will actually use or be capable of
200 # building external drivers, including binary drivers. 237 # building external drivers, including binary drivers.
201 if [[ -n "${DRIVER}" ]]; then 238 if [[ -n "${DRIVER}" ]]; then
239 if has_version '>=x11-base/xorg-server-1.1'; then
202 if ! built_with_use x11-base/xorg-server xorg; then 240 if ! built_with_use x11-base/xorg-server xorg; then
203 eerror "x11-base/xorg-server is not built with support for external drivers." 241 eerror "x11-base/xorg-server is not built with support for external drivers."
204 die "You must build x11-base/xorg-server with USE=xorg." 242 die "You must build x11-base/xorg-server with USE=xorg."
205 fi 243 fi
206 fi 244 fi
245 fi
207} 246}
208 247
248# @FUNCTION: x-modular_unpack_source
249# @USAGE:
250# @DESCRIPTION:
251# Simply unpack source code. Nothing else.
209x-modular_unpack_source() { 252x-modular_unpack_source() {
253 if [[ -n ${GIT_ECLASS} ]]; then
254 git_src_unpack
255 else
210 unpack ${A} 256 unpack ${A}
257 fi
211 cd ${S} 258 cd "${S}"
212 259
213 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
214 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
215 fi 262 fi
216} 263}
217 264
265# @FUNCTION: x-modular_patch_source
266# @USAGE:
267# @DESCRIPTION:
268# Apply all patches
218x-modular_patch_source() { 269x-modular_patch_source() {
219 # Use standardized names and locations with bulk patching 270 # Use standardized names and locations with bulk patching
220 # Patch directory is ${WORKDIR}/patch 271 # Patch directory is ${WORKDIR}/patch
221 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
222 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
223 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
224 fi 275 fi
225 276
226 # If this is a driver package we need to fix man page install location. 277# @VARIABLE: PATCHES
227 # Running autoreconf will use the patched util-macros to make the 278# @DESCRIPTION:
228 # change for us, so we only need to patch if it is not going to run. 279# If you have any patches to apply, set PATCHES to their locations and epatch
229 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 280# will apply them. It also handles epatch-style bulk patches, if you know how to
230 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 281# use them and set the correct variables. If you don't, read eutils.eclass.
231 fi 282 if [[ ${#PATCHES[@]} -gt 1 ]]; then
232 283 for x in "${PATCHES[@]}"; do
233 # For specific list of patches 284 epatch "${x}"
285 done
234 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
235 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
236 do
237 epatch ${PATCH} 288 epatch "${x}"
238 done 289 done
239 # For non-default directory bulk patching 290 # For non-default directory bulk patching
240 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
241 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
242 # For standard bulk patching 293 # For standard bulk patching
243 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
244 epatch 295 epatch
245 fi 296 fi
246} 297}
247 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
248x-modular_reconf_source() { 303x-modular_reconf_source() {
249 # Run autoreconf for CVS snapshots only
250 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
251 then 305 then
252 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
253 if [ -f "${S}/configure.ac" ] 307 if [ -f "./configure.ac" ]
254 then 308 then
255 eautoreconf 309 eautoreconf
256 fi 310 fi
257 fi 311 fi
258 312
259 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
260 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
261 elibtoolize 315 elibtoolize
262} 316}
263 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
329# @FUNCTION: x-modular_src_unpack
330# @USAGE:
331# @DESCRIPTION:
332# Unpack a package, performing all X-related tasks.
264x-modular_src_unpack() { 333x-modular_src_unpack() {
265 x-modular_specs_check 334 x-modular_specs_check
266 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
267 x-modular_dri_check 336 x-modular_dri_check
268 x-modular_unpack_source 337 x-modular_unpack_source
269 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
270 x-modular_reconf_source
271} 339}
272 340
341# @FUNCTION: x-modular_font_configure
342# @USAGE:
343# @DESCRIPTION:
344# If a font package, perform any necessary configuration steps
273x-modular_font_configure() { 345x-modular_font_configure() {
274 if [[ -n "${FONT}" ]]; then 346 if [[ -n "${FONT}" ]]; then
275 # Might be worth adding an option to configure your desired font 347 # Might be worth adding an option to configure your desired font
276 # and exclude all others. Also, should this USE be nls or minimal? 348 # and exclude all others. Also, should this USE be nls or minimal?
277 if ! use nls; then 349 if has nls ${IUSE//+} && ! use nls; then
278 FONT_OPTIONS="${FONT_OPTIONS} 350 FONT_OPTIONS="${FONT_OPTIONS}
279 --disable-iso8859-2 351 --disable-iso8859-2
280 --disable-iso8859-3 352 --disable-iso8859-3
281 --disable-iso8859-4 353 --disable-iso8859-4
282 --disable-iso8859-5 354 --disable-iso8859-5
295 --disable-koi8-r" 367 --disable-koi8-r"
296 fi 368 fi
297 fi 369 fi
298} 370}
299 371
372# @FUNCTION: x-modular_debug_setup
373# @USAGE:
374# @DESCRIPTION:
375# Set up CFLAGS for a debug build
300x-modular_debug_setup() { 376x-modular_debug_setup() {
301 if [[ -n "${DEBUGGABLE}" ]]; then 377 if [[ -n "${DEBUGGABLE}" ]]; then
302 if use debug; then 378 if use debug; then
303 strip-flags 379 strip-flags
304 append-flags -g 380 append-flags -g
305 fi 381 fi
306 fi 382 fi
307} 383}
308 384
385# @FUNCTION: x-modular_src_configure
386# @USAGE:
387# @DESCRIPTION:
388# Perform any necessary pre-configuration steps, then run configure
309x-modular_src_configure() { 389x-modular_src_configure() {
310 x-modular_font_configure 390 x-modular_font_configure
311 x-modular_debug_setup 391 x-modular_debug_setup
312 392
393# @VARIABLE: CONFIGURE_OPTIONS
394# @DESCRIPTION:
395# Any extra options to pass to configure
396
313 # If prefix isn't set here, .pc files cause problems 397 # If prefix isn't set here, .pc files cause problems
314 if [[ -x ./configure ]]; then 398 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
315 econf --prefix=${XDIR} \ 399 econf --prefix=${XDIR} \
316 --datadir=${XDIR}/share \ 400 --datadir=${XDIR}/share \
317 ${FONT_OPTIONS} \ 401 ${FONT_OPTIONS} \
318 ${DRIVER_OPTIONS} \ 402 ${DRIVER_OPTIONS} \
319 ${CONFIGURE_OPTIONS} 403 ${CONFIGURE_OPTIONS}
320 fi 404 fi
321} 405}
322 406
407# @FUNCTION: x-modular_src_make
408# @USAGE:
409# @DESCRIPTION:
410# Run make.
323x-modular_src_make() { 411x-modular_src_make() {
324 emake || die "emake failed" 412 emake || die "emake failed"
325} 413}
326 414
415# @FUNCTION: x-modular_src_compile
416# @USAGE:
417# @DESCRIPTION:
418# Compile a package, performing all X-related tasks.
327x-modular_src_compile() { 419x-modular_src_compile() {
328 x-modular_src_configure 420 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
329 x-modular_src_make 421 x-modular_src_make
330} 422}
331 423
424# @FUNCTION: x-modular_src_install
425# @USAGE:
426# @DESCRIPTION:
427# Install a built package to ${D}, performing any necessary steps.
428# Creates a ChangeLog from git if using live ebuilds.
332x-modular_src_install() { 429x-modular_src_install() {
333 # Install everything to ${XDIR} 430 # Install everything to ${XDIR}
431 if [[ ${CATEGORY} = x11-proto ]]; then
334 make \ 432 make \
433 ${PN/proto/}docdir=/usr/share/doc/${PF} \
335 DESTDIR="${D}" \ 434 DESTDIR="${D}" \
336 install 435 install \
436 || die
437 else
438 make \
439 docdir=/usr/share/doc/${PF} \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
337# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
338# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
339# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
340# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
341 448
449 if [[ -n ${GIT_ECLASS} ]]; then
450 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
451 git log ${GIT_TREE} > "${S}"/ChangeLog
452 popd
453 fi
454
342 if [[ -e ${S}/ChangeLog ]]; then 455 if [[ -e ${S}/ChangeLog ]]; then
343 dodoc ${S}/ChangeLog 456 dodoc "${S}"/ChangeLog
344 fi 457 fi
345 458# @VARIABLE: DOCS
346 # Make sure docs get compressed 459# @DESCRIPTION:
347 prepalldocs 460# Any documentation to install via dodoc
461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
348 462
349 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
350 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
351 find ${D}/usr/lib/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
352 | xargs rm -f 466 | xargs rm -f
353 fi 467 fi
354 468
355 # Don't install overlapping fonts.* files
356 # Generate them instead when possible
357 if [[ -n "${FONT}" ]]; then 469 if [[ -n "${FONT}" ]]; then
358 remove_font_metadata 470 remove_font_metadata
359 fi 471 fi
360}
361 472
473 if [[ -n "${DRIVER}" ]]; then
474 install_driver_hwdata
475 fi
476}
477
478# @FUNCTION: x-modular_pkg_preinst
479# @USAGE:
480# @DESCRIPTION:
481# This function doesn't do anything right now, but it may in the future.
362x-modular_pkg_preinst() { 482x-modular_pkg_preinst() {
363 if [[ -n "${FONT}" ]]; then 483 # We no longer do anything here, but we can't remove it from the API
364 discover_font_dirs 484 :
365 fi
366} 485}
367 486
487# @FUNCTION: x-modular_pkg_postinst
488# @USAGE:
489# @DESCRIPTION:
490# Run X-specific post-installation tasks on the live filesystem. The
491# only task right now is some setup for font packages.
368x-modular_pkg_postinst() { 492x-modular_pkg_postinst() {
369 if [[ -n "${FONT}" ]]; then 493 if [[ -n "${FONT}" ]]; then
370 setup_fonts 494 setup_fonts
371 fi 495 fi
372} 496}
373 497
498# @FUNCTION: x-modular_pkg_postrm
499# @USAGE:
500# @DESCRIPTION:
501# Run X-specific post-removal tasks on the live filesystem. The only
502# task right now is some cleanup for font packages.
374x-modular_pkg_postrm() { 503x-modular_pkg_postrm() {
375 if [[ -n "${FONT}" ]]; then 504 if [[ -n "${FONT}" ]]; then
376 cleanup_fonts 505 font_pkg_postrm
377 fi
378}
379
380cleanup_fonts() {
381 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
382 for DIR in ${FONT_DIR}; do
383 unset KEEP_FONTDIR
384 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
385
386 ebegin "Checking ${REAL_DIR} for useless files"
387 pushd ${REAL_DIR} &> /dev/null
388 for FILE in *; do
389 unset MATCH
390 for ALLOWED_FILE in ${ALLOWED_FILES}; do
391 if [[ ${FILE} = ${ALLOWED_FILE} ]]; then
392 # If it's allowed, then move on to the next file
393 MATCH="yes"
394 break
395 fi
396 done
397 # If we found a match in allowed files, move on to the next file
398 if [[ -n ${MATCH} ]]; then
399 continue
400 fi
401 # If we get this far, there wasn't a match in the allowed files
402 KEEP_FONTDIR="yes"
403 # We don't need to check more files if we're already keeping it
404 break
405 done
406 popd &> /dev/null
407 # If there are no files worth keeping, then get rid of the dir
408 if [[ -z "${KEEP_FONTDIR}" ]]; then
409 rm -rf ${REAL_DIR}
410 fi 506 fi
411 eend 0
412 done
413} 507}
414 508
509# @FUNCTION: setup_fonts
510# @USAGE:
511# @DESCRIPTION:
512# Generates needed files for fonts and fixes font permissions
415setup_fonts() { 513setup_fonts() {
416 if [[ ! -n "${FONT_DIRS}" ]]; then 514 if [[ ! -n "${FONT_DIR}" ]]; then
417 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 515 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
418 eerror "${msg}" 516 eerror "${msg}"
419 die "${msg}" 517 die "${msg}"
420 fi 518 fi
421 519
422 create_fonts_scale 520 create_fonts_scale
423 create_fonts_dir 521 create_fonts_dir
424 fix_font_permissions
425 create_font_cache 522 create_font_cache
426} 523}
427 524
525# @FUNCTION: remove_font_metadata
526# @USAGE:
527# @DESCRIPTION:
528# Don't let the package install generated font files that may overlap
529# with other packages. Instead, they're generated in pkg_postinst().
428remove_font_metadata() { 530remove_font_metadata() {
429 local DIR 531 local DIR
430 for DIR in ${FONT_DIR}; do 532 for DIR in ${FONT_DIR}; do
431 if [[ "${DIR}" != "Speedo" ]] && \ 533 if [[ "${DIR}" != "Speedo" ]] && \
432 [[ "${DIR}" != "CID" ]] ; then 534 [[ "${DIR}" != "CID" ]] ; then
433 # Delete font metadata files 535 # Delete font metadata files
434 # fonts.scale, fonts.dir, fonts.cache-1 536 # fonts.scale, fonts.dir, fonts.cache-1
435 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 537 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
436 fi 538 fi
437 done 539 done
438} 540}
439 541
542# @FUNCTION: install_driver_hwdata
543# @USAGE:
544# @DESCRIPTION:
545# Installs device-to-driver mappings for system-config-display and
546# anything else that uses hwdata.
547install_driver_hwdata() {
548 insinto /usr/share/hwdata/videoaliases
549 for i in "${FILESDIR}"/*.xinf; do
550 # We need this for the case when none exist,
551 # so *.xinf doesn't expand
552 if [[ -e $i ]]; then
553 doins $i
554 fi
555 done
556}
557
558# @FUNCTION: discover_font_dirs
559# @USAGE:
560# @DESCRIPTION:
561# Deprecated. Sets up the now-unused FONT_DIRS variable.
440discover_font_dirs() { 562discover_font_dirs() {
441 pushd ${IMAGE}/usr/share/fonts 563 FONT_DIRS="${FONT_DIR}"
442 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
443 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
444 popd
445} 564}
446 565
566# @FUNCTION: create_fonts_scale
567# @USAGE:
568# @DESCRIPTION:
569# Create fonts.scale file, used by the old server-side fonts subsystem.
447create_fonts_scale() { 570create_fonts_scale() {
448 ebegin "Creating fonts.scale files" 571 ebegin "Creating fonts.scale files"
449 local x 572 local x
450 for FONT_DIR in ${FONT_DIRS}; do 573 for DIR in ${FONT_DIR}; do
451 x=${ROOT}/usr/share/fonts/${FONT_DIR} 574 x=${ROOT}/usr/share/fonts/${DIR}
452 [[ -z "$(ls ${x}/)" ]] && continue 575 [[ -z "$(ls ${x}/)" ]] && continue
453 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 576 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
454 577
455 # Only generate .scale files if truetype, opentype or type1 578 # Only generate .scale files if truetype, opentype or type1
456 # fonts are present ... 579 # fonts are present ...
457 580
458 # First truetype (ttf,ttc)
459 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
460 # Also, there is no way to regenerate Speedo/CID fonts.scale 581 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
461 # <spyderous@gentoo.org> 2 August 2004 582 # <dberkholz@gentoo.org> 2 August 2004
462 if [[ "${x/encodings}" = "${x}" ]] \ 583 if [[ "${x/encodings}" = "${x}" ]] \
463 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
464 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
465 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
466 ${ROOT}/usr/bin/ttmkfdir -x 2 \
467 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
468 -o ${x}/fonts.scale -d ${x}
469 # ttmkfdir fails on some stuff, so try mkfontscale if it does
470 local ttmkfdir_return=$?
471 else
472 # We didn't use ttmkfdir at all
473 local ttmkfdir_return=2
474 fi
475 if [[ ${ttmkfdir_return} -ne 0 ]]; then
476 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
477 ${ROOT}/usr/bin/mkfontscale \
478 -a /usr/share/fonts/encodings/encodings.dir \
479 -- ${x}
480 fi
481 # Next type1 and opentype (pfa,pfb,otf,otc)
482 elif [[ "${x/encodings}" = "${x}" ]] \
483 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 584 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
484 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 585 mkfontscale \
485 ${ROOT}/usr/bin/mkfontscale \
486 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 586 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
487 -- ${x} 587 -- ${x}
488 fi 588 fi
489 done 589 done
490 eend 0 590 eend 0
491} 591}
492 592
593# @FUNCTION: create_fonts_dir
594# @USAGE:
595# @DESCRIPTION:
596# Create fonts.dir file, used by the old server-side fonts subsystem.
493create_fonts_dir() { 597create_fonts_dir() {
494 ebegin "Generating fonts.dir files" 598 ebegin "Generating fonts.dir files"
495 for FONT_DIR in ${FONT_DIRS}; do 599 for DIR in ${FONT_DIR}; do
496 x=${ROOT}/usr/share/fonts/${FONT_DIR} 600 x=${ROOT}/usr/share/fonts/${DIR}
497 [[ -z "$(ls ${x}/)" ]] && continue 601 [[ -z "$(ls ${x}/)" ]] && continue
498 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 602 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
499 603
500 if [[ "${x/encodings}" = "${x}" ]]; then 604 if [[ "${x/encodings}" = "${x}" ]]; then
501 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 605 mkfontdir \
502 ${ROOT}/usr/bin/mkfontdir \
503 -e ${ROOT}/usr/share/fonts/encodings \ 606 -e "${ROOT}"/usr/share/fonts/encodings \
504 -e ${ROOT}/usr/share/fonts/encodings/large \ 607 -e "${ROOT}"/usr/share/fonts/encodings/large \
505 -- ${x} 608 -- ${x}
506 fi 609 fi
507 done 610 done
508 eend 0 611 eend 0
509} 612}
510 613
511fix_font_permissions() { 614# @FUNCTION: create_font_cache
512 ebegin "Fixing permissions" 615# @USAGE:
513 for FONT_DIR in ${FONT_DIRS}; do 616# @DESCRIPTION:
514 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 617# Create fonts.cache-1 files, used by the new client-side fonts
515 -exec chmod 0644 {} \; 618# subsystem.
516 done
517 eend 0
518}
519
520create_font_cache() { 619create_font_cache() {
521 # danarmak found out that fc-cache should be run AFTER all the above 620 font_pkg_postinst
522 # stuff, as otherwise the cache is invalid, and has to be run again
523 # as root anyway
524 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
525 ebegin "Creating FC font cache"
526 HOME="/root" ${ROOT}/usr/bin/fc-cache
527 eend 0
528 fi
529} 621}

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.121

  ViewVC Help
Powered by ViewVC 1.1.20