diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-05-19 07:47:45 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-05-19 07:47:45 +0000 |
| commit | cea705bda00af28f1ef25be1fe5c55972f3f1a92 (patch) | |
| tree | 6de487e36c2897c738c26efa98e064560c18a754 /x11-base/xorg-server | |
| parent | mtp 1.0.0 is required by the mtp plugin, bug #319815 by Nikoli <nikoli@lavabi... (diff) | |
| download | gentoo-2-cea705bda00af28f1ef25be1fe5c55972f3f1a92.tar.gz gentoo-2-cea705bda00af28f1ef25be1fe5c55972f3f1a92.tar.bz2 gentoo-2-cea705bda00af28f1ef25be1fe5c55972f3f1a92.zip | |
Apply fixes per bug #320475. Thx to Andrew Brouwers for testing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.8.1.ebuild) | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 61a00d44417d..23cd1dcffde7 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.511 2010/05/15 20:59:56 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.512 2010/05/19 07:47:45 scarabeus Exp $ + +*xorg-server-1.8.1-r1 (19 May 2010) + + 19 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.8.1.ebuild, +xorg-server-1.8.1-r1.ebuild: + Apply fixes per bug #320475. Thx to Andrew Brouwers for testing. *xorg-server-1.8.1 (15 May 2010) diff --git a/x11-base/xorg-server/xorg-server-1.8.1.ebuild b/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild index 9550b79621cc..5c2768de463f 100644 --- a/x11-base/xorg-server/xorg-server-1.8.1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1.ebuild,v 1.1 2010/05/15 20:59:56 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild,v 1.1 2010/05/19 07:47:45 scarabeus Exp $ EAPI=3 XORG_EAUTORECONF="yes" @@ -52,7 +52,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - udev? ( sys-fs/udev[extras] )" + udev? ( sys-fs/udev )" DEPEND="${RDEPEND} !!net-dialup/dtrace @@ -103,8 +103,6 @@ EPATCH_SUFFIX="patch" PATCHES=( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-disable-acpi.patch -# "${FILESDIR}/1.8.0-no-hardcoded-etc.patch" -# "${FILESDIR}/1.8.0-match-only-sane-devices.patch" ) pkg_setup() { @@ -206,10 +204,9 @@ src_install() { server_based_install - if ! use minimal && use xorg; then - # Install xorg.conf.example (see bugs #151421 and #151670) - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc hw/xfree86/xorg.conf.example \ || die "couldn't install xorg.conf.example" fi |