Remove xcalibrate, since it's been removed upstream.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 22 insertions, 10 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 6f32924ec36e..68569fee9b88 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.603 2011/08/08 12:57:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.604 2011/08/16 23:53:59 mattst88 Exp $
+
+  16 Aug 2011; Matt Turner <mattst88@gentoo.org>
+  xorg-server-1.10.99.901.ebuild, xorg-server-1.10.99.902.ebuild:
+  Remove xcalibrate, since it's been removed upstream.
 
 *xorg-server-1.10.99.902 (08 Aug 2011)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 70938fdbaa26..474779495de3 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
@@ -14,9 +17,16 @@ DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa
 DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
 EBUILD xorg-server-1.10.2.ebuild 7077 RMD160 0ec787039aafb9ca9f83e8ba13dacd7b57cd4f86 SHA1 d82d7b6e36340773b9b2e15121553ff376627050 SHA256 95a2cddf621e7bc4a41ff2ad0dec336ea577e43e95aa0e3cf1c24173d86767c2
 EBUILD xorg-server-1.10.3.ebuild 7087 RMD160 6222f30b612fd3185db9c2eb3f70bb078ff3a763 SHA1 ac59a753a5eb923a0f1924bb4a258f90c8f0eee0 SHA256 f0e36155145ab64714d2cfb298ff5d837aa4b8221a7f6ef9c9a54c2e7edb5736
-EBUILD xorg-server-1.10.99.901.ebuild 6893 RMD160 0ad445f2ea3e21089adf3f91c659b5850d9f8c11 SHA1 c1a9e1fcb25faa20a90a198e43cfba7c18e15c0f SHA256 fa4d7fc978376f1d7ff1c84d48f14f0f8fd0088afb68375d4dc2b2e5c36ce517
-EBUILD xorg-server-1.10.99.902.ebuild 6894 RMD160 5eb3f3c14e9fab648c35d6521f74075af60adc9f SHA1 fd0460f2a52c9f4bb87e618649d7e0273be99a35 SHA256 369ea6289cec0d722a667aca452bab7ab6c4b89e8c1cf78373c213d822e56e8d
+EBUILD xorg-server-1.10.99.901.ebuild 6834 RMD160 4098291c16e12471a50ab8b08b585a5dab14d49c SHA1 36fff9ea8d59a41be5db06a62a2ea79fede2f668 SHA256 ede40753a1a65d00388783d20bb50509d6cc82d21d3e6ff626c4415920d1315d
+EBUILD xorg-server-1.10.99.902.ebuild 6834 RMD160 7e87957e07b99544b66a450781a444818087682b SHA1 0bd1e718d7aa67072af4440c1b8f23b4ae92f442 SHA256 11e2db92b44849e110359875db3856e31f59f425171bac3481f5392b8227b649
 EBUILD xorg-server-1.9.4.ebuild 7795 RMD160 2a13a293b5d7964272260034f6af5ff6fbd75f16 SHA1 c115e24b6de40381e7a1bb47ac06fdcc1cf5b1fb SHA256 af0e0e9deb3267a0d77d6f6a92c2870eb68a8681e4c8d80c1c3ee12fe9d1282c
 EBUILD xorg-server-1.9.5.ebuild 7797 RMD160 983d476a4940317cd80814152d28906d0b0697c0 SHA1 0a7c4e083d9f3c21d50415af94b65402152bd2bf SHA256 77d599c5bab11366ea7eea08dc7d13c23e920892b67deea9b9a9204f870fd333
-MISC ChangeLog 128992 RMD160 d76a9d1575fd75a14a17a869393acdc3ab04e0f3 SHA1 f5b9e4acb8155d190b855cf4dc2e4a5a2f42de2a SHA256 2b8c213f803bee5747d916f012494110a9d5adc3219c4de2770bb88c2ff8d776
+MISC ChangeLog 129162 RMD160 799c072f3bcdc05db442ee8bee1bed50c95a8712 SHA1 1293369a0615f317d43b8db4746b4ab8332eb32a SHA256 f36971b7f2f88ec89b280e3058238c3ac34dacf03c3b152384978bc96a0f242e
 MISC metadata.xml 537 RMD160 36f5ed1e9869e06c50c882193aad04d9553fbab9 SHA1 505782abd459abe3ba35969cc190675e00c65408 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5LAxsACgkQTVUdg23rv53ZHACeOkAg0Pv2a+ch9EyHsJDbyqDY
+TckAoIzOdolrfrnZQHJWvp3p7x4VPG9h
+=w2YX
+-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild b/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
index 785ca79cb3dd..005c56ae818c 100644
--- a/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10.99.901.ebuild,v 1.2 2011/06/09 21:40:37 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.99.901.ebuild,v 1.3 2011/08/16 23:53:59 mattst88 Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-7.8_rc[nptl=]
 	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=sys-fs/udev-150 )
 	>=x11-apps/xinit-1.3"
 
@@ -126,7 +126,6 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-mouse)
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)
diff --git a/x11-base/xorg-server/xorg-server-1.10.99.902.ebuild b/x11-base/xorg-server/xorg-server-1.10.99.902.ebuild
index 2de3f366a446..73202aff5894 100644
--- a/x11-base/xorg-server/xorg-server-1.10.99.902.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.10.99.902.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10.99.902.ebuild,v 1.1 2011/08/08 12:57:27 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.99.902.ebuild,v 1.2 2011/08/16 23:53:59 mattst88 Exp $
 
 EAPI=4
 
@@ -51,7 +51,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-7.8_rc[nptl=]
 	)
-	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=sys-fs/udev-150 )
 	>=x11-apps/xinit-1.3"
 
@@ -126,7 +126,6 @@ pkg_setup() {
 		$(use_enable kdrive kdrive-mouse)
 		$(use_enable kdrive kdrive-evdev)
 		$(use_enable tslib)
-		$(use_enable tslib xcalibrate)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal install-libxf86config)