summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-11-17 12:54:35 +0100
committerLars Wendler <polynomial-c@gentoo.org>2018-11-17 12:54:53 +0100
commit272a2ed2ca91c94420669d0318566aacaefb2ddd (patch)
tree1168ccd4c4ee624624ea44d0a495e20b041785ba
parentapp-emulation/virtualbox: Fixed build with USE="-opus" (diff)
downloadgentoo-272a2ed2ca91c94420669d0318566aacaefb2ddd.tar.gz
gentoo-272a2ed2ca91c94420669d0318566aacaefb2ddd.tar.bz2
gentoo-272a2ed2ca91c94420669d0318566aacaefb2ddd.zip
app-emulation/virtualbox: Small ebuild improvements.
- Added missing dep on x11-libs/libxcb:= - Added sub-slot dep operator to sys-libs/zlib - echo the ./configure call so it can get logged Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-rw-r--r--app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild10
-rw-r--r--app-emulation/virtualbox/virtualbox-5.2.20.ebuild10
-rw-r--r--app-emulation/virtualbox/virtualbox-5.2.22.ebuild10
3 files changed, 24 insertions, 6 deletions
diff --git a/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
index 30079ef23568..4d8d595387b1 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.14-r1.ebuild
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin
dev-libs/libxml2
media-libs/libpng:0=
media-libs/libvpx:0=
- sys-libs/zlib
+ sys-libs/zlib:=
!headless? (
media-libs/libsdl:0[X,video]
x11-libs/libX11
+ x11-libs/libxcb:=
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXmu
@@ -196,6 +197,11 @@ src_prepare() {
eapply_user
}
+doecho() {
+ echo "$@"
+ "$@" || die
+}
+
src_configure() {
local myconf=(
--with-gcc="$(tc-getCC)"
@@ -227,7 +233,7 @@ src_configure() {
myconf+=( --disable-vmmraw )
fi
# not an autoconf script
- ./configure ${myconf[@]} || die "configure failed"
+ doecho ./configure ${myconf[@]}
}
src_compile() {
diff --git a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
index b7a4c078630b..ea84396fbfb8 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.20.ebuild
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin
dev-libs/libxml2
media-libs/libpng:0=
media-libs/libvpx:0=
- sys-libs/zlib
+ sys-libs/zlib:=
!headless? (
media-libs/libsdl:0[X,video]
x11-libs/libX11
+ x11-libs/libxcb:=
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXmu
@@ -197,6 +198,11 @@ src_prepare() {
eapply_user
}
+doecho() {
+ echo "$@"
+ "$@" || die
+}
+
src_configure() {
local myconf=(
--with-gcc="$(tc-getCC)"
@@ -229,7 +235,7 @@ src_configure() {
myconf+=( --disable-vmmraw )
fi
# not an autoconf script
- ./configure ${myconf[@]} || die "configure failed"
+ doecho ./configure ${myconf[@]}
}
src_compile() {
diff --git a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
index b7a4c078630b..ea84396fbfb8 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
@@ -28,10 +28,11 @@ RDEPEND="!app-emulation/virtualbox-bin
dev-libs/libxml2
media-libs/libpng:0=
media-libs/libvpx:0=
- sys-libs/zlib
+ sys-libs/zlib:=
!headless? (
media-libs/libsdl:0[X,video]
x11-libs/libX11
+ x11-libs/libxcb:=
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXmu
@@ -197,6 +198,11 @@ src_prepare() {
eapply_user
}
+doecho() {
+ echo "$@"
+ "$@" || die
+}
+
src_configure() {
local myconf=(
--with-gcc="$(tc-getCC)"
@@ -229,7 +235,7 @@ src_configure() {
myconf+=( --disable-vmmraw )
fi
# not an autoconf script
- ./configure ${myconf[@]} || die "configure failed"
+ doecho ./configure ${myconf[@]}
}
src_compile() {