summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-10-29 06:49:48 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-10-29 06:49:48 +0000
commit16b0e510464b17e12c65e27c2e0e80143b0b1160 (patch)
treeaeee540ca84efa87aed3f8b6f98b5534cdf1d4ae /x11-base
parentold (diff)
downloadhistorical-16b0e510464b17e12c65e27c2e0e80143b0b1160.tar.gz
historical-16b0e510464b17e12c65e27c2e0e80143b0b1160.tar.bz2
historical-16b0e510464b17e12c65e27c2e0e80143b0b1160.zip
(#197154, fd.o #12982) xorg-server thinks net-dialup/dtrace is Solaris dtrace, thus dying during the build (Chad Simmons). Add a blocker for now, until we have an upstream fix.
Package-Manager: portage-2.1.3.16
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog8
-rw-r--r--x11-base/xorg-server/Manifest22
-rw-r--r--x11-base/xorg-server/xorg-server-1.4-r2.ebuild3
3 files changed, 20 insertions, 13 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index c7ad21acbe09..702bad6dcbb8 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.290 2007/10/14 11:12:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.291 2007/10/29 06:49:48 dberkholz Exp $
+
+ 29 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ xorg-server-1.4-r2.ebuild:
+ (#197154, fd.o #12982) xorg-server thinks net-dialup/dtrace is Solaris
+ dtrace, thus dying during the build (Chad Simmons). Add a blocker for now,
+ until we have an upstream fix.
14 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
xorg-server-1.4-r2.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 8fce7b3a6091..600b77bb1fc6 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -134,14 +134,14 @@ EBUILD xorg-server-1.3.0.0.ebuild 16734 RMD160 64194fe284000f152297038a84a5df874
MD5 80b678732506d66c8b3efc58da6bb835 xorg-server-1.3.0.0.ebuild 16734
RMD160 64194fe284000f152297038a84a5df8749e0c516 xorg-server-1.3.0.0.ebuild 16734
SHA256 ee210ec662271dcce3b4f26f39b11cf2055b16cd8d88be5e8fb6996ce76b79da xorg-server-1.3.0.0.ebuild 16734
-EBUILD xorg-server-1.4-r2.ebuild 18420 RMD160 d1dcd5c99e6347dedfab98777fe17489fcea346e SHA1 27bc2785f10df0da309e3fa88b06caf5cf2c66da SHA256 cb43ea14c296a9ed4966d7a5097d5257d1c2275eb8d707633a0f8cbd5aee7fcf
-MD5 c3d38e6ee7ea24ea42c6e5c00561bd0e xorg-server-1.4-r2.ebuild 18420
-RMD160 d1dcd5c99e6347dedfab98777fe17489fcea346e xorg-server-1.4-r2.ebuild 18420
-SHA256 cb43ea14c296a9ed4966d7a5097d5257d1c2275eb8d707633a0f8cbd5aee7fcf xorg-server-1.4-r2.ebuild 18420
-MISC ChangeLog 61689 RMD160 88c7d79cfb44cf661a9f5edf2294ad65fa133abe SHA1 df006f485b8ae00279f85334626955bc193c4405 SHA256 f79e3f2487d4083a6c524ef256a837728cf5440d9465629af35243c2800e2c58
-MD5 2697a0a02f286ee6b73e2b944be4d4e3 ChangeLog 61689
-RMD160 88c7d79cfb44cf661a9f5edf2294ad65fa133abe ChangeLog 61689
-SHA256 f79e3f2487d4083a6c524ef256a837728cf5440d9465629af35243c2800e2c58 ChangeLog 61689
+EBUILD xorg-server-1.4-r2.ebuild 18440 RMD160 5e01ca3ca369dac876d3d85ec24aefa6d7618d77 SHA1 b3d1cba7b5effe103e84d58942dacda0d7708f65 SHA256 34a3153d9b66d2555fdbe0deebf6a301ee700277bb0e1d8c8e487e9680b3133f
+MD5 b408416cadb61a4c78b81f15f80faaf2 xorg-server-1.4-r2.ebuild 18440
+RMD160 5e01ca3ca369dac876d3d85ec24aefa6d7618d77 xorg-server-1.4-r2.ebuild 18440
+SHA256 34a3153d9b66d2555fdbe0deebf6a301ee700277bb0e1d8c8e487e9680b3133f xorg-server-1.4-r2.ebuild 18440
+MISC ChangeLog 61957 RMD160 ffd3b8d057cd8f4fd9fd6f71129c999eca711fb4 SHA1 05d93115d30fb44b795fd640386e7f7365b6c985 SHA256 f558d06c4fc5e649b78247581ad1db1f8554043f565b1edb7595ea6cbfb7e130
+MD5 5c6face8e9581d75a642939d7966d26e ChangeLog 61957
+RMD160 ffd3b8d057cd8f4fd9fd6f71129c999eca711fb4 ChangeLog 61957
+SHA256 f558d06c4fc5e649b78247581ad1db1f8554043f565b1edb7595ea6cbfb7e130 ChangeLog 61957
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -164,7 +164,7 @@ SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD4DBQFHEfm0XVaO67S1rtsRAuUWAJd+yxXkTRmHG0DtoUj0OVTK/MUfAKDgoghz
-VCBwsC2dolppfSV84nSTDg==
-=jvlZ
+iD8DBQFHJYKZXVaO67S1rtsRAnc/AKDQuMcgXWcT8tCHO0Xjp93xoHOOfgCfTUGL
+cmavSpOgKvW5fl+bbnxnRF4=
+=pvF5
-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
index 6f9dbe525211..624ffd6cc280 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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-r2.ebuild,v 1.4 2007/10/14 11:12:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.5 2007/10/29 06:49:48 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -149,6 +149,7 @@ RDEPEND="hal? ( sys-apps/hal )
# Xxf86misc and Xxf86vm are xorgcfg-dependent
# liblbxutil is lbx- dependent
DEPEND="${RDEPEND}
+ !net-dialup/dtrace
>=x11-proto/randrproto-1.2.1
>=x11-proto/renderproto-0.9.3
>=x11-proto/fixesproto-4