add patch to fix building with new automake

Package-Manager: portage-2.1.5_rc2
RepoMan-Options: --force

4 files changed, 24 insertions, 14 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 4265dfaa5e01..c46e8b79bc48 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.320 2008/04/10 06:37:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.321 2008/04/18 21:29:13 compnerd Exp $
+
+  18 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch,
+  xorg-server-1.4.0.90-r3.ebuild:
+  Add patch to fix building against newer autotools.  Fixes bug #217128.
 
   10 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 88ed798d9a7d..ea03fe76e04a 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.0-fix-amd-cpu-detection.patch 1715 RMD160 7290fd57dc2a9e2dd8edbe08da5074a30815486c SHA1 b749e5ac35fad295fd7a1f13cfee2e42a2a06035 SHA256 0126a880eb5f21eb8dbbd119a425e7412b37689e1321c2b9ff63c5dc8de47f6a
 AUX 1.2.0-properly-free-device-devprivates-memory-leak-fix.patch 1199 RMD160 c55891ff6797d1b161524cd5c3e9a4382ec0bcad SHA1 98e07d5a542bc1e990921234f8f6399120ae5a63 SHA256 ba60d2fbb7944da45344f5ffc1431bf0e812ab861f4455522592ecb0c475138c
 AUX 1.2.0-typo-fix.patch 1321 RMD160 237c072869df15afbc2b35dfd8cc6e5143cb59f9 SHA1 3a22190fde5487b84c0d9a8862421f102bf41c63 SHA256 9dbf526f9cb3bf2596ffdc1795eda16181384db33562daf4fd1ddb359b5a77bd
@@ -37,6 +34,7 @@ AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43
 AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
+AUX xorg-server-1.4.0.90-automake-1.10.1-fixup.patch 357 RMD160 06d03313a419fcad6b3668888e32dad28defb3a4 SHA1 3bdd2a6faa808445b2b365b420a9ce5882501035 SHA256 afb9593b3cedfdc9c768436df64b4878504804e93984672a58d96660b2b87afc
 AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
 AUX xorg-x11-server-1.0.1-fpic-libxf86config.patch 332 RMD160 3981b8fbb19142c7944f59237cf57394337ec952 SHA1 594aa3d30b51f6789d848f819c13737baff442d1 SHA256 65cc7942a8c7357c138c9c19c39a835720b13348e96a82c8925ccda82c1bcfb6
 AUX xprint.init 598 RMD160 85de6a023912d8ac40cba4f32b5559655e0e281e SHA1 1590a29e11f813bb1353b4cc815708e97bfbb96b SHA256 9474c19d125d9534b93c038cba7c4bdc7c45bf3ed51279ff2e130fe031a15c13
@@ -48,13 +46,6 @@ EBUILD xorg-server-1.3.0.0-r2.ebuild 17322 RMD160 d54594444e07b2756c5802731f4311
 EBUILD xorg-server-1.3.0.0-r4.ebuild 17872 RMD160 caf61a35a2486a3248dab00dc2a928dd2e11e015 SHA1 2552f8fc12bc8b446e65b912dbd86f7cf4019ec5 SHA256 fcf3d38047d812e887769b17ffe7c94035fc6376bc6b307b04190851bb3ed19c
 EBUILD xorg-server-1.3.0.0-r5.ebuild 18046 RMD160 87c15525ba19db4d4bdba864f044fc5df64b713c SHA1 e2e9c23783342b8b31bbd017d11a99841bb0f5c3 SHA256 02add61ece09de0ded6c6d1e338265f9e6f4260b01270230aa4a7526031ad210
 EBUILD xorg-server-1.4.0.90-r2.ebuild 18783 RMD160 5216d267d2b9550ae42152b9d9d050665a50deef SHA1 9526cc4cee85678f300a3790a171ea526974385d SHA256 db1a62761e6a1c55398ce827084f50f3d85031a790df77f51d7b1d34a933c68e
-EBUILD xorg-server-1.4.0.90-r3.ebuild 18957 RMD160 e6514e90bfdfb062f7e51bc65c1866e9648381a0 SHA1 ca0e707485f6681771625b206c5b1ffd8e427a12 SHA256 918c838cd6ee070e5c79f8ed36351a7abd1ad7c35a7b6ea1cd7dbf279cbafd93
-MISC ChangeLog 69387 RMD160 d03cb5cf1f27ce857bd70ebcaa0cf9bca183b163 SHA1 da41ed847515be0840eacbd799c2008f36ba5aef SHA256 ee3af9d8af8cdb57bd5a2cfc49ea45de55d31867b17c1447cd5347d4aeac2f7d
+EBUILD xorg-server-1.4.0.90-r3.ebuild 19018 RMD160 fcbfbde27b0c206296969fb761c990912d51affc SHA1 0f64d6d6bb01f173d1c60db1f1953cbbb8f33f01 SHA256 70029345be023b01842cc0309f6a723a9ffec35aa8f91c2f89c52139e832f25a
+MISC ChangeLog 69609 RMD160 e5f3a52b6bfc7d3d1938850652a60868364b8e52 SHA1 35390eacbc1225a6405981875c7bdc2fe426fcd9 SHA256 d4aed80e781ab9fc0c3b7108c5df329e78b8ba2851b8746c995145f5ce7735df
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH/bWSXVaO67S1rtsRAiQqAKCiXksEOxxS2ddQsM7RqR8uJtahJACfcRa6
-3tp0N1Dptla6fnmXgq1GqFA=
-=rTaS
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
new file mode 100644
index 000000000000..3d34b34285bf
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2008-04-17 16:53:09.000000000 -0500
++++ configure.ac	2008-04-17 16:53:29.000000000 -0500
+@@ -1962,7 +1962,9 @@
+ 
+ AC_SUBST([DIX_CFLAGS])
+ 
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+ 
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
index 4398a737e3df..24874e47354b 100644
--- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.0.90-r3.ebuild,v 1.3 2008/04/10 06:37:00 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.4 2008/04/18 21:29:13 compnerd Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -293,6 +293,7 @@ PATCHES="
 	${FILESDIR}/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch
 	${FILESDIR}/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch
 	${FILESDIR}/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch
+	${FILESDIR}/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch
 	"
 
 pkg_setup() {