| 1 |
commit: a156cacb380d18a8d42fc4c3e8f2b805d12af145 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 9 13:38:43 2013 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 9 13:38:43 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a156cacb |
| 7 |
|
| 8 |
x11-base/xorg-server: Replace the linux-acpi disable patch with --disable-linux-acpi. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
.../xorg-server/files/xorg-server-1.12-disable-acpi.patch | 11 ----------- |
| 14 |
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +- |
| 15 |
2 files changed, 1 insertion(+), 12 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index df43dbd..0000000 |
| 20 |
--- a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,11 +0,0 @@ |
| 23 |
-diff -ur a/configure.ac b/configure.ac |
| 24 |
---- a/configure.ac 2011-10-31 19:40:02.000000000 +0100 |
| 25 |
-+++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100 |
| 26 |
-@@ -1624,7 +1624,6 @@ |
| 27 |
- linux_alpha=yes |
| 28 |
- ;; |
| 29 |
- i*86|amd64*|x86_64*|ia64*) |
| 30 |
-- linux_acpi="yes" |
| 31 |
- ;; |
| 32 |
- *) |
| 33 |
- ;; |
| 34 |
|
| 35 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 36 |
index 5d00cf8..a7bdcd1 100644 |
| 37 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 38 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 39 |
@@ -114,7 +114,6 @@ REQUIRED_USE="!minimal? ( |
| 40 |
|
| 41 |
PATCHES=( |
| 42 |
"${UPSTREAMED_PATCHES[@]}" |
| 43 |
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch |
| 44 |
"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch |
| 45 |
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 46 |
) |
| 47 |
@@ -159,6 +158,7 @@ src_configure() { |
| 48 |
--with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 49 |
--with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 50 |
--disable-config-hal |
| 51 |
+ --disable-linux-acpi |
| 52 |
--without-dtrace |
| 53 |
--without-fop |
| 54 |
--with-os-vendor=Gentoo |
Archives