summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-10-16 04:51:37 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-10-16 04:51:37 +0000
commit4eaa4d0d606948e9a673bb3e8c02509a55dcc16c (patch)
tree8c3ca2661785e1b6d2f526a33ec651ace94631ad /x11-base
parent*portage-2.2_rc97 (16 Oct 2010) (diff)
downloadgentoo-2-4eaa4d0d606948e9a673bb3e8c02509a55dcc16c.tar.gz
gentoo-2-4eaa4d0d606948e9a673bb3e8c02509a55dcc16c.tar.bz2
gentoo-2-4eaa4d0d606948e9a673bb3e8c02509a55dcc16c.zip
Drop patch which was applied upstream, bug #341155
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.9.0.902.ebuild3
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 26e32f5a45d5..6ff1b71c8449 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# 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.543 2010/10/15 18:55:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.544 2010/10/16 04:51:37 chithanh Exp $
+
+ 16 Oct 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-server-1.9.0.902.ebuild:
+ Drop patch which was applied upstream, bug #341155
*xorg-server-1.9.0.902 (15 Oct 2010)
diff --git a/x11-base/xorg-server/xorg-server-1.9.0.902.ebuild b/x11-base/xorg-server/xorg-server-1.9.0.902.ebuild
index 9fe8e072afcb..a9db2cb685f5 100644
--- a/x11-base/xorg-server/xorg-server-1.9.0.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.9.0.902.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.9.0.902.ebuild,v 1.1 2010/10/15 18:55:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0.902.ebuild,v 1.2 2010/10/16 04:51:37 chithanh Exp $
EAPI=3
inherit xorg-2 multilib versionator
@@ -105,7 +105,6 @@ PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-disable-acpi.patch
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
- "${FILESDIR}"/1.9.0-fix-VbeModeInfoBlock-memcpy.patch
# Fixes for bug #318609
"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch