Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 447340
Collapse All | Expand All

(-)xorg-server-1.13.0-r1.ebuild.orig (-14 / +14 lines)
Lines 9-15 Link Here
9
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
9
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
10
10
11
DESCRIPTION="X.Org X servers"
11
DESCRIPTION="X.Org X servers"
12
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
12
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
13
13
14
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
14
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
15
IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
15
IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
Lines 147-160 Link Here
147
		$(use_enable xvfb)
147
		$(use_enable xvfb)
148
		$(use_enable nptl glx-tls)
148
		$(use_enable nptl glx-tls)
149
		$(use_enable udev config-udev)
149
		$(use_enable udev config-udev)
150
		$(use_enable !prefix install-setuid)
150
		$(use_with doc doxygen)
151
		$(use_with doc doxygen)
151
		$(use_with doc xmlto)
152
		$(use_with doc xmlto)
152
		--enable-libdrm
153
		--enable-libdrm
153
		--sysconfdir=/etc/X11
154
		--sysconfdir="${EPREFIX}"/etc/X11
154
		--localstatedir=/var
155
		--localstatedir="${EPREFIX}"/var
155
		--enable-install-setuid
156
		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
156
		--with-fontrootdir=/usr/share/fonts
157
		--with-xkb-output="${EPREFIX}"/var/lib/xkb
157
		--with-xkb-output=/var/lib/xkb
158
		--disable-config-hal
158
		--disable-config-hal
159
		--without-dtrace
159
		--without-dtrace
160
		--without-fop
160
		--without-fop
Lines 221-228 Link Here
221
221
222
pkg_postrm() {
222
pkg_postrm() {
223
	# Get rid of module dir to ensure opengl-update works properly
223
	# Get rid of module dir to ensure opengl-update works properly
224
	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
224
	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
225
		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
225
		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
226
	fi
226
	fi
227
}
227
}
228
228
Lines 231-239 Link Here
231
	ebegin "Moving GL files for dynamic switching"
231
	ebegin "Moving GL files for dynamic switching"
232
		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
232
		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
233
		local x=""
233
		local x=""
234
		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
234
		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
235
			if [ -f ${x} -o -L ${x} ]; then
235
			if [ -f ${x} -o -L ${x} ]; then
236
				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
236
				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
237
			fi
237
			fi
238
		done
238
		done
239
	eend 0
239
	eend 0
Lines 241-249 Link Here
241
241
242
server_based_install() {
242
server_based_install() {
243
	if ! use xorg; then
243
	if ! use xorg; then
244
		rm "${D}"/usr/share/man/man1/Xserver.1x \
244
		rm "${ED}"/usr/share/man/man1/Xserver.1x \
245
			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
245
			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
246
			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
246
			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
247
			"${D}"/usr/share/man/man1/Xserver.1x
247
			"${ED}"/usr/share/man/man1/Xserver.1x
248
	fi
248
	fi
249
}
249
}

Return to bug 447340