diff --git a/app-emulation/waydroid/Manifest b/app-emulation/waydroid/Manifest
index 1514b82489..85bc684294 100644
--- a/app-emulation/waydroid/Manifest
+++ b/app-emulation/waydroid/Manifest
@@ -1 +1 @@
-DIST waydroid-1.2.1.tar.gz 222939 BLAKE2B ce69cb5ded92653b9e3c02e89e8ddab1e34ef8d4b16d1863119346495829efe6baae4bf0171d284186e0042602bf351c3926a3a900bc884f2906c9f09b62b290 SHA512 4e4aa781b84501ccde444281ab93b6c45cf91d7cda2f04565bf43bc8cdcd529b987356278f9e369a71fbb249b3bcdbd0ea56d37d48d0fbf1bf8bf186b4383a43
+DIST waydroid-1.3.4.tar.gz 231638 BLAKE2B 73418208e484172745208caa89442478643327a77a8642536a26c538129ce57e643728a22d64393b4d344502b221b124c4000c1df0838aefc5af6996e7e8bab3 SHA512 2c7feb8cfe2b6e2738159d07e12f378250f5ba6a0d0f47c0ff904af934eacde193ae0fcae1cb4fb67d1687a2ffcd2864c1eea4fa5e52c19685ffad5c702359a5
diff --git a/app-emulation/waydroid/metadata.xml b/app-emulation/waydroid/metadata.xml
new file mode 100644
index 0000000000..07f40006d9
--- /dev/null
+++ b/app-emulation/waydroid/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ denis7774@gmail.com
+ Denis Reva
+ rarogcmex
+
+
+ Waydroid uses Linux namespaces (user, pid, uts, net, mount, ipc) to run a full Android system in a container and provide Android applications on any GNU/Linux-based platform.
+
+ The Android system inside the container has direct access to any needed hardware.
+
+ The Android runtime environment ships with a minimal customized Android system image based on LineageOS. The image is currently based on Android 11.
+
+
+ waydroid/waydroid
+
+
diff --git a/app-emulation/waydroid/waydroid-1.2.1.ebuild b/app-emulation/waydroid/waydroid-1.2.1.ebuild
deleted file mode 100644
index 56c4dca322..0000000000
--- a/app-emulation/waydroid/waydroid-1.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-#Relaismatrix/ Messung Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-r1
-
-DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
-HOMEPAGE="https://waydro.id"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
- app-containers/lxc
- $(python_gen_cond_dep '
- dev-python/pygobject[${PYTHON_USEDEP}]
- dev-python/gbinder[${PYTHON_USEDEP}]
- ')
- net-firewall/nftables
- net-dns/dnsmasq \
- ${PYTHON_DEPS}
-"
-
-src_install() {
- python_fix_shebang waydroid.py
- mv waydroid.py waydroid || die
- python_doscript waydroid
- python_domodule tools
- python_domodule data
- insinto "/usr/share/applications"
- doins "data/Waydroid.desktop"
- insinto "/etc/gbinder.d"
- doins "gbinder/anbox.conf"
- insinto "/usr/lib/systemd/system"
- doins "debian/waydroid-container.service"
-}
diff --git a/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild b/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
new file mode 100644
index 0000000000..dfecb4019e
--- /dev/null
+++ b/app-emulation/waydroid/waydroid-1.3.4-r2.ebuild
@@ -0,0 +1,46 @@
+#Relaismatrix/ Messung Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit linux-info python-single-r1
+
+DESCRIPTION="Container-based approach to boot a full Android system on Linux systems"
+HOMEPAGE="https://waydro.id"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="systemd"
+
+DEPEND="|| ( virtual/linux-sources virtual/dist-kernel )"
+RDEPEND="
+ systemd? ( sys-apps/systemd )
+ app-containers/lxc[systemd?]
+ $(python_gen_cond_dep '
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ >=dev-python/gbinder-1.1.1[${PYTHON_USEDEP}]
+ >=dev-libs/gbinder-1.1.21
+ ')
+ net-firewall/nftables[modern-kernel]
+ net-dns/dnsmasq
+ >=dev-libs/libglibutil-1.0.67
+ ${PYTHON_DEPS}
+"
+
+CONFIG_CHECK="
+ ~ANDROID_BINDER_IPC
+ ~ANDROID_BINDERFS
+ ~MEMFD_CREATE
+"
+ERROR_ANDROID_BINDERFS="CONFIG_ANDROID_BINDERFS: need for creating Android-specific binder IPC channels"
+ERROR_ANDROID_BINDER_IPC="CONFIG_ANDROID_BINDER_IPC: need for creating Android-specific binder IPC channels"
+ERROR_MEMFD_CREATE="CONFIG_MEMFD_CREATE: it completely replaced deprecated ISHMEM drivers, therefore it's vital for android-specific memory management"
+
+src_install() {
+ python_fix_shebang waydroid.py
+ emake install DESTDIR="${D}" USE_NFTABLES=1 USE_SYSTEMD=$(usex systemd 1 0)
+}
diff --git a/dev-libs/ayatana-ido/Manifest b/dev-libs/ayatana-ido/Manifest
deleted file mode 100644
index d766156e51..0000000000
--- a/dev-libs/ayatana-ido/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ayatana-ido-0.9.1.tar.gz 122031 BLAKE2B 0f294346948b142cd39adb41ac1111f6cb214db793f912444ee18eeca9447d92c433b2104d14cbd259c7177da1b91ddbeb5376264f460390d1cbb5c320decc60 SHA512 4a5b13abd43cff59e4471b7a80e3a1e892b9b55e854867eed7c2928307f86b5ccfcb70fb5822738cedaaefe1ad09abe0da9af2d95917a1c561f1e370ea099613
diff --git a/dev-libs/ayatana-ido/ayatana-ido-0.9.1.ebuild b/dev-libs/ayatana-ido/ayatana-ido-0.9.1.ebuild
deleted file mode 100644
index 11e043a9f2..0000000000
--- a/dev-libs/ayatana-ido/ayatana-ido-0.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_USE_DEPEND="vapigen"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake vala
-
-DESCRIPTION="Ayatana Application Indicators (Shared Library)"
-HOMEPAGE="https://github.com/AyatanaIndicators/ayatana-ido"
-SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- sys-libs/glibc \
- >=dev-libs/glib-2.58 \
- >=x11-libs/gtk+-3.24 \
- "
-
-BDEPEND="
- ${RDEPEND} \
- $(vala_depend) \
- >=dev-util/cmake-3.13 \
- dev-libs/gobject-introspection \
- "
-
-src_prepare() {
- cmake_src_prepare
- vala_setup
-}
-
-src_configure() {
- local mycmakeargs+=(
- "-DVALA_COMPILER=${VALAC}"
- "-DVAPI_GEN=${VAPIGEN}"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
diff --git a/dev-libs/gbinder/Manifest b/dev-libs/gbinder/Manifest
index 2c499c4a64..5667b8a36a 100644
--- a/dev-libs/gbinder/Manifest
+++ b/dev-libs/gbinder/Manifest
@@ -1 +1 @@
-DIST gbinder-1.1.19.tar.gz 197559 BLAKE2B de07166eb216306904aabc05c0604afc0e50913dcf187a42f157e6996f6e7e90a974b583364b5c7ea060f6091453cb730257bf16e3fa75dea735cac286186220 SHA512 14837d125f20e9d633a6cbbfb05bf15414daf1716d3b170ae047f78fb74754fcc085394fd773337563340f0ffdc9d550fd8a1dd38d81c46d6abe4150690f6710
+DIST gbinder-1.1.30.tar.gz 205795 BLAKE2B a61b720a3d2b9fe79a4754c2e58569d05d8a16bd5dd35ac4e7616401b804604245e2b13a6ef12043737a00ce2f983bc01b408c5b2b68fe0db1b9c9e15b68ca84 SHA512 24e4e5156ab3f90dc2255b40ed6e74d0f14bce61879891179ae7291622b4179dd769749635f2811bc8a9f868257224385cf90ab43bd36a52e2f30e92ecb7ffd4
diff --git a/dev-libs/gbinder/gbinder-1.1.19.ebuild b/dev-libs/gbinder/gbinder-1.1.30-r1.ebuild
similarity index 74%
rename from dev-libs/gbinder/gbinder-1.1.19.ebuild
rename to dev-libs/gbinder/gbinder-1.1.30-r1.ebuild
index 652d4e380c..8caa9ed802 100644
--- a/dev-libs/gbinder/gbinder-1.1.19.ebuild
+++ b/dev-libs/gbinder/gbinder-1.1.30-r1.ebuild
@@ -11,7 +11,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/mer-hybris/libgbinder/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="GLib-style interface to binder"
@@ -24,9 +24,9 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_compile() {
- emake KEEP_SYMBOLS=1
+ emake KEEP_SYMBOLS=1 ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)"
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-dev
+ emake DESTDIR="${D}" ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" install-dev
}
diff --git a/dev-libs/gbinder/gbinder-9999.ebuild b/dev-libs/gbinder/gbinder-9999.ebuild
index 652d4e380c..8caa9ed802 100644
--- a/dev-libs/gbinder/gbinder-9999.ebuild
+++ b/dev-libs/gbinder/gbinder-9999.ebuild
@@ -11,7 +11,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/mer-hybris/libgbinder/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="GLib-style interface to binder"
@@ -24,9 +24,9 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_compile() {
- emake KEEP_SYMBOLS=1
+ emake KEEP_SYMBOLS=1 ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)"
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-dev
+ emake DESTDIR="${D}" ABS_LIBDIR="/usr/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" install-dev
}
diff --git a/dev-libs/gbinder/metadata.xml b/dev-libs/gbinder/metadata.xml
new file mode 100644
index 0000000000..2161ec3cb8
--- /dev/null
+++ b/dev-libs/gbinder/metadata.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ denis7774@gmail.com
+ Denis Reva
+ rarogcmex
+
+
+ GLib-style interface to binder (Android IPC mechanism)
+
+ Key features:
+
+ 1. Integration with GLib event loop
+ 2. Detection of 32 vs 64 bit kernel at runtime
+ 3. Asynchronous transactions that don't block the event thread
+ 4. Stable service manager and low-level transaction APIs
+
+ Android keeps changing both low-level RPC and service manager
+ protocols from version to version. To counter that, libgbinder
+ implements configirable backends for different variants of those,
+ and yet keeping its own API unchanged.
+
+
+ mer-hybris/libgbinder
+
+
diff --git a/dev-libs/libayatana-appindicator/Manifest b/dev-libs/libayatana-appindicator/Manifest
deleted file mode 100644
index c08d807572..0000000000
--- a/dev-libs/libayatana-appindicator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libayatana-appindicator-0.5.91.tar.gz 158269 BLAKE2B e1df60ce2b3ff5712cabf627a54e0767dcbc94d4e11c96a18fd20079642e6d033bfdd9e57d12235c72075cef1d711f5b042fb0a6282a6120018c8cdcc3b4033c SHA512 cc8631814c881640bf2de91a43205c3405fd1fefcd7d58f259171d0926bf7ab08f9361076f4eea1dd8876e8931f9c9230babd3a328f34dc298bc9c4ff004f8ee
diff --git a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild b/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
deleted file mode 100644
index 9d79c9a3f7..0000000000
--- a/dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.91.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_USE_DEPEND="vapigen"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit vala
-
-DESCRIPTION="Ayatana Application Indicators (Shared Library)"
-HOMEPAGE="https://github.com/AyatanaIndicators/libayatana-appindicator"
-SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FEATURES="${FEATURES} -sandbox"
-
-RDEPEND="
- dev-libs/libdbusmenu[gtk3] \
- >=dev-libs/libayatana-indicator-0.9.0 \
- "
-
-BDEPEND="
- $(vala_depend)
- dev-util/cmake \
- >=dev-libs/glib-2.37 \
- >=x11-libs/gtk+-3.24 \
- dev-libs/gobject-introspection \
- dev-lang/mono \
- >=dev-dotnet/gtk-sharp-2.99 \
- "
-src_prepare() {
- vala_setup
- default
-}
-
-src_configure() {
- cmake . -DVALA_COMPILER=/usr/bin/valac-$(vala_best_api_version) -DVAPI_GEN=/usr/bin/vapigen-$(vala_best_api_version) || die
-}
-
-src_install() {
- insinto /usr/include/
- doins "${S}/src/app-indicator.h"
- doins "${S}/src/app-indicator-enum-types.h"
- insinto /usr/$(get_libdir)/pkgconfig/
- doins "${S}/src/ayatana-appindicator3-0.1.pc"
- doins "${S}/bindings/mono/ayatana-appindicator3-sharp-0.1.pc"
- insinto /usr/$(get_libdir)/
- doins "${S}/src/libayatana-appindicator3.so.1.0.0"
- dosym libayatana-appindicator3.so.1.0.0 /usr/$(get_libdir)/libayatana-appindicator3.so.1
- dosym libayatana-appindicator3.so.1 /usr/$(get_libdir)/libayatana-appindicator3.so
- insinto /usr/$(get_libdir)/girepository-1.0/
- doins "${S}/src/AyatanaAppIndicator3-0.1.typelib"
- doins "${S}/src/AyatanaAppIndicator3-0.1.typelib"
- insinto /usr/$(get_libdir)/ayatana-appindicator3-sharp-0.1
- doins "${S}/bindings/mono/ayatana-appindicator3-sharp.dll.config"
- doins "${S}/bindings/mono/ayatana-appindicator3-sharp.dll"
- doins "${S}/bindings/mono/policy.0.0.ayatana-appindicator3-sharp.config"
- doins "${S}/bindings/mono/policy.0.0.ayatana-appindicator3-sharp.dll"
- doins "${S}/bindings/mono/policy.0.1.ayatana-appindicator3-sharp.config"
- doins "${S}/bindings/mono/policy.0.1.ayatana-appindicator3-sharp.dll"
- dodir /usr/$(get_libdir)/mono/gac/ayatana-appindicator3-sharp/
- dodir /usr/$(get_libdir)/mono/gac/ayatana-appindicator3-sharp/0.5.91.0__bcae265d1c7ab4c2/
- insinto /usr/$(get_libdir)/mono/gac/ayatana-appindicator3-sharp/0.5.91.0__bcae265d1c7ab4c2/
- doins "${S}/bindings/mono/ayatana-appindicator3-sharp.dll.config"
- doins "${S}/bindings/mono/ayatana-appindicator3-sharp.dll"
- dodir /usr/$(get_libdir)/mono/gac/policy.0.0.ayatana-appindicator3-sharp
- dodir /usr/$(get_libdir)/mono/gac/policy.0.0.ayatana-appindicator3-sharp/0.0.0.0__bcae265d1c7ab4c2/
- insinto /usr/$(get_libdir)/mono/gac/policy.0.0.ayatana-appindicator3-sharp/0.0.0.0__bcae265d1c7ab4c2/
- doins "${S}/bindings/mono/policy.0.0.ayatana-appindicator3-sharp.config"
- doins "${S}/bindings/mono/policy.0.0.ayatana-appindicator3-sharp.dll"
- dodir /usr/$(get_libdir)/mono/ayatana-appindicator3-sharp
- # dosym /usr/$(get_libdir)/mono/gac/ayatana-appindicator3-sharp/0.5.91.0__bcae265d1c7ab4c2/ayatana-appindicator3-sharp.dll /usr/$(get_libdir)/mono/ayatana-appindicator3-sharp/ayatana-appindicator3-sharp.dll
- # dosym /usr/$(get_libdir)/mono/gac/policy.0.0.ayatana-appindicator3-sharp/0.0.0.0__bcae265d1c7ab4c2/policy.0.0.ayatana-appindicator3-sharp.dll /$(get_libdir)/mono/ayatana-appindicator3-sharp/policy.0.0.ayatana-appindicator3-sharp.dll
- dosym ayatana-appindicator3-sharp.dll /usr/$(get_libdir)/mono/ayatana-appindicator3-sharp/ayatana-appindicator3-sharp.dll
- dosym policy.0.0.ayatana-appindicator3-sharp.dll /usr/$(get_libdir)/mono/ayatana-appindicator3-sharp/policy.0.0.ayatana-appindicator3-sharp.dll
- insinto /usr/share/gir-1.0
- doins "${S}/src/AyatanaAppIndicator3-0.1.gir"
- insinto /usr/share/vala/vapi
- doins "${S}/bindings/vala/ayatana-appindicator3-0.1.deps"
- doins "${S}/bindings/vala/ayatana-appindicator3-0.1.vapi"
- insinto /usr/include
- doins "${S}/src/app-indicator.h"
- doins "${S}/src/app-indicator-enum-types.h"
-
-}
diff --git a/dev-libs/libayatana-indicator/Manifest b/dev-libs/libayatana-indicator/Manifest
deleted file mode 100644
index 11cd6416ce..0000000000
--- a/dev-libs/libayatana-indicator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libayatana-indicator-0.9.1.tar.gz 148993 BLAKE2B 7e5e72a6075bc6dafa83ed4e9cc07f06011127477e8b12a023fd92c431f5e784663e9bcb27de29a89d23ccda7c905363b3560714a8abcded809faa9ea2225447 SHA512 47870f7cdef1d1c67a3f72a9fa68a39d0c49d899f831a9c1ca83588cdb6e0523a77eab41110a3f839cd8694bb1b22c2c67206608226353ffebb399062b54d1b0
diff --git a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.1-r1.ebuild b/dev-libs/libayatana-indicator/libayatana-indicator-0.9.1-r1.ebuild
deleted file mode 100644
index 5122c4ab5f..0000000000
--- a/dev-libs/libayatana-indicator/libayatana-indicator-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_USE_DEPEND="vapigen"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake vala
-
-DESCRIPTION="Ayatana Application Indicators (Shared Library)"
-HOMEPAGE="https://github.com/AyatanaIndicators/libayatana-indicator"
-SRC_URI="https://github.com/AyatanaIndicators/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- sys-libs/glibc \
- >=dev-libs/glib-2.58 \
- >=x11-libs/gtk+-3.24 \
- "
-
-BDEPEND="
- ${RDEPEND} \
- $(vala_depend) \
- >=dev-util/cmake-3.13 \
- dev-libs/gobject-introspection \
- >=dev-libs/ayatana-ido-0.8.2 \
- "
-
-src_prepare() {
- cmake_src_prepare
- vala_setup
-}
-
-src_configure() {
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
diff --git a/dev-libs/libglibutil/Manifest b/dev-libs/libglibutil/Manifest
index b3c42faece..d06f4a9804 100644
--- a/dev-libs/libglibutil/Manifest
+++ b/dev-libs/libglibutil/Manifest
@@ -1 +1 @@
-DIST libglibutil-1.0.63.tar.gz 58371 BLAKE2B 731b4447e00209bc53d49297e7ad5c8535006a2a33a2b0d82268f2792da485685ec9a0051e533eba3afc3d8a714583c0189a0da2d577c94d5d0366cb29561020 SHA512 f45e9407d7a4872f25877fd3e20162a501423c795f053a5d4566fc95081258c2acd469ee5eafa01c49c3731dca6a1e07bfbc970817b3e8644ac10f3e6e5506c5
+DIST libglibutil-1.0.67.tar.gz 58717 BLAKE2B b53f6b416b974a0b7d24dba1c8497e5c8eceec32734006ab7c2bc5e5ce45e70ce63a0719f7a10127b90ad88394220edc4d2a97825fb82f7173bb68032e5f2e48 SHA512 5b8d4b00ae149bba0b2df55d5e23910dc52ef3a7ee9162202afe4774e246e9389ba971b3d54ac0542b3678b15a3310c8d0e7536b7296d1a3b82e2ae2f021c541
diff --git a/dev-libs/libglibutil/libglibutil-1.0.63.ebuild b/dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild
similarity index 87%
rename from dev-libs/libglibutil/libglibutil-1.0.63.ebuild
rename to dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild
index 293c7b480e..68582392a1 100644
--- a/dev-libs/libglibutil/libglibutil-1.0.63.ebuild
+++ b/dev-libs/libglibutil/libglibutil-1.0.67-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/sailfishos/libglibutil.git"
else
SRC_URI="https://github.com/sailfishos/libglibutil/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Library of glib utilities"
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_compile() {
- emake KEEP_SYMBOLS=1
+ emake KEEP_SYMBOLS=1 LIBDIR="/usr/$(get_libdir)"
}
src_install() {
diff --git a/dev-libs/libglibutil/libglibutil-9999.ebuild b/dev-libs/libglibutil/libglibutil-9999.ebuild
new file mode 100644
index 0000000000..68582392a1
--- /dev/null
+++ b/dev-libs/libglibutil/libglibutil-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/sailfishos/libglibutil.git"
+else
+ SRC_URI="https://github.com/sailfishos/libglibutil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Library of glib utilities"
+HOMEPAGE="https://github.com/sailfishos/libglibutil"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="dev-libs/glib"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+ emake KEEP_SYMBOLS=1 LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install-dev
+}
diff --git a/dev-libs/libglibutil/metadata.xml b/dev-libs/libglibutil/metadata.xml
new file mode 100644
index 0000000000..d5cb994e10
--- /dev/null
+++ b/dev-libs/libglibutil/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ denis7774@gmail.com
+ Denis Reva
+ rarogcmex
+
+
+ Library of glib utilities from sailfish os.
+
+
+ sailfishos/libglibutil
+
+
diff --git a/dev-python/gbinder/Manifest b/dev-python/gbinder/Manifest
index a17031d324..3bc720ddfc 100644
--- a/dev-python/gbinder/Manifest
+++ b/dev-python/gbinder/Manifest
@@ -1 +1,2 @@
DIST gbinder-1.0.0.tar.gz 22640 BLAKE2B dbd0b07c693c803c6646fded1ea0b546d7dc40a1a5f1592601d28d63dbe5113b2bcc07314710c7ba1b47f3417b943398e720ece089ff8a68856e7b2cfda55ae1 SHA512 3b52c01c99321108a3d5c0129fb4fcf22d164e5de1e197f0e01a77e3bcbf9c4fd7ee35ce58131f545f65561c622b30f5919f4bdc995005b00a18a15c695fbf51
+DIST gbinder-1.1.1.tar.gz 24340 BLAKE2B d93d332e0c8a04c5adbf0ca2680d32a7e8d7b0ba8350f50b365966b8bce082456b3463509334831fc376ebecc0f2dd67542bd5d45c94e028d325458944a70147 SHA512 1910d6e904ac46da519064e9dc57e4059e1ea7072f2cf4b7ca0888a73701a590ff565fe9e9ca67acf94dba2a69f3138457d8b9533c2360befdd508b983f32a03
diff --git a/dev-python/gbinder/gbinder-1.1.1.ebuild b/dev-python/gbinder/gbinder-1.1.1.ebuild
new file mode 100644
index 0000000000..b937077563
--- /dev/null
+++ b/dev-python/gbinder/gbinder-1.1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+if [[ ${PV} != *9999* ]]; then
+ MY_PN="${PN}-python"
+ MY_P="${MY_PN}-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/erfanoabdi/gbinder-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/erfanoabdi/gbinder-python.git"
+fi
+
+DESCRIPTION="Python bindings for libgbinder"
+HOMEPAGE="https://github.com/erfanoabdi/gbinder-python"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="dev-libs/gbinder
+ dev-libs/libglibutil"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-python/cython[${PYTHON_USEDEP}]
+"
+
+python_compile() {
+ distutils-r1_python_compile --cython
+}
diff --git a/dev-python/gbinder/metadata.xml b/dev-python/gbinder/metadata.xml
new file mode 100644
index 0000000000..48efb4328a
--- /dev/null
+++ b/dev-python/gbinder/metadata.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ denis7774@gmail.com
+ Denis Reva
+ rarogcmex
+
+
+ Cython extension module for gbinder
+ Prerequisites
+ libgbinder
+ libglibutil
+ pkgconf
+ For development, you will also need Cython:
+
+ pip install cython
+ Description
+ There are two Cython files: cgbinder.pxd describing the C++ API of the libgbinder library, and gbinder.pyx describing classes that will be visible from Python user code. The .pyx imports .pxd to learn about C functions available to be called.
+
+ There is also setup.py file. This file describes how to build the extension module, using distutils. In there, we specify the library to link with as libraries=['gbinder']. The gbinder stands for libgbinder.so that we previously installed.
+
+ There are two options to build the package:
+
+ One, use Cython's cythonize() function to generate a .c file from the .pyx one, and then compile it against the libgbinder.so library.
+ Two, if the .c is already provided, just compile it - no Cython required!
+ Development build
+ For development, use option 1 by providing --cython flag:
+
+ python setup.py build_ext --inplace --cython
+ The result will be a .so shared library named like gbinder.cpython-38-x86_64-linux-gnu.so. build_ext means we're building a C++ extension. --inplace means to put it in the current directory. If you run python from current directory, you'll be able to import gbinder.
+
+
+ erfanoabdi/gbinder-python
+
+
diff --git a/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild b/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
index 9d9d64e529..efd32fc2aa 100644
--- a/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
+++ b/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
@@ -14,10 +14,12 @@ SRC_URI="
https://gitlab.com/api/v4/projects/41581401/packages/generic/${PN}/${PV}+${DEPS_DATE}/${P}-deps.tar.xz
"
-LICENSE="Apache-2.0 BSD MIT GPL-2+"
+LICENSE="Apache-2.0 BSD MIT || ( FTL GPL-2+ )"
SLOT="0"
KEYWORDS="~amd64"
+RESTRICT="bindist" # possibly incompatible with GPL-2+
+
DEPEND="
media-libs/alsa-lib
media-libs/libglvnd
diff --git a/games-puzzle/aaaaxy/aaaaxy-1.2.399.ebuild b/games-puzzle/aaaaxy/aaaaxy-1.2.399.ebuild
index e404622704..828c934dec 100644
--- a/games-puzzle/aaaaxy/aaaaxy-1.2.399.ebuild
+++ b/games-puzzle/aaaaxy/aaaaxy-1.2.399.ebuild
@@ -14,10 +14,12 @@ SRC_URI="
https://gitlab.com/api/v4/projects/41581401/packages/generic/${PN}/${PV}+${DEPS_DATE}/${P}-deps.tar.xz
"
-LICENSE="Apache-2.0 BSD MIT GPL-2+"
+LICENSE="Apache-2.0 BSD MIT || ( FTL GPL-2+ )"
SLOT="0"
KEYWORDS="~amd64"
+RESTRICT="bindist" # possibly incompatible with GPL-2+
+
DEPEND="
media-libs/alsa-lib
media-libs/libglvnd
diff --git a/gui-apps/gtklock/Manifest b/gui-apps/gtklock/Manifest
index b2458341b6..d2bcfc4316 100644
--- a/gui-apps/gtklock/Manifest
+++ b/gui-apps/gtklock/Manifest
@@ -1,4 +1 @@
-AUX gtklock-2.0.1-makefile.patch 309 BLAKE2B 3167acde7c0e90c17b3fd26a070bc673f324b1faf9939428c14f6a3569636fd7ce9974d81b1a5f4e15f9b68d98a9197d384b7487c8f315cd4ea6916e7f63289f SHA512 9307d643210b519b6a43c3fd631608c67e512be76c15a183c3e133829ba8ab813e4b301f4e5f594aae56ef6b44a7191e55a00b2c79c9a0dcfa7387cc3dacf1c5
DIST gtklock-2.0.1.tar.gz 56129 BLAKE2B 70b0aa3be5430665314d50f2d1322a4c57e7202b44b579f06712608b34797928b050aedb5a1c86e98d80a16f8c90fbd1a9b466a499ed04c44ef690805ea6bbf7 SHA512 d9ef0bacf78bcfaf71b4252b8f48678970b044a8fb4de4ab6e6c8a7ac5047b5ad1092401b5f1f57fd009cd9bf508ed7390ef84b71dffa2e994b74b996d7136f3
-EBUILD gtklock-2.0.1.ebuild 462 BLAKE2B f2d5ec82cfa852a4d5e155603c46c728ce8baa5d7e159b53d162ef21e3810d00d649c0f00c65abfff100a746d400998bfc0446338eb35d8d3b838934c4e84c8d SHA512 43e8accab79492899e048a2f1abec0a396ca9bffd2351ff9de2d12fbd5235cda423cbb141ccaf15a419fd13ce5691fa84d9c6e044e5cfa6cbb435d22a74fcfb5
-MISC metadata.xml 323 BLAKE2B ce78e71bc84ee58711e086cbd255ec901d3786d927f96d7564cf564869760c3ca532dca340b7123e33038477e869a48e1a3bf8087a0758fd7c8f876b65f13bce SHA512 071c746703586fb82565822e4050002eee97218703639ed0ac7db35f1e5e919da2f073eb8dbfb6a0f0d3ea45b147beaeef0ccfbc06e25d526958b8a0ff7a77ab
diff --git a/gui-apps/gtklock/gtklock-2.0.1.ebuild b/gui-apps/gtklock/gtklock-2.0.1.ebuild
index d664780557..be9e541f9d 100644
--- a/gui-apps/gtklock/gtklock-2.0.1.ebuild
+++ b/gui-apps/gtklock/gtklock-2.0.1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="sys-libs/pam
- gui-libs/gtk-layer-shell"
+ >=gui-libs/gtk-layer-shell-0.6.0"
BDEPEND="app-text/scdoc"
diff --git a/gui-apps/yambar/Manifest b/gui-apps/yambar/Manifest
index 6b53d51c92..3f49a14ed7 100644
--- a/gui-apps/yambar/Manifest
+++ b/gui-apps/yambar/Manifest
@@ -1,3 +1,4 @@
DIST yambar-1.6.2.tar.gz 135455 BLAKE2B 71d5b584bf04a7212ac84d8e0d8cb71c1abd7c7548c5ec998aff480d76afbd09825b059fe642edd4dd2537af6a5b811bd333a45bfa53f6a3a814a2be95eb58b4 SHA512 64a5e983be6dc99feb2f39d06fe265163c3b8f3f23f33a58c386891b63a9c915816cbde22d031473e700e839522c86c53b06f0cce1a57ebdab8ed6aeebe627e1
DIST yambar-1.7.0.tar.gz 148762 BLAKE2B a394b588bb1a8c64e149f8f39d6a8056d139cb3518fc15c87db0da7ead9c96ce5d7b9d764a617c4626d9fa574edbda2c0e1e2b11b07741241188c5cd282d5643 SHA512 e34cc808533cf76ff0b95d18346b796b4758271b0a61151e80b33eaa0ce34c2d5a9f1c6671d28f377d1563a7979c5784782b9f2f87a3cb615efb129e89865ad3
DIST yambar-1.8.0.tar.gz 157936 BLAKE2B d9fc01d71c89550c59b470f9bd3de27e44cc5d64f2103f8803c9c2b25c51b5240f54c41041c126df2b606ae011d9fca974723cafb45670eae70ef20bb3f765b6 SHA512 db2c3669162923b4ca2b1f13f50d203de2a0eb6963e6d2bfe8b03e41c7cb4ad9acf6607eef08b6da837c901374c89affb915aa44f2bc2e0eb4694ad91ae66a67
+DIST yambar-1.9.0.tar.gz 186338 BLAKE2B 9fd043aab241c75e84bcdffcfed51bd24d3a687ff80f4b44517168fc46a33934467fd8bf7a315076e15fc74e157f3bccf703ae2fd32ed969082c383570b0f3bd SHA512 de1acf1e738b33e2e0ee1dba497b5b84137028551827c38eee67fdc5bfb688f2037a52ccac7f5fb56ffeed7382e4cd670fd0b564c7f532f21a85724640c8004b
diff --git a/gui-apps/yambar/files/round.patch b/gui-apps/yambar/files/round.patch
new file mode 100644
index 0000000000..a934c0e834
--- /dev/null
+++ b/gui-apps/yambar/files/round.patch
@@ -0,0 +1,68 @@
+From ede6a541e1c6a861461c189513187a69e3e5ce91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?=
+Date: Sat, 17 Dec 2022 18:15:14 +0100
+Subject: [PATCH] =?UTF-8?q?modules:=20meson:=20add=20missing=20=E2=80=98m?=
+ =?UTF-8?q?=E2=80=99=20(math)=20dependency?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The following modules used functions from the ‘m’ (math)
+library (e.g. round()), but didn’t explicitly link against it. This
+caused build failures when no other plugin that _did_ link against ‘m’
+was enabled.
+
+* cpu
+* mem
+* pulse
+* pipewire
+* foreign-toplevel
+
+Closes #239
+---
+
+diff --git a/modules/meson.build b/modules/meson.build
+index 49aba6d..f8d1e80 100644
+--- a/modules/meson.build
++++ b/modules/meson.build
+@@ -70,7 +70,7 @@ if plugin_clock_enabled
+ endif
+
+ if plugin_cpu_enabled
+- mod_data += {'cpu': [[], [dynlist]]}
++ mod_data += {'cpu': [[], [m, dynlist]]}
+ endif
+
+ if plugin_disk_io_enabled
+@@ -82,7 +82,7 @@ if plugin_dwl_enabled
+ endif
+
+ if plugin_mem_enabled
+- mod_data += {'mem': [[], []]}
++ mod_data += {'mem': [[], [m]]}
+ endif
+
+ if plugin_mpd_enabled
+@@ -102,11 +102,11 @@ if plugin_network_enabled
+ endif
+
+ if plugin_pipewire_enabled
+- mod_data += {'pipewire': [[], [pipewire, dynlist, json_pipewire]]}
++ mod_data += {'pipewire': [[], [m, pipewire, dynlist, json_pipewire]]}
+ endif
+
+ if plugin_pulse_enabled
+- mod_data += {'pulse': [[], [pulse]]}
++ mod_data += {'pulse': [[], [m, pulse]]}
+ endif
+
+ if plugin_removables_enabled
+@@ -170,7 +170,7 @@ if plugin_foreign_toplevel_enabled
+ command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
+ endforeach
+
+- mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers + ftop_proto_headers + ftop_proto_src], [dynlist, wayland_client]]}
++ mod_data += {'foreign-toplevel': [[wl_proto_src + wl_proto_headers + ftop_proto_headers + ftop_proto_src], [m, dynlist, wayland_client]]}
+ endif
+
+ foreach mod, data : mod_data
diff --git a/gui-apps/yambar/metadata.xml b/gui-apps/yambar/metadata.xml
index 48e360af70..8a88bd9d2c 100644
--- a/gui-apps/yambar/metadata.xml
+++ b/gui-apps/yambar/metadata.xml
@@ -5,8 +5,36 @@
leonardo@neumann.dev.br
Leonardo Neumann
+
+ julien@jroy.ca
+ Julien Roy
+
https://codeberg.org/dnkl/yambar/issues
https://codeberg.org/dnkl/yambar/releases
+
diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild b/gui-apps/yambar/yambar-1.9.0.ebuild
new file mode 100644
index 0000000000..1c24b420d4
--- /dev/null
+++ b/gui-apps/yambar/yambar-1.9.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git"
+fi
+
+DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
+HOMEPAGE="https://codeberg.org/dnkl/yambar"
+LICENSE="MIT"
+SLOT="0"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland X xkb xwindow"
+REQUIRED_USE="
+ || ( wayland X )
+ sway-xkb? ( wayland )
+ xkb? ( X )
+ xwindow? ( X )
+"
+
+RDEPEND="
+ >=media-libs/fcft-2.4.0
+ dev-libs/libyaml
+ alsa? ( media-libs/alsa-lib )
+ backlight? ( virtual/libudev:= )
+ battery? ( virtual/libudev:= )
+ mpd? ( media-libs/libmpdclient )
+ pipewire? (
+ dev-libs/json-c
+ media-video/pipewire
+ )
+ pulseaudio? ( media-libs/libpulse )
+ removables? ( virtual/libudev:= )
+ sway-xkb? ( dev-libs/json-c )
+ x11-libs/pixman
+ X? (
+ x11-libs/libxcb:0=[xkb]
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-wm
+ )
+ wayland? ( dev-libs/wayland )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-text/scdoc
+ >=dev-libs/tllist-1.0.1
+ >=dev-util/meson-0.53.0
+ virtual/pkgconfig
+ wayland? (
+ dev-libs/wayland-protocols
+ dev-util/wayland-scanner
+ )
+"
+
+PATCHES="
+ ${FILESDIR}/round.patch
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature wayland backend-wayland)
+ $(meson_feature X backend-x11)
+ $(meson_use core core-plugins-as-shared-libraries)
+ $(meson_feature alsa plugin-alsa)
+ $(meson_feature backlight plugin-backlight)
+ $(meson_feature battery plugin-battery)
+ $(meson_feature clock plugin-clock)
+ $(meson_feature cpu plugin-cpu)
+ $(meson_feature disk-io plugin-disk-io)
+ $(meson_feature dwl plugin-dwl)
+ $(meson_feature foreign-toplevel plugin-foreign-toplevel)
+ $(meson_feature memory plugin-mem)
+ $(meson_feature mpd plugin-mpd)
+ $(meson_feature i3 plugin-i3)
+ $(meson_feature label plugin-label)
+ $(meson_feature network plugin-network)
+ $(meson_feature pipewire plugin-pipewire)
+ $(meson_feature pulseaudio plugin-pulse)
+ $(meson_feature removables plugin-removables)
+ $(meson_feature river plugin-river)
+ $(meson_feature script plugin-script)
+ $(meson_feature sway-xkb plugin-sway-xkb)
+ $(meson_feature xkb plugin-xkb)
+ $(meson_feature xwindow plugin-xwindow)
+ -Dwerror=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ rm -rf "${D}/usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+ ewarn "Warning: if you are upgrading from 1.8.0, please note that there are breaking changes that might affect your config.yml file."
+ ewarn "See the changelog for more information"
+ ewarn "https://codeberg.org/dnkl/yambar/releases/tag/1.9.0"
+}
diff --git a/gui-apps/yambar/yambar-9999.ebuild b/gui-apps/yambar/yambar-9999.ebuild
index 5b1dbd73e6..94cf9bebbf 100644
--- a/gui-apps/yambar/yambar-9999.ebuild
+++ b/gui-apps/yambar/yambar-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit meson
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
S="${WORKDIR}/${PN}"
else
inherit git-r3
@@ -18,24 +17,36 @@ DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
HOMEPAGE="https://codeberg.org/dnkl/yambar"
LICENSE="MIT"
SLOT="0"
-IUSE="wayland X"
-REQUIRED_USE="|| ( wayland X )"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl +foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio +removables +river +script sway-xkb wayland X xkb xwindow"
+REQUIRED_USE="
+ || ( wayland X )
+ sway-xkb? ( wayland )
+ xkb? ( X )
+ xwindow? ( X )
+"
RDEPEND="
>=media-libs/fcft-2.4.0
- dev-libs/json-c
dev-libs/libyaml
- media-libs/alsa-lib
- media-libs/libmpdclient
- virtual/libudev:=
+ alsa? ( media-libs/alsa-lib )
+ backlight? ( virtual/libudev:= )
+ battery? ( virtual/libudev:= )
+ mpd? ( media-libs/libmpdclient )
+ pipewire? (
+ dev-libs/json-c
+ media-video/pipewire
+ )
+ pulseaudio? ( media-libs/libpulse )
+ removables? ( virtual/libudev:= )
+ sway-xkb? ( dev-libs/json-c )
x11-libs/pixman
- wayland? ( dev-libs/wayland )
X? (
x11-libs/libxcb:0=[xkb]
x11-libs/xcb-util
x11-libs/xcb-util-cursor
x11-libs/xcb-util-wm
)
+ wayland? ( dev-libs/wayland )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -53,6 +64,28 @@ src_configure() {
local emesonargs=(
$(meson_feature wayland backend-wayland)
$(meson_feature X backend-x11)
+ $(meson_use core core-plugins-as-shared-libraries)
+ $(meson_feature alsa plugin-alsa)
+ $(meson_feature backlight plugin-backlight)
+ $(meson_feature battery plugin-battery)
+ $(meson_feature clock plugin-clock)
+ $(meson_feature cpu plugin-cpu)
+ $(meson_feature disk-io plugin-disk-io)
+ $(meson_feature dwl plugin-dwl)
+ $(meson_feature foreign-toplevel plugin-foreign-toplevel)
+ $(meson_feature memory plugin-mem)
+ $(meson_feature mpd plugin-mpd)
+ $(meson_feature i3 plugin-i3)
+ $(meson_feature label plugin-label)
+ $(meson_feature network plugin-network)
+ $(meson_feature pipewire plugin-pipewire)
+ $(meson_feature pulseaudio plugin-pulse)
+ $(meson_feature removables plugin-removables)
+ $(meson_feature river plugin-river)
+ $(meson_feature script plugin-script)
+ $(meson_feature sway-xkb plugin-sway-xkb)
+ $(meson_feature xkb plugin-xkb)
+ $(meson_feature xwindow plugin-xwindow)
-Dwerror=false
)
meson_src_configure
diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index a8b19d2ae6..5f4e35ba0c 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -19,15 +19,24 @@ MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450"
DESCRIPTION="A free, open-source Monero wallet"
HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PVR}.tar.gz -> ${P}.tar.gz
- https://github.com/tevador/polyseed/archive/${POLYSEED_DIST_COMIT}.tar.gz -> ${PF}-polyseed.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> ${PF}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> ${PF}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> ${PF}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> ${PF}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> ${PF}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> ${PF}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> ${PF}-monero-trezorcommon.tar.gz
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PVR}.tar.gz -> \
+${P}.tar.gz
+ https://github.com/tevador/polyseed/archive/${POLYSEED_DIST_COMIT}.tar.gz -> \
+${P}-polyseed.tar.gz
+ https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${P}-singleapplication.tar.gz
+ https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${P}-monero.tar.gz
+ https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+ https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+ https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+ https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-monero-trezorcommon.tar.gz
"
# Feather is released under the terms of the BSD license, but it vendors
@@ -64,15 +73,36 @@ RDEPEND="
"
BDEPEND="virtual/pkgconfig"
+src_unpack() {
+ unpack ${P}.tar.gz \
+ ${P}-polyseed.tar.gz \
+ ${P}-singleapplication.tar.gz \
+ ${P}-monero.tar.gz \
+ ${P}-monero-miniupnp.tar.gz \
+ ${P}-monero-randomx.tar.gz \
+ ${P}-monero-rapidjson.tar.gz \
+ ${P}-monero-supercop.tar.gz \
+ ${P}-monero-trezorcommon.tar.gz
+ mv -T "${WORKDIR}"/polyseed-${POLYSEED_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/polyseed || die
+ mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/singleapplication || die
+ mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero || die
+ mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/miniupnp || die
+ mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/randomx || die
+ mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/rapidjson || die
+ mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/supercop || die
+ mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
src_prepare() {
- mv -T "${WORKDIR}"/polyseed-${POLYSEED_DIST_COMIT} "${WORKDIR}"/${PF}/src/third-party/polyseed
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} "${WORKDIR}"/${PF}/src/third-party/singleapplication
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} "${WORKDIR}"/${PF}/monero
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/miniupnp
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/randomx
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/rapidjson
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/supercop
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} "${WORKDIR}"/${PF}/monero/external/trezor-common
+ default
echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
cmake_src_prepare
diff --git a/net-p2p/p2pool/metadata.xml b/net-p2p/p2pool/metadata.xml
index c84ecd4d4d..7fe8cbc75e 100644
--- a/net-p2p/p2pool/metadata.xml
+++ b/net-p2p/p2pool/metadata.xml
@@ -2,7 +2,7 @@
- adam.pimentel@protonmail.com
+ adam.pimentel46@gmail.com
Adam Pimentel
diff --git a/net-voip/discover-overlay/discover-overlay-0.6.3.ebuild b/net-voip/discover-overlay/discover-overlay-0.6.3-r1.ebuild
similarity index 91%
rename from net-voip/discover-overlay/discover-overlay-0.6.3.ebuild
rename to net-voip/discover-overlay/discover-overlay-0.6.3-r1.ebuild
index d5f0ed8dc1..c4cd0a37d8 100644
--- a/net-voip/discover-overlay/discover-overlay-0.6.3.ebuild
+++ b/net-voip/discover-overlay/discover-overlay-0.6.3-r1.ebuild
@@ -16,6 +16,8 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="wayland"
+
RDEPEND="
>=dev-python/pygobject-3.22[${PYTHON_USEDEP}]
dev-python/websocket-client[${PYTHON_USEDEP}]
@@ -23,7 +25,7 @@ RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/python-xlib[${PYTHON_USEDEP}]
- gui-libs/gtk-layer-shell[introspection(+)]
+ wayland? ( gui-libs/gtk-layer-shell[introspection(+)] )
"
S="${WORKDIR}/Discover-${PV}"