summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Marineau <marineam@gentoo.org>2007-05-16 00:57:34 +0000
committerMichael Marineau <marineam@gentoo.org>2007-05-16 00:57:34 +0000
commit4f7f98e0bade070b03afbab4fd0d1869be088b04 (patch)
tree0031111be4e95c71067c1620cf464f8dd9a09db2 /app-emulation
parentMarked stable on amd64 for bug #177804 (diff)
downloadhistorical-4f7f98e0bade070b03afbab4fd0d1869be088b04.tar.gz
historical-4f7f98e0bade070b03afbab4fd0d1869be088b04.tar.bz2
historical-4f7f98e0bade070b03afbab4fd0d1869be088b04.zip
Fix xen-tools xproto dependency.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-tools/ChangeLog6
-rw-r--r--app-emulation/xen-tools/Manifest24
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild5
3 files changed, 20 insertions, 15 deletions
diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 340f9d1cc8c4..e9a7c87e28dc 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/xen-tools
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.21 2007/05/02 04:10:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.22 2007/05/16 00:57:34 marineam Exp $
+
+ 16 May 2007; Michael Marineau <marineam@gentoo.org>
+ xen-tools-3.0.4_p1.ebuild:
+ Only depend on xproto when ioemu is enabled. Bug #177110.
*xen-tools-3.0.4_p1 (02 May 2007)
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index b0393a2d2817..8c4acba6399d 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -75,14 +75,14 @@ EBUILD xen-tools-3.0.2-r4.ebuild 5852 RMD160 7110f5354737c4809615ff90129464da04d
MD5 0ad76097976668822992ebea24948f20 xen-tools-3.0.2-r4.ebuild 5852
RMD160 7110f5354737c4809615ff90129464da04d37102 xen-tools-3.0.2-r4.ebuild 5852
SHA256 03e295f988f8b6106d21c941e862794a0cd9dfdbdea5f377d869a64350883196 xen-tools-3.0.2-r4.ebuild 5852
-EBUILD xen-tools-3.0.4_p1.ebuild 5690 RMD160 c83efbd79db387344c7640d45d67980c8f9bdd02 SHA1 6270fb7f903ece777079c183134fe9095c9323b7 SHA256 de7fee0fa0a99dbb6950cc98324dfcdbb2e5e0c80ec2074698774f6fb4153e94
-MD5 bcb36f08e0e15f50bb29b9a16e0a2b4a xen-tools-3.0.4_p1.ebuild 5690
-RMD160 c83efbd79db387344c7640d45d67980c8f9bdd02 xen-tools-3.0.4_p1.ebuild 5690
-SHA256 de7fee0fa0a99dbb6950cc98324dfcdbb2e5e0c80ec2074698774f6fb4153e94 xen-tools-3.0.4_p1.ebuild 5690
-MISC ChangeLog 7078 RMD160 1e12a384849f7e1d1a4af69150d398b786155fff SHA1 8a8c250f8a983037294ba78cc548043d9ed57f09 SHA256 e7fa04013e0514445f4e919302197327c7022b8592316cf268250f48dc7f47e2
-MD5 c1968888a92731823aa7228361c8ee53 ChangeLog 7078
-RMD160 1e12a384849f7e1d1a4af69150d398b786155fff ChangeLog 7078
-SHA256 e7fa04013e0514445f4e919302197327c7022b8592316cf268250f48dc7f47e2 ChangeLog 7078
+EBUILD xen-tools-3.0.4_p1.ebuild 5731 RMD160 cb39b9285fbd86395a4cc3171c6f34592aee779b SHA1 b8c92f70bb3aff36bfae022121f2c2013cc834e2 SHA256 2aa215d537523f4d5c8f1396cb47e8624a890dbce06e1eb2cd47b175b80a4680
+MD5 194dbb73b1eff02f5199deff3edbd57b xen-tools-3.0.4_p1.ebuild 5731
+RMD160 cb39b9285fbd86395a4cc3171c6f34592aee779b xen-tools-3.0.4_p1.ebuild 5731
+SHA256 2aa215d537523f4d5c8f1396cb47e8624a890dbce06e1eb2cd47b175b80a4680 xen-tools-3.0.4_p1.ebuild 5731
+MISC ChangeLog 7222 RMD160 6c2e32d1b6a627801ddf3b975807beeab4aa56c1 SHA1 21312ab9c7043ab2ce34915dc61e9be91697be1a SHA256 29002afc63ad1b1221108a7c9814006ba574eec307003f04f7fcb407f5bd0519
+MD5 13746ad2190b268d53d6716b913bb7c3 ChangeLog 7222
+RMD160 6c2e32d1b6a627801ddf3b975807beeab4aa56c1 ChangeLog 7222
+SHA256 29002afc63ad1b1221108a7c9814006ba574eec307003f04f7fcb407f5bd0519 ChangeLog 7222
MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -94,9 +94,9 @@ MD5 de126addfd4101f35f8880ab0817ab03 files/digest-xen-tools-3.0.4_p1 241
RMD160 b65ff6928079bc0ee81b68ab27f3f4c9e1d36856 files/digest-xen-tools-3.0.4_p1 241
SHA256 66cfb008cc25de8a507359e492d6896908bc619901d901ae018fb135d2d91345 files/digest-xen-tools-3.0.4_p1 241
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
-iD8DBQFGOA8qiP+LossGzjARAmpkAJ9NXsdqz1O9dmIJ81uKh3MyMiiCaACgl05Z
-RYSw4fE0u7oxmhSeQK374mo=
-=XvXE
+iD8DBQFGSlcIiP+LossGzjARAoLzAKCbuRg5aW3xWe+z+i4qjtQPB1QB/QCeIMjI
+GM93cDDnEDyP7KBrR+0LraI=
+=CQe/
-----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild b/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
index 8ce92e747a21..78e48a3544fd 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.4_p1.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/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild,v 1.1 2007/05/02 04:10:04 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.4_p1.ebuild,v 1.2 2007/05/16 00:57:34 marineam Exp $
inherit flag-o-matic distutils eutils multilib
@@ -24,12 +24,12 @@ DEPEND="${CDEPEND}
dev-lang/perl
sys-devel/dev86
app-misc/pax-utils
- x11-proto/xproto
doc? (
dev-tex/latex2html
media-gfx/transfig
)
ioemu? (
+ x11-proto/xproto
net-libs/libvncserver
)"
@@ -104,6 +104,7 @@ src_unpack() {
# Don't bother with ioemu, only needed for fully virtualised guests
if ! use ioemu; then
+ chmod 644 tools/check/check_x11_devel
sed -i -e "/^CONFIG_IOEMU := y$/d" "${S}"/config/*.mk
fi