From 930335a94feb79a95736054bda600e3ed0f4275e Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 8 Jun 2010 15:38:29 +0000 Subject: [PATCH] Added x11-proto/xproto to DEPEND when X USE flag is unset Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-emulation/virtualbox-guest-additions/ChangeLog | 9 ++++++++- app-emulation/virtualbox-guest-additions/Manifest | 8 ++++---- .../virtualbox-guest-additions-3.1.8-r2.ebuild | 5 +++-- .../virtualbox-guest-additions-3.2.2.ebuild | 5 +++-- .../virtualbox-guest-additions-3.2.4.ebuild | 5 +++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog index ec9bd8b16337..eaf9410b37b4 100644 --- a/app-emulation/virtualbox-guest-additions/ChangeLog +++ b/app-emulation/virtualbox-guest-additions/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/virtualbox-guest-additions # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.43 2010/06/07 17:43:55 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.44 2010/06/08 15:38:29 polynomial-c Exp $ + + 08 Jun 2010; Lars Wendler + virtualbox-guest-additions-3.1.8-r2.ebuild, + virtualbox-guest-additions-3.2.2.ebuild, + virtualbox-guest-additions-3.2.4.ebuild: + Added x11-proto/xproto to DEPEND when X USE flag is unset. Reported by + Will B. (bug #323133). *virtualbox-guest-additions-3.2.4 (07 Jun 2010) diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 9f1790777b7f..2de375388a84 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -10,8 +10,8 @@ DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c DIST VirtualBox-3.2.2-OSE.tar.bz2 57639895 RMD160 d1fa4256571fa9b5ad663916f9fe5058f1b4388b SHA1 c6af6c2b4a50c9a2010317436cd8cd76383518f4 SHA256 e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2 DIST VirtualBox-3.2.4-OSE.tar.bz2 57492454 RMD160 489210351fe67bd6bddfaef0ee99110ee96786fc SHA1 767dc567ac98fde6d5e436afb10a181c75a5e8af SHA256 49e69fd357a80d2537a8139f970a23af9aa5e2f6c3179eefca69d1a75e1fb25c EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6 -EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 4844 RMD160 b15f8461dd6e80e0f16de81a393532005290eae5 SHA1 8e851a9ae4af4c548d66f8adef7c381a3554d4e6 SHA256 d9527d7680ec42ba7b8a906b21d0397c753c72a5b6192c7faf464ae6823ba55b -EBUILD virtualbox-guest-additions-3.2.2.ebuild 5256 RMD160 097073842e49227dc0f2c155bb1ef242e0a48906 SHA1 a974802451d4ed4e6c4eb3d6ba49d25d4d204183 SHA256 2997ca366c964522f47d2c883aa6c1300dcf824f654dff3997247a706acb57fd -EBUILD virtualbox-guest-additions-3.2.4.ebuild 5256 RMD160 f551bf35de10eefb7535db0045030360357c405e SHA1 f968e8d13b38e78dc6cb9f4ee7555ff4e0bcbbe9 SHA256 3a1ac6923211a9ed5a134e0dffd389c69f9adc2e7384c7b07fef95fb653d4346 -MISC ChangeLog 14964 RMD160 6aae46fa4e276021fa56ef6a893396dd425af7f3 SHA1 a2cc6be43db1eb6a688e48f08a289f54d3e4aa6d SHA256 e9df44f8e3ea0906b79c594efbe800cc5cb109dbd57e898d196128151d8b4e17 +EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 4871 RMD160 279c4ced84963d7c663bb9dc256136dce39928ce SHA1 2b88a6a01d7595dd77867de52d14439da867cd61 SHA256 9ce60e2fe38664f92008b3fd27c24fcccc02c5c83b135ab3fa5db68aeaa4fc27 +EBUILD virtualbox-guest-additions-3.2.2.ebuild 5283 RMD160 60ec9fe3961591cb6c1c9e1e33e69b1bb60ad528 SHA1 b8c528d0117a4696393339f028780b38dfcf482e SHA256 5501596538c0269b7868a4f4b9f9b9fb439dea10fc498a19ee5807f218bccb9c +EBUILD virtualbox-guest-additions-3.2.4.ebuild 5283 RMD160 56394960c5d9775477334769111e28c1f40730ea SHA1 8435cbe2cd713f714bb2b202b2dc1050cc9fffdf SHA256 fd16a8b8f314efa3ba02561ef43572da72686b59699b67965c0e40c6e1427fcc +MISC ChangeLog 15249 RMD160 b40954f1ca7e64b5d9d8fbf2d2b02f2e7a1e9493 SHA1 1463ac885e2243c32b1a8efc1441278c22b97815 SHA256 d6bad3c59a5664582f4933a8fcfaca79734042328b8d9d1787dda04c20dae76d MISC metadata.xml 457 RMD160 12d3d923e95f66b27bd9456b76319b9a6d8ae815 SHA1 54139c285252e9229298cf32d0716062cde5f0de SHA256 1fbd88d74325c1c6c63512eb9b7185797d6b9992b8c4f809d51897252729eccf diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild index 0da8fd63d3f6..56bdf74dd977 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild,v 1.1 2010/05/20 21:02:55 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $ inherit eutils linux-mod @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-devel/dev86 sys-power/iasl - X? ( x11-proto/renderproto )" + X? ( x11-proto/renderproto ) + !X? ( x11-proto/xproto )" BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild index dbbeb376d72d..612a88051765 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild,v 1.1 2010/06/03 10:59:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.2.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $ inherit eutils linux-mod @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-devel/dev86 sys-power/iasl - X? ( x11-proto/renderproto )" + X? ( x11-proto/renderproto ) + !X? ( x11-proto/xproto )" BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild index 9fbc94f61eab..3206f505ec5e 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild,v 1.1 2010/06/07 17:43:55 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.4.ebuild,v 1.2 2010/06/08 15:38:29 polynomial-c Exp $ inherit eutils linux-mod @@ -33,7 +33,8 @@ DEPEND="${RDEPEND} sys-devel/bin86 sys-devel/dev86 sys-power/iasl - X? ( x11-proto/renderproto )" + X? ( x11-proto/renderproto ) + !X? ( x11-proto/xproto )" BUILD_TARGETS="all" BUILD_TARGET_ARCH="${ARCH}" -- 2.26.2