Add patches from nominations branch. So we can open stablerequest for 1.7.7-r1.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 26 insertions, 5 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 48682a16015c..1bbac1881c97 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.520 2010/07/22 19:54:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.521 2010/07/31 11:40:18 scarabeus Exp $
+
+*xorg-server-1.7.7-r1 (31 Jul 2010)
+
+  31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xorg-server-1.7.7.ebuild, +xorg-server-1.7.7-r1.ebuild:
+  Add patches from nominations branch. So we can open stablerequest for
+  1.7.7-r1.
 
   22 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   -xorg-server-1.8.0.ebuild, -xorg-server-1.8.1.901.ebuild,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3b2a3eb7abf6..e28a39db31a4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
 AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
@@ -8,11 +11,19 @@ AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aaf
 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
+DIST xorg-server-1.7.7-patches-01.tar.bz2 5226 RMD160 26c7cf8ebe70f61cd49bbbc46ac317db81a784c7 SHA1 6f0958cf69e074f730435326439be192e05930a2 SHA256 6030b28b0b0194f0e1db30cf36769245ebcada0bcd94a0a14a9b2104fcbd2fa6
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
 EBUILD xorg-server-1.7.6.ebuild 7309 RMD160 b761bc151ecdc960d3e881e059ce5bafdccc3d32 SHA1 31c1c8915970323e6786eb8a0f5945553d1a9f22 SHA256 c8640d0acde2da02116a589712159b14414840a76e36b7ff555edb7c688f455a
-EBUILD xorg-server-1.7.7.ebuild 7162 RMD160 b099b9dc02ff0b6aaa82ec54ac01203c25a052cb SHA1 85b2efa437730f2623c36ebab3fb4cb28c7a0d0d SHA256 7e0a584a20db0a4b94326bed6ab77f9866b2a4526d3d71dc6a7cb9d88c0b4313
+EBUILD xorg-server-1.7.7-r1.ebuild 7244 RMD160 bcb0462f505a9b49acca236d0269ac255c63b614 SHA1 d5283bf1bc06a35b43fbc3ec97fdfaf37dddb91b SHA256 080ecc2973481e254e930da02c59db6cf1e871fc9275a0083bc60adac5bf9034
 EBUILD xorg-server-1.8.2.ebuild 8080 RMD160 353d87f4a9ec420430dc96eec68374da582f1164 SHA1 276e307b30d3d8cb7b1908b82768a57fe9b4c4ea SHA256 aa5cf0497aeec9b178954aaab8d8c9bc0e8790070c4d3d1dd23b49afc4bc3ebf
-MISC ChangeLog 115752 RMD160 2a6eeae6e2bc5ff8745ac61862f9c8d267bdfde8 SHA1 b19e0a774a095d86e74287afb618f67a0697ca0b SHA256 e20136dae1530787b577d1c94a2957329015f0e07516f4c03c9ab56faaa639b7
+MISC ChangeLog 115988 RMD160 3377a05c75e17d5fe49d6058528d72369260d35c SHA1 d2ad7da8b113edb1f4faf9e6c2057b523e691ed1 SHA256 5e89f63a260e2b07b6926d711fbe0e2c82b203a1815b022d3a1c7c8a88dae6ff
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxUC5IACgkQHB6c3gNBRYdaNgCfaFM949PluCeGkleZlCsXjQrm
+OpMAoIvEg3Cp7SkbbidvNRNcVMcNV1dy
+=W96c
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.7.7.ebuild b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
index afd89e0d73ed..479215384a0c 100644
--- a/x11-base/xorg-server/xorg-server-1.7.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7-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.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.1 2010/07/31 11:40:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -13,6 +13,9 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 OPENGL_DIR="xorg-x11"
 
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~scarabeus/${P}-patches-01.tar.bz2
+"
 DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
@@ -120,7 +123,7 @@ EPATCH_SUFFIX="patch"
 
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
-	#"${WORKDIR}/patches/"
+	"${WORKDIR}/patches/"
 	# Fix for bug #304067
 	"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
 	)