summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-11-09 14:38:43 +0100
committerMichał Górny <mgorny@gentoo.org>2013-11-09 14:38:43 +0100
commita156cacb380d18a8d42fc4c3e8f2b805d12af145 (patch)
tree593ab62d849e563e2c67599a2ceea3b742c4d47e /x11-base
parentx11-libs/xpyb: Update Python implementation list. Python3 is not supported up... (diff)
downloadx11-a156cacb380d18a8d42fc4c3e8f2b805d12af145.tar.gz
x11-a156cacb380d18a8d42fc4c3e8f2b805d12af145.tar.bz2
x11-a156cacb380d18a8d42fc4c3e8f2b805d12af145.zip
x11-base/xorg-server: Replace the linux-acpi disable patch with --disable-linux-acpi.
Package-Manager: portage-2.2.7
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch11
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild2
2 files changed, 1 insertions, 12 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
deleted file mode 100644
index df43dbde..00000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2011-10-31 19:40:02.000000000 +0100
-+++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100
-@@ -1624,7 +1624,6 @@
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*|ia64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 5d00cf83..a7bdcd12 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -114,7 +114,6 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
)
@@ -159,6 +158,7 @@ src_configure() {
--with-fontrootdir="${EPREFIX}"/usr/share/fonts
--with-xkb-output="${EPREFIX}"/var/lib/xkb
--disable-config-hal
+ --disable-linux-acpi
--without-dtrace
--without-fop
--with-os-vendor=Gentoo