summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-12-26 16:01:58 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-12-26 16:01:58 +0000
commit7858c3ef5c43f3d54e759eaf1e357799232fafbb (patch)
tree46f588ec822f237e579394ec531b13815c591033 /x11-base
parentDo not depend on xorg-server. (diff)
downloadhistorical-7858c3ef5c43f3d54e759eaf1e357799232fafbb.tar.gz
historical-7858c3ef5c43f3d54e759eaf1e357799232fafbb.tar.bz2
historical-7858c3ef5c43f3d54e759eaf1e357799232fafbb.zip
Depend correctly on mesa again.
Package-Manager: portage-2.2_rc60/cvs/Linux i686
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest4
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild6
3 files changed, 10 insertions, 6 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 53a160d8b972..e8f0d4f51bb5 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.477 2009/12/24 13:17:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.478 2009/12/26 16:01:58 scarabeus Exp $
+
+ 26 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.7.3.901-r1.ebuild:
+ Depend correctly on mesa again.
24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-xorg-server-1.7.3.ebuild, -xorg-server-1.7.3.901.ebuild,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 7b2c95e898e2..382a6084e4a1 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -11,6 +11,6 @@ DIST xorg-server-1.7.3.901.tar.bz2 4919082 RMD160 b8dcd713910068dadad74781c1f904
EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603
EBUILD xorg-server-1.6.3.901-r2.ebuild 7070 RMD160 40962a553d576ae3ac9532fc9a720332b4888fc7 SHA1 33b960b320284ac47d977239f8592749d109edef SHA256 18cf9beffe49b82375512a96a20626fd8a53144d8e3cdeb3d4145c1d64b704c2
EBUILD xorg-server-1.6.5-r1.ebuild 6848 RMD160 84d61e7cbce3e937a124e3e093b5786c3e12b582 SHA1 c39d6fe16328ae23110aea113db404e26134aed6 SHA256 000d6960bde6b675b1cd04310442042306bd439bbbfd20bdc4b113c2cc398355
-EBUILD xorg-server-1.7.3.901-r1.ebuild 7024 RMD160 819bc0f56e014470cdcef7c68eae3eb16735e6a5 SHA1 cb4ba6d3f6c19c8e29c1fef83a7b89259c156cf4 SHA256 8a6678c850cbb6f12f4299356e13068aaa4d99628c243402bca5f14dde56eb75
-MISC ChangeLog 108856 RMD160 236576206171193784d02a2324242dca7a7662b2 SHA1 d9b968c02561f340db8766f28d0b3a7534fc6b4c SHA256 c3edaf107347cd8405a0427223445848bc63dfa25f4fd7068fed399892ee7822
+EBUILD xorg-server-1.7.3.901-r1.ebuild 7011 RMD160 263f722d922874bafdef6835af03cfa1bd4c62fb SHA1 5ebf0f0f70340fb4f7cbf0705bbf0c7efda6d4fd SHA256 96ae668e6aa9aa7ec2d37fdbbeb32ccda1cda27c819e449a8027ace95cb7779a
+MISC ChangeLog 108981 RMD160 a5e5009a60e7c0367ec5f1d24fe6c13294a740a5 SHA1 6a659fd9b245c6c94a300283992cffa1433cc560 SHA256 7891e77b11011b44ee59607503cb4f46adb741f8305f67864b2c1b4b35a74629
MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild
index c0bcb90cf4e4..c20e3de67849 100644
--- a/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.3.901-r1.ebuild,v 1.2 2009/12/24 13:17:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.3.901-r1.ebuild,v 1.3 2009/12/26 16:01:58 scarabeus Exp $
EAPI="2"
@@ -52,6 +52,7 @@ RDEPEND="hal? ( sys-apps/hal )
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
>=x11-libs/libXres-1.0.3
+ >=media-libs/mesa-7.4[nptl=]
)
>=x11-libs/libxkbui-1.0.2
kdrive? (
@@ -112,8 +113,7 @@ DEPEND="${RDEPEND}
>=x11-libs/libdrm-2.3.0
)"
-PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )
- !minimal? ( >=media-libs/mesa-7.4[nptl=] )"
+PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
EPATCH_FORCE="yes"
EPATCH_SUFFIX="patch"