summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-05-04 12:53:24 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-05-04 12:53:24 +0000
commitf7c31d4d2f52861f6467b034ff8b77c9630af11b (patch)
treea5b49488d736da88eef4c4d198713d77a49c31df /x11-base
parentmaintainer-needed, no bugs (diff)
downloadhistorical-f7c31d4d2f52861f6467b034ff8b77c9630af11b.tar.gz
historical-f7c31d4d2f52861f6467b034ff8b77c9630af11b.tar.bz2
historical-f7c31d4d2f52861f6467b034ff8b77c9630af11b.zip
Drop already upstreamed patch.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest10
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.7.ebuild5
3 files changed, 11 insertions, 10 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 542529d82359..ec213302f7f0 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.508 2010/05/04 09:04:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.509 2010/05/04 12:53:24 scarabeus Exp $
+
+ 04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.7.7.ebuild:
+ Drop already upstreamed patch.
*xorg-server-1.7.7 (04 May 2010)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index fc599384d07c..618b0877de8e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -17,14 +17,14 @@ DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af
DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
EBUILD xorg-server-1.7.6.ebuild 7311 RMD160 a9faff1f53d15b0d50ed3dc4f2ee2e7b95889ffd SHA1 3373a60bcb3847e9add09d5004d6d55045d827f9 SHA256 a0d3cb546b66e4edb5122a1e1f6a4b2aaed3d98668206f6fff9769a0aaf99948
-EBUILD xorg-server-1.7.7.ebuild 7318 RMD160 361b4ed512a87b946d0f67ddfa7737abf219ec9a SHA1 21b4ac415f4815002da0afd769761888c3899170 SHA256 254e5276e78926a686278df42158193f748a65ab0742955a2a5ac2453f5a2f99
+EBUILD xorg-server-1.7.7.ebuild 7162 RMD160 b099b9dc02ff0b6aaa82ec54ac01203c25a052cb SHA1 85b2efa437730f2623c36ebab3fb4cb28c7a0d0d SHA256 7e0a584a20db0a4b94326bed6ab77f9866b2a4526d3d71dc6a7cb9d88c0b4313
EBUILD xorg-server-1.8.0.ebuild 8163 RMD160 256d04fae9d5a1f395479558d8ef53c0c5558299 SHA1 26c6e8befd90bf1f8a059914b03f00a0bad172f3 SHA256 a6b7a567f020a1feb343fdde0b9833c2e06b9d4079aa442bde9f0ac9c3f74530
-MISC ChangeLog 113718 RMD160 1179356518bd61699d1f37e6ce4ba0ba70362c0a SHA1 7d6417c736046497990157cfa207d7bdb6e1bf3a SHA256 a2b6a8f066dc1998eefac913ff4082dda9049c9c2433004c0542c22e54cc8d3e
+MISC ChangeLog 113835 RMD160 a872d01b6d9209f23bf5523b8f5fcc7d09081263 SHA1 6714f1f44f742ad6beacf77a2c1141a1a49a5fef SHA256 9814e186b6ca71f3999659c4e92f003c87c0cfe34690efa343bc68809e69362b
MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkvf4yoACgkQHB6c3gNBRYfGQwCfXBQYVeGQ9OqN73KcBhbgMEB0
-jOwAnjf1MVux1SLp6NNZUB4WcJaYaGVL
-=9YYn
+iEYEARECAAYFAkvgGKMACgkQHB6c3gNBRYewwQCfTzz4GyaKNbSFi1IUnt7vtI0v
+WKkAn097whfngnyshylA7gLKpMZkjpYS
+=FDHo
-----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.ebuild
index 9f43527e6f8b..afd89e0d73ed 100644
--- a/x11-base/xorg-server/xorg-server-1.7.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7.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.1 2010/05/04 09:04:46 scarabeus Exp $
+# $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 $
EAPI="2"
@@ -121,9 +121,6 @@ EPATCH_SUFFIX="patch"
# These have been sent upstream
UPSTREAMED_PATCHES=(
#"${WORKDIR}/patches/"
-
- # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400
- "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch"
# Fix for bug #304067
"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
)