Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 355481 | Differences between
and this patch

Collapse All | Expand All

(-)virtualbox-4.0.2-r1.ebuild (-7 / +2 lines)
Lines 22-28 Link Here
22
LICENSE="GPL-2"
22
LICENSE="GPL-2"
23
SLOT="0"
23
SLOT="0"
24
KEYWORDS="~amd64 ~x86"
24
KEYWORDS="~amd64 ~x86"
25
IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 sdk vboxwebsrv vnc"
25
IUSE="+additions alsa doc extensions headless java pulseaudio +opengl python +qt4 sdk vboxwebsrv"
26
26
27
RDEPEND="!app-emulation/virtualbox-bin
27
RDEPEND="!app-emulation/virtualbox-bin
28
	~app-emulation/virtualbox-modules-${PV}
28
	~app-emulation/virtualbox-modules-${PV}
Lines 46-53 Link Here
46
		x11-libs/libXmu
46
		x11-libs/libXmu
47
		x11-libs/libXt
47
		x11-libs/libXt
48
		media-libs/libsdl[X,video]
48
		media-libs/libsdl[X,video]
49
	)
49
	)"
50
	vnc? ( >=net-libs/libvncserver-0.9.7 )"
51
DEPEND="${RDEPEND}
50
DEPEND="${RDEPEND}
52
	>=dev-util/kbuild-0.1.5-r1
51
	>=dev-util/kbuild-0.1.5-r1
53
	>=dev-lang/yasm-0.6.2
52
	>=dev-lang/yasm-0.6.2
Lines 152-160 Link Here
152
		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
151
		sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
153
			-i "${S}"/Config.kmk || die
152
			-i "${S}"/Config.kmk || die
154
	fi
153
	fi
155
156
	# add the --enable-vnc option to configure script (bug #348204)
157
	epatch "${FILESDIR}/${PN}-vnc.patch"
158
}
154
}
159
155
160
src_configure() {
156
src_configure() {
Lines 166-172 Link Here
166
	use java       || myconf+=" --disable-java"
162
	use java       || myconf+=" --disable-java"
167
	use vboxwebsrv && myconf+=" --enable-webservice"
163
	use vboxwebsrv && myconf+=" --enable-webservice"
168
	use doc        || myconf+=" --disable-docs"
164
	use doc        || myconf+=" --disable-docs"
169
	use vnc        && myconf+=" --enable-vnc"
170
	if ! use headless ; then
165
	if ! use headless ; then
171
		use qt4 || myconf+=" --disable-qt4"
166
		use qt4 || myconf+=" --disable-qt4"
172
	else
167
	else

Return to bug 355481