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

Collapse All | Expand All

(-)/var/db/repos/gentoo/app-emulation/virtualbox/virtualbox-6.1.50-r2.ebuild (-15 / +31 lines)
Lines 37-43 Link Here
37
unset WATCOM #856769
37
unset WATCOM #856769
38
38
39
COMMON_DEPEND="
39
COMMON_DEPEND="
40
	${PYTHON_DEPS}
41
	acct-group/vboxusers
40
	acct-group/vboxusers
42
	~app-emulation/virtualbox-modules-${PV}
41
	~app-emulation/virtualbox-modules-${PV}
43
	>=dev-libs/libxslt-1.1.19
42
	>=dev-libs/libxslt-1.1.19
Lines 69-74 Link Here
69
			x11-libs/libXinerama
68
			x11-libs/libXinerama
70
		)
69
		)
71
	)
70
	)
71
	python? ( ${PYTHON_DEPS} )
72
	dev-libs/openssl:0=
72
	dev-libs/openssl:0=
73
	virtual/libcrypt:=
73
	virtual/libcrypt:=
74
	lvm? ( sys-fs/lvm2 )
74
	lvm? ( sys-fs/lvm2 )
Lines 161-169 Link Here
161
161
162
REQUIRED_USE="
162
REQUIRED_USE="
163
	java? ( sdk )
163
	java? ( sdk )
164
	python? ( sdk )
164
	python? ( sdk ${PYTHON_REQUIRED_USE} )
165
	vboxwebsrv? ( java )
165
	vboxwebsrv? ( java )
166
	${PYTHON_REQUIRED_USE}
167
"
166
"
168
167
169
PATCHES=(
168
PATCHES=(
Lines 350-362 Link Here
350
		-e '/VBOX_LIB_PYTHON.*=/d' \
349
		-e '/VBOX_LIB_PYTHON.*=/d' \
351
		AutoConfig.kmk || die
350
		AutoConfig.kmk || die
352
351
353
	cat >> AutoConfig.kmk <<-EOF || die
352
	if use python; then
354
		VBOX_WITH_PYTHON=$(usev python 1)
353
		cat >> AutoConfig.kmk <<-EOF || die
355
		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
354
			VBOX_WITH_PYTHON=$(usev python 1)
356
		VBOX_LIB_PYTHON=$(python_get_library_path)
355
			VBOX_PATH_PYTHON_INC=$(python_get_includedir)
357
	EOF
356
			VBOX_LIB_PYTHON=$(python_get_library_path)
357
		EOF
358
358
359
	if use python ; then
360
		local mangled_python="${EPYTHON#python}"
359
		local mangled_python="${EPYTHON#python}"
361
		mangled_python="${mangled_python/.}"
360
		mangled_python="${mangled_python/.}"
362
361
Lines 373-378 Link Here
373
		EOF
372
		EOF
374
373
375
		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
374
		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
375
	else
376
		cat >> AutoConfig.kmk <<-EOF || die
377
			VBOX_WITH_PYTHON:=
378
		EOF
376
	fi
379
	fi
377
}
380
}
378
381
Lines 629-645 Link Here
629
		dodoc UserManual.pdf
632
		dodoc UserManual.pdf
630
	fi
633
	fi
631
634
632
	if use python ; then
635
	if use python; then
633
		local mangled_python="${EPYTHON#python}"
636
		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
634
		mangled_python="${mangled_python/./_}"
637
		if [[ ! -x "${python_path_ext}" ]]; then
635
636
		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
637
		if [[ ! -x "${python_path_ext}" ]] ; then
638
			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
638
			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
639
			eerror "but none were installed. This may happen if support for a Python target"
639
			eerror "but none were installed. This may happen if support for a Python target"
640
			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
640
			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
641
			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
641
			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
642
		fi
642
		fi
643
644
		# 378871
645
		local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer"
646
		pushd "${installer_dir}" &> /dev/null || die
647
		sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \
648
			-e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \
649
			-i vboxapi/__init__.py || die
650
		# insert shebang, the files come without one
651
		find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die
652
		python_domodule vboxapi
653
		popd &> /dev/null || die
654
		sed -e "1 i\#! ${PYTHON}" -i vboxshell.py || die
655
		python_doscript vboxshell.py
656
657
		# do not install the installer
658
		rm -r "${installer_dir}" || die
643
	fi
659
	fi
644
660
645
	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
661
	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf

Return to bug 929313