5 files changed, 37 insertions, 51 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index a2ec7fdac17d..909fdb890faa 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.166 2006/09/12 18:37:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.167 2006/09/12 20:59:52 dberkholz Exp $
+
+  12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild,
+  xorg-server-1.1.1-r1.ebuild:
+  Some comments got displaced to the wrong spot.
 
   12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   xorg-server-1.1.1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 781d80073030..7b43a7609408 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 01-no-move-damage.patch 1149 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 SHA1 b8adef394d05a8769627d71b8da302f7fc3622d5 SHA256 9396f282e3d62927e86c4aa38b0d6245b83ca8e2ea48624f22c3c6d35751d997
 MD5 0faff1bfae0c6378fae5d2875fb3972c files/01-no-move-damage.patch 1149
 RMD160 f40d73e020376e1b9603dfa5ceb2fd0b48b45e31 files/01-no-move-damage.patch 1149
@@ -120,22 +117,22 @@ EBUILD xorg-server-1.0.2-r7.ebuild 6207 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c
 MD5 2d90cbe6238854aa56a67b693a893367 xorg-server-1.0.2-r7.ebuild 6207
 RMD160 41dda5f10ca8f78c493ae45f6ac2e9b2c3ebabbc xorg-server-1.0.2-r7.ebuild 6207
 SHA256 6aaa82962aea02ed734f0472ef3e34cbed88d5b0c0673bf8bb0e2d5bf2e73c35 xorg-server-1.0.2-r7.ebuild 6207
-EBUILD xorg-server-1.1.0-r1.ebuild 24649 RMD160 100bec39dfa0dd37dadf0447f4d35d5cc199db39 SHA1 7aae97e855a4197de51579d2443f5d42f13bd33c SHA256 c0704b904e83a47ca31af410ce0830389d3865b8f9deeffe3d68886e47931522
-MD5 1866e8264357467af6cdab889974bcf1 xorg-server-1.1.0-r1.ebuild 24649
-RMD160 100bec39dfa0dd37dadf0447f4d35d5cc199db39 xorg-server-1.1.0-r1.ebuild 24649
-SHA256 c0704b904e83a47ca31af410ce0830389d3865b8f9deeffe3d68886e47931522 xorg-server-1.1.0-r1.ebuild 24649
-EBUILD xorg-server-1.1.1-r1.ebuild 16347 RMD160 913ec6b9b50c72d54d5016cce7f8f1db4b7f5772 SHA1 2ef90398cf29a64aa555ebc0ad763ca3c4987853 SHA256 259316bd2cbb0003c6dc9e1fec87e02269419bfb9967c245d940bcf28ca9c996
-MD5 20acbf06a5d283fa90add461c25c82aa xorg-server-1.1.1-r1.ebuild 16347
-RMD160 913ec6b9b50c72d54d5016cce7f8f1db4b7f5772 xorg-server-1.1.1-r1.ebuild 16347
-SHA256 259316bd2cbb0003c6dc9e1fec87e02269419bfb9967c245d940bcf28ca9c996 xorg-server-1.1.1-r1.ebuild 16347
-EBUILD xorg-server-1.1.1.ebuild 15715 RMD160 ff2a4e94fbbd4c7be963550e82bddf91260b3e8c SHA1 cf2b623d03b2b294851086ecd6faf04babb5094b SHA256 fe8356cab5ba18064cf8b112b7214883a334060b78a968d317c71682c4b8b622
-MD5 0442d96139368868717469fe4420602d xorg-server-1.1.1.ebuild 15715
-RMD160 ff2a4e94fbbd4c7be963550e82bddf91260b3e8c xorg-server-1.1.1.ebuild 15715
-SHA256 fe8356cab5ba18064cf8b112b7214883a334060b78a968d317c71682c4b8b622 xorg-server-1.1.1.ebuild 15715
-MISC ChangeLog 34443 RMD160 7aca86ce27891d3c9d3f317a5cec287955f02270 SHA1 0dfd4ede0c869ec709976660ffc040ce6c328190 SHA256 bb49fe50618d479710944bc979f25829713139a2601a1a843da05ae10f58a1e9
-MD5 177e3e16e63f989b3cc6657d33859e21 ChangeLog 34443
-RMD160 7aca86ce27891d3c9d3f317a5cec287955f02270 ChangeLog 34443
-SHA256 bb49fe50618d479710944bc979f25829713139a2601a1a843da05ae10f58a1e9 ChangeLog 34443
+EBUILD xorg-server-1.1.0-r1.ebuild 24595 RMD160 b424a3c5c8faf9207c7f1790f47b27e83b4bac2f SHA1 80ebcd42ee16a90ddaa341593690df9e77c7e211 SHA256 6d9df713c7fc2e2c46d3bea95dbd5e5afdbadd9bdbb572fffee405c7716d39ca
+MD5 e0c603b82565d731be3bda87d3d847d3 xorg-server-1.1.0-r1.ebuild 24595
+RMD160 b424a3c5c8faf9207c7f1790f47b27e83b4bac2f xorg-server-1.1.0-r1.ebuild 24595
+SHA256 6d9df713c7fc2e2c46d3bea95dbd5e5afdbadd9bdbb572fffee405c7716d39ca xorg-server-1.1.0-r1.ebuild 24595
+EBUILD xorg-server-1.1.1-r1.ebuild 16293 RMD160 6a93fa8f0df3772df5783b2591ebefb80864b63c SHA1 f96be6ff51e2b5b6de28ec148603ec91a6235b18 SHA256 8c87a5e7ff6f29531e55af4fd87cc10f893ae0b6c3a6f479d0a1f40ae89fc5d6
+MD5 c55648d483be2ebc31321f540f63a8ad xorg-server-1.1.1-r1.ebuild 16293
+RMD160 6a93fa8f0df3772df5783b2591ebefb80864b63c xorg-server-1.1.1-r1.ebuild 16293
+SHA256 8c87a5e7ff6f29531e55af4fd87cc10f893ae0b6c3a6f479d0a1f40ae89fc5d6 xorg-server-1.1.1-r1.ebuild 16293
+EBUILD xorg-server-1.1.1.ebuild 15662 RMD160 97a698103027322fc2452e430998891b1d08e686 SHA1 3f3f05d7ba4bb045cab8cca102201f7fb45469a6 SHA256 2ee3f3b56871c86aedb52c72233f973f2fb1a986e8fec1bbb70277afa2b51941
+MD5 1eb95b6c0cfdbdfd52de2754f1ac0ca1 xorg-server-1.1.1.ebuild 15662
+RMD160 97a698103027322fc2452e430998891b1d08e686 xorg-server-1.1.1.ebuild 15662
+SHA256 2ee3f3b56871c86aedb52c72233f973f2fb1a986e8fec1bbb70277afa2b51941 xorg-server-1.1.1.ebuild 15662
+MISC ChangeLog 34637 RMD160 b7881f305cc949833e7db77ea61cfe4c1d084c4b SHA1 0593c728fd92465c5b8a98ee19aa7ac5c64e5612 SHA256 f033d42d7a3f99d40c21acbfb2de22b404c3062715055807bf16f98fbd3eb1a2
+MD5 eafad98871ad1c439bc9b16e668e4450 ChangeLog 34637
+RMD160 b7881f305cc949833e7db77ea61cfe4c1d084c4b ChangeLog 34637
+SHA256 f033d42d7a3f99d40c21acbfb2de22b404c3062715055807bf16f98fbd3eb1a2 ChangeLog 34637
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -152,10 +149,3 @@ SHA256 1bea059c9ffe1dee3634293efe79b0a429d52ca18eda558e2e7b9e0605b0504a files/di
 MD5 eb8e67f136490bed406e3165659ef5af files/digest-xorg-server-1.1.1-r1 506
 RMD160 9f95844e26f01da5416239f15198b9a7beca3331 files/digest-xorg-server-1.1.1-r1 506
 SHA256 5a6f6ddae8ea1a903c9573aa852b59a8a011afabd9dc5b8f44b677c7db8f990d files/digest-xorg-server-1.1.1-r1 506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFBv5tKRy60XGEcJIRAiSAAJ4vClFPUfjV7+9DpqpPyaAdJLaUrwCfZG0A
-m1RngQ6veoV303WvfWJVAZ8=
-=3ErS
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index 70c54ceff04d..5437a9309fcb 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.0-r1.ebuild,v 1.20 2006/09/08 18:36:21 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.21 2006/09/12 20:59:52 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -509,13 +509,6 @@ pkg_setup() {
 		die "kdrive's VESA driver does not build on AMD64."
 	fi
 
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-
 	# SDL only available in kdrive build
 	if use kdrive && use sdl; then
 		conf_opts="${conf_opts} --enable-xsdl"
@@ -529,6 +522,10 @@ pkg_setup() {
 		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
 	fi
 
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
 	CONFIGURE_OPTIONS="
 		$(use_enable ipv6)
 		$(use_enable dmx)
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index 2a7ed4cde571..1bc0dbaceb02 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.1-r1.ebuild,v 1.2 2006/09/08 18:36:21 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.3 2006/09/12 20:59:52 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -291,13 +291,6 @@ pkg_setup() {
 		die "kdrive's VESA driver does not build on AMD64."
 	fi
 
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-
 	# SDL only available in kdrive build
 	if use kdrive && use sdl; then
 		conf_opts="${conf_opts} --enable-xsdl"
@@ -311,6 +304,10 @@ pkg_setup() {
 		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/Mesa"
 	fi
 
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
 	CONFIGURE_OPTIONS="
 		$(use_enable ipv6)
 		$(use_enable dmx)
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
index 13cd1a333c70..e1663ad33c63 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.1.ebuild,v 1.18 2006/09/12 18:37:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.19 2006/09/12 20:59:52 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -280,13 +280,6 @@ pkg_setup() {
 		die "kdrive's VESA driver does not build on AMD64."
 	fi
 
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-
 	# SDL only available in kdrive build
 	if use kdrive && use sdl; then
 		conf_opts="${conf_opts} --enable-xsdl"
@@ -300,6 +293,10 @@ pkg_setup() {
 		conf_opts="${conf_opts} --with-mesa-source=${WORKDIR}/${MESA_P}"
 	fi
 
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# --enable-install-setuid needed because sparcs default off
 	CONFIGURE_OPTIONS="
 		$(use_enable ipv6)
 		$(use_enable dmx)