dev-libs/feedbackd: Version bump, removed the -r

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Gerben jan Dijkman <gjdijkman@gjdwebserver.nl>

dev-libs/feedbackd/Manifest

@@ -1,2 +1,2 @@
-DIST feedbackd-b45468080eee851da500613ecedd709639b6d769.tar.gz 80860 BLAKE2B a80829b496e314fd04f17024a3e5415e02852b217df5f9bcbca6159b4bded5220cd6cc9d39a66c24de500bbe91c111ca1e4d05669b53decc07ca0adb91b851da SHA512 7e869c127059d2f070d368ca894808f2fb78fd04048662dabd303a45d86a3b53bf3646f64e088cd720c6f54777a86673156d3cf782fdd663dc25fae65bd04e6e
-DIST feedbackd-device-themes-1602d415aed30b1a67c0ff270551230725b8ef92.tar.gz 13832 BLAKE2B 87c1ccd52dec982e4e1651e11598b60daa8380f2de4c371e0abc70e2840abd1e62fa9fd70cbe8a5860942c282cac54ea11b548066cd01be5b49ba939b488ec3a SHA512 0e6ece5deddc3df3824aa01b6bbc2ad7fc9ab96db6afe9e4aa84652a005eb860c5552e52aeb17329dde84e8d2bccc33c7e603ab04eb2ca41ed19bbe331ce6933
+DIST 48b4bb97d62fa1917a9e54852f593d3190ef188c.tar.gz 79913 BLAKE2B 9173619846072bf46a83c88a5383c36aa2493773a31de0a25b7d2db9ce45873674f7a551ff009b7e18e4bde19807ef92da81b6c27e9c78d568066f0350f1eaba SHA512 e87da6123fe56167cb5e1a5d0fbe2d17356e337b53f6348ddd1f9fb5236f213bf72b3b04763edf36fd477fd969ac10f87eafc4136880e40981b7f8b0c4508065
+DIST feedbackd-device-themes-516e80e0b00bbd904e64b0c272c40218290fe9f5.tar.gz 14397 BLAKE2B 189d20635fac63085f0154c939c1c3f5e3e8543eb074f8f82486c4503224eceb0ddc3674f48530e6cb1fa3bc44ad6b1797c5fb1ec575f225e54db97e204c8ec0 SHA512 4ace1c68b26395de54cfae84e5c8cde8642d2bfd663238d4fc527bce44cb937155d1113af56b26b8a0c0168332a617ce6ef5971ea100c664541ae083c47c1661

dev-libs/feedbackd/feedbackd-0.0.0-r9.ebuild

@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit vala meson udev
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-MY_PV="${PV}+git20210426"
-MY_P="${PN}-${MY_PV}"
-MY_COMMIT="b45468080eee851da500613ecedd709639b6d769"
-MY_THEME_COMMIT="1602d415aed30b1a67c0ff270551230725b8ef92"
-
-DESCRIPTION="A daemon to provide haptic feedback on events"
-HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
-SRC_URI="
-	https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz -> ${PN}-${MY_COMMIT}.tar.gz
-	https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
-"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm64"
-SLOT="0"
-
-DEPEND="
-	gnome-base/dconf
-	media-libs/gsound
-	dev-libs/json-glib
-	dev-libs/libgudev
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/gobject-introspection
-	dev-util/meson
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	eapply_user
-	use vala && vala_src_prepare
-	sed -i 's/-G feedbackd/-G video/g' "${S}"/debian/feedbackd.udev || die
-}
-
-src_install() {
-	default
-	meson_src_install
-	insinto /usr/share/feedbackd/themes
-	doins "${FILESDIR}"/pine64.pinephone.json
-	doins "${FILESDIR}"/purism.librem5.json
-	udev_newrules "${S}"/debian/feedbackd.udev 90-feedbackd.rules
-}

dev-libs/feedbackd/feedbackd-0.0.0.ebuild

@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit vala meson udev
+
+KEYWORDS="~arm ~arm64"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+MY_COMMIT="48b4bb97d62fa1917a9e54852f593d3190ef188c"
+MY_THEME_COMMIT="516e80e0b00bbd904e64b0c272c40218290fe9f5"
+
+DESCRIPTION="A daemon to provide haptic feedback on events"
+HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
+
+SRC_URI="https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_COMMIT}/${MY_COMMIT}.tar.gz
+https://source.puri.sm/Librem5/feedbackd-device-themes/-/archive/${MY_THEME_COMMIT}/feedbackd-device-themes-${MY_THEME_COMMIT}.tar.gz
+"
+
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+DEPEND="
+		gnome-base/dconf
+		media-libs/gsound
+		dev-libs/json-glib
+		dev-libs/libgudev
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+		dev-libs/gobject-introspection
+		dev-util/meson
+		dev-util/pkgconfig
+		vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	eapply_user
+	use vala && vala_src_prepare
+	sed -i 's/-G feedbackd/-G video/g' ${S}/debian/feedbackd.udev
+}
+
+src_install() {
+	default
+	meson_src_install
+	insinto /usr/share/feedbackd/themes
+	doins ${WORKDIR}/feedbackd-device-themes-${MY_THEME_COMMIT}/data/*.json
+	udev_newrules ${S}/debian/feedbackd.udev 90-feedbackd.rules
+}

dev-libs/feedbackd/files/55.patch

@@ -1,25 +0,0 @@
-From b0ef14bb5f73e0a1f5345f0ddd3b3992205daebf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
-Date: Tue, 4 May 2021 08:53:30 +0000
-Subject: [PATCH] fbd-feedback-manager: fix device-specific themes path
-
----
- src/fbd-feedback-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c
-index 39c27eb..ac6cdfa 100644
---- a/src/fbd-feedback-manager.c
-+++ b/src/fbd-feedback-manager.c
-@@ -455,7 +455,7 @@ find_themefile (void)
-       for (i = 0; i < g_strv_length (xdg_data_dirs); i++) {
-         g_autofree gchar *config_path = NULL;
- 
--        config_path = g_strconcat (xdg_data_dirs[i], "feedbackd/themes/", comp, ".json", NULL);
-+        config_path = g_strconcat (xdg_data_dirs[i], "/feedbackd/themes/", comp, ".json", NULL);
-         g_debug ("Searching for device specific themefile in %s", config_path);
- 
-         // Check if file exist
--- 
-GitLab
-

dev-libs/feedbackd/metadata.xml

@@ -1,5 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gjdijkman@gjdwebserver.nl</email>
+		<name>Gerben Jan Dijkman</name>
+	</maintainer>
+	<longdescription lang="en">
+	A daemon to provide haptic (and later more) feedback on events.
+	</longdescription>
+	<upstream>
+		<doc>https://source.puri.sm/Librem5/feedbackd/</doc>
+		<bugs-to>https://source.puri.sm/Librem5/feedbackd/-/issues</bugs-to>
+	</upstream>
 </pkgmetadata>