From ac9760e9140c6ca085125bd6822e8df9e6ac1ded Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Thu, 15 Dec 2022 21:04:58 +0100 Subject: [PATCH] Roll back --- dev-libs/feedbackd/Manifest | 4 +- .../feedbackd-0.0.0_p20220520.ebuild | 46 +++++++++++++++++++ ...kd-0.0.2.ebuild => feedbackd-0.0.1.ebuild} | 11 +---- 3 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild rename dev-libs/feedbackd/{feedbackd-0.0.2.ebuild => feedbackd-0.0.1.ebuild} (70%) diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest index 6ef6ac0..67705bb 100644 --- a/dev-libs/feedbackd/Manifest +++ b/dev-libs/feedbackd/Manifest @@ -1,2 +1,2 @@ -DIST feedbackd-v0.0.2.tar.gz 91741 BLAKE2B 088047712fc1cce219bd1fe6b7f82883eb9806ff6b14f932012f42dc13ff12958a807b0a64e88c56bd1f89b4e4da4c0b78400960fc71f3a7ac4c3e78c14f8341 SHA512 2ed47aac914a32ebfc8c1d1982f7fd4aaff5516593bc1360864c04dc59a8506f31bd272c37fc866fc3962429a2a0a4fabef944c8f0d48e7772082cd3490e911f -DIST gmobile-1039e7808195d4de367ce2718481641ca8af2427.tar.gz 9057 BLAKE2B cf4ce57078bd601a447df109e71ecb54a5a4dc73995cb4852b55ae7f19c831ae36b3299d70dc004abd3ec457f3539fa353425052352e0d94a57827b8bc42439e SHA512 ef4abcb520d00169361c2245c1c65219f4ca4500885e9271a1c4c2584072354e1aacc236e4640a54acb7ba8480b1a533aaedb918962790d539887814e23b716a +DIST feedbackd-0.0.0_p20220520.tar.gz 82971 BLAKE2B a92a782d642fdadda709e1b9b379a3253164c9397df7ce158c8c0873cced7886f41e6e3cabc19e85fc7043aedd37cead3cb61a4fb227347c0a454e88ffff822b SHA512 7400afec08cbc85f2251a0f56a08480dea1a50b30937bbe76e4828ac9aef1d9e3fe427887a5fde3337fa907c2f2a9ca0795ef41f4339b9624386d5d539a55e75 +DIST feedbackd-v0.0.1.tar.gz 84253 BLAKE2B cbbcf82f2141be03a5c1e8259257fa158f8bfa366cbd56d93e728ac4c504fb9591ebee723ff5128e5d1db6c50d7226754f233edd8f08239d550f3287f517f8a5 SHA512 903e597d3883dc49c06a3032fdd398f98ea5ea68ed54d5bd79bcf471abe89982ca2559558b98658eca193bc7c1ca505955d29b3a054fc5e2a2c7f5cbeabcc78b diff --git a/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild new file mode 100644 index 0000000..3b5bfb3 --- /dev/null +++ b/dev-libs/feedbackd/feedbackd-0.0.0_p20220520.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +VALA_USE_DEPEND="vapigen" + +inherit vala meson udev + +MY_PV="v${PV/_p/+git}" +MY_P="${PN}-${MY_PV}" +DESCRIPTION="A daemon to provide haptic feedback on events" +HOMEPAGE="https://source.puri.sm/Librem5/feedbackd" +SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +SLOT="0" +IUSE="+introspection +vala" +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + gnome-base/dconf + media-libs/gsound + dev-libs/json-glib + dev-libs/libgudev:= +" +RDEPEND="${DEPEND} + dev-libs/feedbackd-device-themes +" +BDEPEND=" + dev-libs/gobject-introspection + vala? ( $(vala_depend) ) +" + +src_prepare() { + default + + use vala && vala_setup + sed -i 's/-G feedbackd/-G video/g' debian/feedbackd.udev || die +} + +src_install() { + meson_src_install + udev_newrules "${S}/debian/feedbackd.udev" 90-feedbackd.rules +} diff --git a/dev-libs/feedbackd/feedbackd-0.0.2.ebuild b/dev-libs/feedbackd/feedbackd-0.0.1.ebuild similarity index 70% rename from dev-libs/feedbackd/feedbackd-0.0.2.ebuild rename to dev-libs/feedbackd/feedbackd-0.0.1.ebuild index cf08eb4..5b1962e 100644 --- a/dev-libs/feedbackd/feedbackd-0.0.2.ebuild +++ b/dev-libs/feedbackd/feedbackd-0.0.1.ebuild @@ -6,14 +6,9 @@ VALA_USE_DEPEND="vapigen" inherit vala meson udev -GMO_COMMIT="1039e7808195d4de367ce2718481641ca8af2427" - DESCRIPTION="A daemon to provide haptic feedback on events" HOMEPAGE="https://source.puri.sm/Librem5/feedbackd" -SRC_URI=" - https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz - https://gitlab.gnome.org/guidog/gmobile/-/archive/${GMO_COMMIT}/gmobile-${GMO_COMMIT}.tar.gz -" +SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" S="${WORKDIR}/${PN}-v${PV}" LICENSE="LGPL-3" @@ -27,7 +22,6 @@ DEPEND=" media-libs/gsound dev-libs/json-glib dev-libs/libgudev:= - dev-libs/feedbackd-device-themes " RDEPEND="${DEPEND} dev-libs/feedbackd-device-themes @@ -42,9 +36,6 @@ src_prepare() { use vala && vala_setup sed -i 's/-G feedbackd/-G video/g' debian/feedbackd.udev || die - - rm -r "${S}"/subprojects/gmobile || die - mv "${WORKDIR}"/gmobile-"${GMO_COMMIT}" "${S}"/subprojects/gmobile || die } src_install() {