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

Diff of /eclass/x-modular.eclass

Parent Directory | Revision Log | View Patch Patch

Revision 1.59		Revision 1.77
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.59 2006/05/16 06:23:43 exg Exp $	3	# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.77 2006/10/30 05:44:33 dberkholz Exp $
4	#	4	#
5	# Author: Donnie Berkholz <spyderous@gentoo.org>	5	# Author: Donnie Berkholz <spyderous@gentoo.org>
6	#	6	#
7	# This eclass is designed to reduce code duplication in the modularized X11	7	# This eclass is designed to reduce code duplication in the modularized X11
8	# ebuilds.	8	# ebuilds.
…		…
25	#	25	#
26	# Pretty much everything else should be automatic.	26	# Pretty much everything else should be automatic.
27		27
28	EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm	28	EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29		29
30	inherit eutils libtool toolchain-funcs flag-o-matic autotools	30	inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31		31
32	# Directory prefix to use for everything	32	# Directory prefix to use for everything
33	XDIR="/usr"	33	XDIR="/usr"
34		34
35	# Set up default patchset version(s) if necessary	35	# Set up default patchset version(s) if necessary
…		…
130	# If we're a driver package	130	# If we're a driver package
131	if [[ "${PN/#xf86-video}" != "${PN}" ]] \|\| [[ "${PN/#xf86-input}" != "${PN}" ]]; then	131	if [[ "${PN/#xf86-video}" != "${PN}" ]] \|\| [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132	# Enable driver code in the rest of the eclass	132	# Enable driver code in the rest of the eclass
133	DRIVER="yes"	133	DRIVER="yes"
134		134
		135	if [[ ${XDPVER} != -1 ]]; then
135	# Add driver patchset to SRC_URI	136	# Add driver patchset to SRC_URI
136	SRC_URI="${SRC_URI}	137	SRC_URI="${SRC_URI}
137	http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"	138	http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
		139	fi
138	fi	140	fi
139		141
140	# Debugging -- ignore packages that can't be built with debugging	142	# Debugging -- ignore packages that can't be built with debugging
141	if [[ -z "${FONT}" ]] \	143	if [[ -z "${FONT}" ]] \
142	\|\| [[ "${PN/app-doc}" != "${PN}" ]] \	144	\|\| [[ "${PN/app-doc}" != "${PN}" ]] \
…		…
159	DEPEND="${DEPEND}	161	DEPEND="${DEPEND}
160	>=dev-util/pkgconfig-0.18"	162	>=dev-util/pkgconfig-0.18"
161		163
162	if [[ "${PN/util-macros}" = "${PN}" ]]; then	164	if [[ "${PN/util-macros}" = "${PN}" ]]; then
163	DEPEND="${DEPEND}	165	DEPEND="${DEPEND}
164	>=x11-misc/util-macros-0.99.2"	166	>=x11-misc/util-macros-0.99.2
		167	>=sys-devel/binutils-2.16.1-r3"
165	fi	168	fi
166		169
167	RDEPEND="${RDEPEND}	170	RDEPEND="${RDEPEND}
		171	\|\| ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
168	!<=x11-base/xorg-x11-6.9"	172	!<=x11-base/xorg-x11-6.9"
169	# Provides virtual/x11 for temporary use until packages are ported	173	# Provides virtual/x11 for temporary use until packages are ported
170	# x11-base/x11-env"	174	# x11-base/x11-env"
171		175
172	x-modular_specs_check() {	176	x-modular_specs_check() {
173	if [[ ${PN:0:11} = "xorg-server" ]] \|\| [[ -n "${DRIVER}" ]]; then	177	if [[ ${PN:0:11} = "xorg-server" ]] \|\| [[ -n "${DRIVER}" ]]; then
174	if gcc-specs-now; then	178	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	179	# (#116698) breaks loading
181	filter-ldflags -Wl,-z,now	180	filter-ldflags -Wl,-z,now
182	fi	181	fi
183	}	182	}
184		183
…		…
193	fi	192	fi
194	fi	193	fi
195	fi	194	fi
196	}	195	}
197		196
		197	x-modular_server_supports_drivers_check() {
		198	# (#135873) Only certain servers will actually use or be capable of
		199	# building external drivers, including binary drivers.
		200	if [[ -n "${DRIVER}" ]]; then
		201	if has_version '>=x11-base/xorg-server-1.1'; then
		202	if ! built_with_use x11-base/xorg-server xorg; then
		203	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."
		205	fi
		206	fi
		207	fi
		208	}
		209
198	x-modular_unpack_source() {	210	x-modular_unpack_source() {
199	unpack ${A}	211	unpack ${A}
200	cd ${S}	212	cd ${S}
201		213
202	if [[ -n ${FONT_OPTIONS} ]]; then	214	if [[ -n ${FONT_OPTIONS} ]]; then
…		…
213	fi	225	fi
214		226
215	# If this is a driver package we need to fix man page install location.	227	# If this is a driver package we need to fix man page install location.
216	# Running autoreconf will use the patched util-macros to make the	228	# Running autoreconf will use the patched util-macros to make the
217	# change for us, so we only need to patch if it is not going to run.	229	# change for us, so we only need to patch if it is not going to run.
218	if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then	230	if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
		231	&& [[ ${XDPVER} != -1 ]]; then
219	PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"	232	PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220	fi	233	fi
221		234
222	# For specific list of patches	235	# For specific list of patches
223	if [[ -n "${PATCHES}" ]] ; then	236	if [[ -n "${PATCHES}" ]] ; then
…		…
237	x-modular_reconf_source() {	250	x-modular_reconf_source() {
238	# Run autoreconf for CVS snapshots only	251	# Run autoreconf for CVS snapshots only
239	if [[ "${SNAPSHOT}" = "yes" ]]	252	if [[ "${SNAPSHOT}" = "yes" ]]
240	then	253	then
241	# If possible, generate configure if it doesn't exist	254	# If possible, generate configure if it doesn't exist
242	if [ -f "${S}/configure.ac" ]	255	if [ -f "./configure.ac" ]
243	then	256	then
244	eautoreconf	257	eautoreconf
245	fi	258	fi
246	fi	259	fi
247		260
…		…
250	elibtoolize	263	elibtoolize
251	}	264	}
252		265
253	x-modular_src_unpack() {	266	x-modular_src_unpack() {
254	x-modular_specs_check	267	x-modular_specs_check
		268	x-modular_server_supports_drivers_check
255	x-modular_dri_check	269	x-modular_dri_check
256	x-modular_unpack_source	270	x-modular_unpack_source
257	x-modular_patch_source	271	x-modular_patch_source
258	x-modular_reconf_source	272	x-modular_reconf_source
259	}	273	}
…		…
325	# Shouldn't be necessary in XDIR=/usr	339	# Shouldn't be necessary in XDIR=/usr
326	# einstall forces datadir, so we need to re-force it	340	# einstall forces datadir, so we need to re-force it
327	# datadir=${XDIR}/share \	341	# datadir=${XDIR}/share \
328	# mandir=${XDIR}/share/man \	342	# mandir=${XDIR}/share/man \
329		343
		344	if [[ -e ${S}/ChangeLog ]]; then
		345	dodoc ${S}/ChangeLog
		346	fi
		347
330	# Make sure docs get compressed	348	# Make sure docs get compressed
331	prepalldocs	349	prepalldocs
332		350
333	# Don't install libtool archives for server modules	351	# Don't install libtool archives for server modules
334	if [[ -e ${D}/usr/lib/xorg/modules ]]; then	352	if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
335	find ${D}/usr/lib/xorg/modules -name '*.la' \	353	find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
336	\| xargs rm -f	354	\| xargs rm -f
337	fi	355	fi
338		356
339	# Don't install overlapping fonts.* files	357	# Don't install overlapping fonts.* files
340	# Generate them instead when possible	358	# Generate them instead when possible
341	if [[ -n "${FONT}" ]]; then	359	if [[ -n "${FONT}" ]]; then
342	remove_font_metadata	360	remove_font_metadata
343	fi	361	fi
		362
		363	if [[ -n "${DRIVER}" ]]; then
		364	install_driver_hwdata
		365	fi
344	}	366	}
345		367
346	x-modular_pkg_preinst() {	368	x-modular_pkg_preinst() {
347	if [[ -n "${FONT}" ]]; then	369	# We no longer do anything here, but we can't remove it from the API
348	discover_font_dirs	370	:
349	fi
350	}	371	}
351		372
352	x-modular_pkg_postinst() {	373	x-modular_pkg_postinst() {
353	if [[ -n "${FONT}" ]]; then	374	if [[ -n "${FONT}" ]]; then
354	setup_fonts	375	setup_fonts
…		…
395	eend 0	416	eend 0
396	done	417	done
397	}	418	}
398		419
399	setup_fonts() {	420	setup_fonts() {
400	if [[ ! -n "${FONT_DIRS}" ]]; then	421	if [[ ! -n "${FONT_DIR}" ]]; then
401	msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."	422	msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
402	eerror "${msg}"	423	eerror "${msg}"
403	die "${msg}"	424	die "${msg}"
404	fi	425	fi
405		426
406	create_fonts_scale	427	create_fonts_scale
…		…
419	rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}	440	rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
420	fi	441	fi
421	done	442	done
422	}	443	}
423		444
		445	# Installs device-to-driver mappings for system-config-display
		446	# and anything else that uses hwdata
		447	install_driver_hwdata() {
		448	insinto /usr/share/hwdata/videoaliases
		449	for i in "${FILESDIR}"/*.xinf; do
		450	# We need this for the case when none exist,
		451	# so *.xinf doesn't expand
		452	if [[ -e $i ]]; then
		453	doins $i
		454	fi
		455	done
		456	}
		457
424	discover_font_dirs() {	458	discover_font_dirs() {
425	pushd ${IMAGE}/usr/share/fonts	459	FONT_DIRS="${FONT_DIR}"
426	FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
427	FONT_DIRS="$(echo ${FONT_DIRS} \| sed -e 's:./::g')"
428	popd
429	}	460	}
430		461
431	create_fonts_scale() {	462	create_fonts_scale() {
432	ebegin "Creating fonts.scale files"	463	ebegin "Creating fonts.scale files"
433	local x	464	local x
434	for FONT_DIR in ${FONT_DIRS}; do	465	for DIR in ${FONT_DIR}; do
435	x=${ROOT}/usr/share/fonts/${FONT_DIR}	466	x=${ROOT}/usr/share/fonts/${DIR}
436	[[ -z "$(ls ${x}/)" ]] && continue	467	[[ -z "$(ls ${x}/)" ]] && continue
437	[[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue	468	[[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
438		469
439	# Only generate .scale files if truetype, opentype or type1	470	# Only generate .scale files if truetype, opentype or type1
440	# fonts are present ...	471	# fonts are present ...
…		…
474	eend 0	505	eend 0
475	}	506	}
476		507
477	create_fonts_dir() {	508	create_fonts_dir() {
478	ebegin "Generating fonts.dir files"	509	ebegin "Generating fonts.dir files"
479	for FONT_DIR in ${FONT_DIRS}; do	510	for DIR in ${FONT_DIR}; do
480	x=${ROOT}/usr/share/fonts/${FONT_DIR}	511	x=${ROOT}/usr/share/fonts/${DIR}
481	[[ -z "$(ls ${x}/)" ]] && continue	512	[[ -z "$(ls ${x}/)" ]] && continue
482	[[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue	513	[[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
483		514
484	if [[ "${x/encodings}" = "${x}" ]]; then	515	if [[ "${x/encodings}" = "${x}" ]]; then
485	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \	516	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
…		…
492	eend 0	523	eend 0
493	}	524	}
494		525
495	fix_font_permissions() {	526	fix_font_permissions() {
496	ebegin "Fixing permissions"	527	ebegin "Fixing permissions"
497	for FONT_DIR in ${FONT_DIRS}; do	528	for DIR in ${FONT_DIR}; do
498	find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \	529	find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
499	-exec chmod 0644 {} \;	530	-exec chmod 0644 {} \;
500	done	531	done
501	eend 0	532	eend 0
502	}	533	}
503		534

 Legend:



Removed from v.1.59
 


changed lines


 
Added in v.1.77
 Legend:



Removed from v.1.59
 


changed lines


 
Added in v.1.77
-Removed from v.1.59
+Added in v.1.77

	ViewVC Help
Powered by ViewVC 1.1.20