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

(-)/usr/portage/x11-base/xorg-server/xorg-server-1.8.1.ebuild (-5 / +3 lines)
Lines 52-58 Link Here
52
		>=media-libs/mesa-7.8_rc[nptl=]
52
		>=media-libs/mesa-7.8_rc[nptl=]
53
	)
53
	)
54
	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
54
	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
55
	udev? ( sys-fs/udev[extras] )"
55
	udev? ( sys-fs/udev )"
56
56
57
DEPEND="${RDEPEND}
57
DEPEND="${RDEPEND}
58
	!!net-dialup/dtrace
58
	!!net-dialup/dtrace
Lines 103-110 Link Here
103
PATCHES=(
103
PATCHES=(
104
	"${UPSTREAMED_PATCHES[@]}"
104
	"${UPSTREAMED_PATCHES[@]}"
105
	"${FILESDIR}"/${PN}-disable-acpi.patch
105
	"${FILESDIR}"/${PN}-disable-acpi.patch
106
#	"${FILESDIR}/1.8.0-no-hardcoded-etc.patch"
107
#	"${FILESDIR}/1.8.0-match-only-sane-devices.patch"
108
	)
106
	)
109
107
110
pkg_setup() {
108
pkg_setup() {
Lines 206-214 Link Here
206
204
207
	server_based_install
205
	server_based_install
208
206
209
	if ! use minimal &&	use xorg; then
207
	if ! use minimal && use xorg; then
210
		# Install xorg.conf.example (see bugs #151421 and #151670)
208
		# Install xorg.conf.example (see bugs #151421 and #151670)
211
		insinto /etc/X11
209
		insinto /usr/share/doc/${PF}
212
		doins hw/xfree86/xorg.conf.example \
210
		doins hw/xfree86/xorg.conf.example \
213
			|| die "couldn't install xorg.conf.example"
211
			|| die "couldn't install xorg.conf.example"
214
	fi
212
	fi

Return to bug 320475