Merge branch 'master' of https://gitlab.com/src_prepare/src_prepare-overlay

Package-Manager: Portage-3.0.9, Repoman-3.0.2

app-emulation/anbox/anbox-0_pre20201129.ebuild

@@ -32,18 +32,26 @@ DEPEND="
 	>=app-emulation/lxc-3.0.0
 	dev-libs/boost[threads]
 	dev-libs/expat
+	dev-libs/properties-cpp
 	dev-libs/protobuf
+	dev-libs/sdbus-cpp
 	media-libs/libsdl2
 	media-libs/glm
+	media-libs/mesa[egl,gles2]
+	media-libs/sdl2-image
 	sys-apps/dbus
 	sys-libs/libcap
 	|| ( sys-apps/systemd sys-auth/elogind )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 CONFIG_CHECK="
 	~ANDROID_BINDERFS
 	~ANDROID_BINDER_IPC
 	~ASHMEM
+	~BLK_DEV_LOOP
+	~FUSE
 	~SQUASHFS
 	~SQUASHFS_XZ
 	~SQUASHFS_XATTR
@@ -67,12 +75,13 @@ pkg_pretend() {
 
 src_prepare() {
 	[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
-	use !systemd && eapply "${FILESDIR}"/elogind_instead_of_systemd_headers.patch
+	use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
 		-DENABLE_X11=$(usex X)
 		-DENABLE_WAYLAND=$(usex wayland)
 	)

app-emulation/anbox/anbox-9999.ebuild

@@ -32,18 +32,26 @@ DEPEND="
 	>=app-emulation/lxc-3.0.0
 	dev-libs/boost[threads]
 	dev-libs/expat
+	dev-libs/properties-cpp
 	dev-libs/protobuf
+	dev-libs/sdbus-cpp
 	media-libs/libsdl2
 	media-libs/glm
+	media-libs/mesa[egl,gles2]
+	media-libs/sdl2-image
 	sys-apps/dbus
 	sys-libs/libcap
 	|| ( sys-apps/systemd sys-auth/elogind )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 CONFIG_CHECK="
 	~ANDROID_BINDERFS
 	~ANDROID_BINDER_IPC
 	~ASHMEM
+	~BLK_DEV_LOOP
+	~FUSE
 	~SQUASHFS
 	~SQUASHFS_XZ
 	~SQUASHFS_XATTR
@@ -67,12 +75,13 @@ pkg_pretend() {
 
 src_prepare() {
 	[[ "${PV}" == "9999" ]] || mv "${WORKDIR}"/cpu_features-"${EXTCOMMIT}"/* "${S}"/external/cpu_features || die
-	use !systemd && eapply "${FILESDIR}"/elogind_instead_of_systemd_headers.patch
+	use !systemd && eapply "${FILESDIR}"/remove_systemd_dependency.patch
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
 		-DENABLE_X11=$(usex X)
 		-DENABLE_WAYLAND=$(usex wayland)
 	)

app-emulation/anbox/files/elogind_instead_of_systemd_headers.patch

@@ -1,13 +0,0 @@
-diff --git a/src/anbox/dbus/bus.h b/src/anbox/dbus/bus.h
-index 40b3d94..e798b4b 100644
---- a/src/anbox/dbus/bus.h
-+++ b/src/anbox/dbus/bus.h
-@@ -25,7 +25,7 @@
- #include <mutex>
- #include <thread>
- 
--#include <systemd/sd-bus.h>
-+#include <elogind/systemd/sd-bus.h>
- 
- namespace anbox::dbus {
- class Bus : public DoNotCopyOrMove {

app-emulation/anbox/files/no_bundled_sdbus.patch

@@ -10,14 +10,6 @@ index 713df49..1e8b462 100644
  find_package(EGL REQUIRED)
  find_package(GLESv2 REQUIRED)
  find_package(Protobuf REQUIRED)
-@@ -68,7 +69,6 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
- pkg_check_modules(DBUS dbus-1 REQUIRED)
- pkg_check_modules(LXC lxc REQUIRED)
- pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
--pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
- pkg_check_modules(LIBCAP libcap REQUIRED)
- 
- message(STATUS "LXC version: ${LXC_VERSION}")
 diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
 index f677aa0..265a2eb 100644
 --- a/external/CMakeLists.txt

app-emulation/anbox/files/remove_systemd_dependency.patch

@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 713df49..1e8b462 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +69,6 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
+ pkg_check_modules(DBUS dbus-1 REQUIRED)
+ pkg_check_modules(LXC lxc REQUIRED)
+ pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
+-pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
+ pkg_check_modules(LIBCAP libcap REQUIRED)
+
+ message(STATUS "LXC version: ${LXC_VERSION}")
+diff --git a/src/anbox/dbus/bus.h b/src/anbox/dbus/bus.h
+index 40b3d94..e798b4b 100644
+--- a/src/anbox/dbus/bus.h
++++ b/src/anbox/dbus/bus.h
+@@ -25,7 +25,7 @@
+ #include <mutex>
+ #include <thread>
+ 
+-#include <systemd/sd-bus.h>
++#include <elogind/systemd/sd-bus.h>
+ 
+ namespace anbox::dbus {
+ class Bus : public DoNotCopyOrMove {