[gentoo-commits] repo/proj/guru:master commit in: sys-boot/osk-sdl/

[gentoo-commits] repo/proj/guru:master commit in: sys-boot/osk-sdl/

[Haelwenn Monnier]

commit:     667f5093e24dab31f5c72f98c2e4376cedb0b8a4
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Sat Jun 26 19:00:47 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sat Jun 26 19:00:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=667f5093

sys-boot/osk-sdl: drop test

Will be enabled in a future version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 sys-boot/osk-sdl/osk-sdl-0.64.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-boot/osk-sdl/osk-sdl-0.64.ebuild b/sys-boot/osk-sdl/osk-sdl-0.64.ebuild
index 1f8daa085..4fc97688f 100644
--- a/sys-boot/osk-sdl/osk-sdl-0.64.ebuild
+++ b/sys-boot/osk-sdl/osk-sdl-0.64.ebuild
@@ -14,8 +14,7 @@ SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${COMMIT}.tar.gz -> $
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	app-portage/gentoolkit
@@ -29,10 +28,7 @@ RDEPEND="
 	sys-kernel/dracut
 "
 
-BDEPEND="
-	app-text/scdoc
-	test? ( x11-misc/xvfb-run )
-"
+BDEPEND="app-text/scdoc"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 

[gentoo-commits] repo/proj/guru:master commit in: sys-boot/osk-sdl/

[Florian Schmaus]

commit:     bb974100889989e9d5b408a92dd9f256c492d986
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Mon Jun 28 17:39:43 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 17:40:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bb974100

sys-boot/osk-sdl: add test

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 .../{osk-sdl-0.64.ebuild => osk-sdl-0.64-r1.ebuild}       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/sys-boot/osk-sdl/osk-sdl-0.64.ebuild b/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
similarity index 90%
rename from sys-boot/osk-sdl/osk-sdl-0.64.ebuild
rename to sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
index 4fc97688f..d7af7ff79 100644
--- a/sys-boot/osk-sdl/osk-sdl-0.64.ebuild
+++ b/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
@@ -14,7 +14,8 @@ SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${COMMIT}.tar.gz -> $
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-portage/gentoolkit
@@ -28,7 +29,13 @@ RDEPEND="
 	sys-kernel/dracut
 "
 
-BDEPEND="app-text/scdoc"
+BDEPEND="
+	app-text/scdoc
+	test? (
+		x11-misc/xdotool
+		x11-misc/xvfb-run
+	)
+"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -37,6 +44,10 @@ src_prepare() {
 	sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
 }
 
+src_test() {
+	meson_src_test
+}
+
 src_install() {
 	meson_src_install
 	insinto /etc

[gentoo-commits] repo/proj/guru:master commit in: sys-boot/osk-sdl/

[Andrew Ammerlaan]

commit:     50ae0bd77ebf5d44ff426ca830863af61328842d
Author:     Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Jul 13 16:57:42 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 16:57:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50ae0bd7

sys-boot/osk-sdl: bump to 0.65

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>

 sys-boot/osk-sdl/Manifest            |  1 +
 sys-boot/osk-sdl/osk-sdl-0.65.ebuild | 65 ++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/sys-boot/osk-sdl/Manifest b/sys-boot/osk-sdl/Manifest
index 907091802..baa5d6334 100644
--- a/sys-boot/osk-sdl/Manifest
+++ b/sys-boot/osk-sdl/Manifest
@@ -1 +1,2 @@
 DIST osk-sdl-0.64.tar.gz 37851 BLAKE2B dc297a0b1879f7b64bceb3032275b30f10072c50a2e2ddd985e94136ebf2308819fe71ca831fcc05d413c5e74f8ab955d920cc63bd90529e0c45fd3b6aae44db SHA512 0da985e1e8d0352f53f661dd4f7f6243a8f9b48279297f4ea3b120aa239c733411a83d324b58d152cafd9c2e7a791a36506afec6449e141c6445f0420bb9fd6b
+DIST osk-sdl-0.65.tar.gz 38007 BLAKE2B 3b64b44f74d72ab58468ecafe2e9aea054cd8a836ce18ece7e0b407de4311af7e70e197330ff3e88091c007a82942c33c1a2b538849cb45f78bd35674cd15e97 SHA512 070dcc1073266ecbe4c4c0089f29ac8687d98bbdcbd1c1578aa737bd6fbc96adeab6bd958295d073ef95515e63f536cef67c7e7e7b492b4ee3dc81fdcc8b9464

diff --git a/sys-boot/osk-sdl/osk-sdl-0.65.ebuild b/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
new file mode 100644
index 000000000..8b3e203bf
--- /dev/null
+++ b/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Lightweight On-Screen-Keyboard based on SDL2"
+HOMEPAGE="https://gitlab.com/postmarketOS/osk-sdl"
+SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-portage/gentoolkit
+	media-libs/cogl
+	media-fonts/dejavu
+	media-libs/libglvnd
+	media-libs/libsdl2[kms,haptic]
+	media-libs/mesa
+	media-libs/sdl2-ttf
+	sys-fs/cryptsetup
+	sys-kernel/dracut
+"
+
+BDEPEND="
+	app-text/scdoc
+	test? (
+		x11-misc/xdotool
+		x11-misc/xvfb-run
+	)
+"
+
+src_prepare() {
+	default
+	sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	insinto /etc
+	doins osk.conf
+	insinto /etc/dracut.conf.d/
+	doins "${FILESDIR}"/osk-sdl-pp.conf
+	insinto /usr/lib/dracut/modules.d/50osk-sdl
+	doins "${FILESDIR}"/osk-sdl-pp.path
+	doins "${FILESDIR}"/osk-sdl-pp.service
+	exeinto /usr/lib/dracut/modules.d/50osk-sdl
+	doexe "${FILESDIR}"/module-setup.sh
+	doexe "${FILESDIR}"/osk-sdl.sh
+}
+
+pkg_postinst() {
+	einfo "For more info on how to test osk-sdl, and how to report problems, see: ${HOMEPAGE}"
+	einfo "To use osk-sdl to unlock encrypted root at bootime, check osk-sdl-pp.conf in /etc/dracut.conf.d"
+	einfo "and add these boot option 'root=/dev/mapper/root cryptroot=/dev/path/to/encrypted_partition' "
+}