| 1 |
commit: 272a2ed2ca91c94420669d0318566aacaefb2ddd |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 17 11:54:35 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 17 11:54:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272a2ed2 |
| 7 |
|
| 8 |
app-emulation/virtualbox: Small ebuild improvements. |
| 9 |
|
| 10 |
- Added missing dep on x11-libs/libxcb:= |
| 11 |
- Added sub-slot dep operator to sys-libs/zlib |
| 12 |
- echo the ./configure call so it can get logged |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 15 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 16 |
|
| 17 |
app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild | 10 ++++++++-- |
| 18 |
app-emulation/virtualbox/virtualbox-5.2.20.ebuild | 10 ++++++++-- |
| 19 |
app-emulation/virtualbox/virtualbox-5.2.22.ebuild | 10 ++++++++-- |
| 20 |
3 files changed, 24 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild |
| 23 |
index 30079ef2356..4d8d595387b 100644 |
| 24 |
--- a/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild |
| 25 |
+++ b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild |
| 26 |
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin |
| 27 |
dev-libs/libxml2 |
| 28 |
media-libs/libpng:0= |
| 29 |
media-libs/libvpx:0= |
| 30 |
- sys-libs/zlib |
| 31 |
+ sys-libs/zlib:= |
| 32 |
!headless? ( |
| 33 |
media-libs/libsdl:0[X,video] |
| 34 |
x11-libs/libX11 |
| 35 |
+ x11-libs/libxcb:= |
| 36 |
x11-libs/libXcursor |
| 37 |
x11-libs/libXext |
| 38 |
x11-libs/libXmu |
| 39 |
@@ -196,6 +197,11 @@ src_prepare() { |
| 40 |
eapply_user |
| 41 |
} |
| 42 |
|
| 43 |
+doecho() { |
| 44 |
+ echo "$@" |
| 45 |
+ "$@" || die |
| 46 |
+} |
| 47 |
+ |
| 48 |
src_configure() { |
| 49 |
local myconf=( |
| 50 |
--with-gcc="$(tc-getCC)" |
| 51 |
@@ -227,7 +233,7 @@ src_configure() { |
| 52 |
myconf+=( --disable-vmmraw ) |
| 53 |
fi |
| 54 |
# not an autoconf script |
| 55 |
- ./configure ${myconf[@]} || die "configure failed" |
| 56 |
+ doecho ./configure ${myconf[@]} |
| 57 |
} |
| 58 |
|
| 59 |
src_compile() { |
| 60 |
|
| 61 |
diff --git a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild |
| 62 |
index b7a4c078630..ea84396fbfb 100644 |
| 63 |
--- a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild |
| 64 |
+++ b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild |
| 65 |
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin |
| 66 |
dev-libs/libxml2 |
| 67 |
media-libs/libpng:0= |
| 68 |
media-libs/libvpx:0= |
| 69 |
- sys-libs/zlib |
| 70 |
+ sys-libs/zlib:= |
| 71 |
!headless? ( |
| 72 |
media-libs/libsdl:0[X,video] |
| 73 |
x11-libs/libX11 |
| 74 |
+ x11-libs/libxcb:= |
| 75 |
x11-libs/libXcursor |
| 76 |
x11-libs/libXext |
| 77 |
x11-libs/libXmu |
| 78 |
@@ -197,6 +198,11 @@ src_prepare() { |
| 79 |
eapply_user |
| 80 |
} |
| 81 |
|
| 82 |
+doecho() { |
| 83 |
+ echo "$@" |
| 84 |
+ "$@" || die |
| 85 |
+} |
| 86 |
+ |
| 87 |
src_configure() { |
| 88 |
local myconf=( |
| 89 |
--with-gcc="$(tc-getCC)" |
| 90 |
@@ -229,7 +235,7 @@ src_configure() { |
| 91 |
myconf+=( --disable-vmmraw ) |
| 92 |
fi |
| 93 |
# not an autoconf script |
| 94 |
- ./configure ${myconf[@]} || die "configure failed" |
| 95 |
+ doecho ./configure ${myconf[@]} |
| 96 |
} |
| 97 |
|
| 98 |
src_compile() { |
| 99 |
|
| 100 |
diff --git a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild |
| 101 |
index b7a4c078630..ea84396fbfb 100644 |
| 102 |
--- a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild |
| 103 |
+++ b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild |
| 104 |
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin |
| 105 |
dev-libs/libxml2 |
| 106 |
media-libs/libpng:0= |
| 107 |
media-libs/libvpx:0= |
| 108 |
- sys-libs/zlib |
| 109 |
+ sys-libs/zlib:= |
| 110 |
!headless? ( |
| 111 |
media-libs/libsdl:0[X,video] |
| 112 |
x11-libs/libX11 |
| 113 |
+ x11-libs/libxcb:= |
| 114 |
x11-libs/libXcursor |
| 115 |
x11-libs/libXext |
| 116 |
x11-libs/libXmu |
| 117 |
@@ -197,6 +198,11 @@ src_prepare() { |
| 118 |
eapply_user |
| 119 |
} |
| 120 |
|
| 121 |
+doecho() { |
| 122 |
+ echo "$@" |
| 123 |
+ "$@" || die |
| 124 |
+} |
| 125 |
+ |
| 126 |
src_configure() { |
| 127 |
local myconf=( |
| 128 |
--with-gcc="$(tc-getCC)" |
| 129 |
@@ -229,7 +235,7 @@ src_configure() { |
| 130 |
myconf+=( --disable-vmmraw ) |
| 131 |
fi |
| 132 |
# not an autoconf script |
| 133 |
- ./configure ${myconf[@]} || die "configure failed" |
| 134 |
+ doecho ./configure ${myconf[@]} |
| 135 |
} |
| 136 |
|
| 137 |
src_compile() { |
Archives