diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest index d128ba1..02a3e71 100644 --- a/app-misc/piper/Manifest +++ b/app-misc/piper/Manifest @@ -1,6 +1,3 @@ -AUX piper-0.2.904-fix-python3-shebang.patch 917 BLAKE2B 42eb9e382d2c97a99e8bd0a1c38d7acf03e6e782cf4f6c5e313ec7a03987f516c88ce4eddd7c7d30769403b78f3dd61845ea949fd6b6810078e1a71d958ab9df SHA512 18fb338f3664bcf1a5d2bf69eb35139990ce4a549d1b728d6374d9526c21c08dbd91602fffa32a72222a1712a5d946eafd3463dc30fe39301f013501f345eff5 -DIST piper-0.2.904.tar.gz 178715 BLAKE2B ac5aa0cb47c1eadd1232ebab170c02e731da8686893a8ee231105cb064b320f339f3e834e56c61790d138151a7ed4416438604d743ca2e16d4fdbf5a974b9b63 SHA512 425d233a89eebf391650ae121134dd532bf75e0f6e15168c89ab86f3b5bac1adb6dfa985c0028a2285f85655226200b5cfe28f36cfd83814985f97ffa3774412 DIST piper-0.3.tar.gz 180248 BLAKE2B 1bd1f2058d95ef8cbcec75d8612f70e27a4c1bd3246f7dec01cd5078a1f677be7534a8cbf1cc8362fb6d48d01196c60ec1ee0dcbd890e68efeaa7fc97e120a4a SHA512 baffa76047a9f509dd9cee3513b2dde2cc27bab26f626d836ac065da9a45d8ddad6a51409e8174634e03a82f32f2622b3e9a4a6ddbbcc7a09a489012b027c839 -EBUILD piper-0.2.904.ebuild 745 BLAKE2B 657578fd5a5091add205ad43e499ddef885e256b9bf1853e293dfe858f7dc9e07151a0e0d097913792e6649ee8af300b19b180febbf356cf1c60c91581095491 SHA512 f3b9da68bc763ac86aaf7ca6f457585747aea64fe36754e3258331f76000e09e69d9b0b7ebe9b5fe0a0889a8b5b62d4e992f93637c294c6344c407a6a09fb150 -EBUILD piper-0.3.ebuild 684 BLAKE2B ea42d5e03fd0def1ee561c0e3ec91c6451be29aa2b0737c46342e768426ae9534c42d11b29f214c099fb59e9c63b5213d4616c581bfff8a9c950958849c8efaf SHA512 2ba25c578367b2e3c5ae29f2cd56802f2e34508d7a9cd782547b98d5e8b2fad8c79aa6ed84616fb45611e26a584040d093a7ba6750ad4f8a1142867a7438a68a -MISC metadata.xml 480 BLAKE2B 628471473bfa2fe2e495ef6daad43ab16bff6b2f62554ba987b7fa240efca9f54e4e42783590795c791ffcaf731b18736116152d75af91aa8339f7534ba4dd69 SHA512 1dd51740d531f6aa880af85346ddb0aceba018ba7de7fa4fe665eec9f074400416c48905d4adcd3a834ea2bf953713f0cbcf9ef01d1c507d1177a564085297c2 +EBUILD piper-0.3.ebuild 727 BLAKE2B e6a28c1a75f3a6095b0d13e78007b849e49a9ce0e29e04b34d42ec672fce76bd96aaf758d004a0a43b1eb3f65045c0e0e343e823cc83781041bde9b14e7ee2f6 SHA512 dcbdbcbbeaf01bc38bc6d89e25f423442137ae9533fe40196ea319a92452e620bb4434348239b801ea28fa8aaa2920cd057577f7075d0895f1daa6b3d698743f +MISC metadata.xml 336 BLAKE2B 83b67c7a27d39c2a90b4f18e56f80221611d6f15d6081f9334e59665b85d33814d1208c7539c5b173582e7edc8bdbca94f507dbed4f7b7d369bb2489531c1629 SHA512 7f7344481ac90b3613047e7755d86bde8b5f448efb69cd806e3027d6024b5e66c7223c0c8a1cbb80a76e5b0d1f5d214f1d53a0b9470d3739c81c46be4324a927 diff --git a/app-misc/piper/files/piper-0.2.904-fix-python3-shebang.patch b/app-misc/piper/files/piper-0.2.904-fix-python3-shebang.patch deleted file mode 100644 index 38239cf..0000000 --- a/app-misc/piper/files/piper-0.2.904-fix-python3-shebang.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 63d760a3bbf420063cff3f978bc9c05e39de149a Mon Sep 17 00:00:00 2001 -From: David Guglielmi -Date: Sun, 3 Mar 2019 16:46:17 +0100 -Subject: [PATCH] svgs: use /usr/bin/env shebang for python3 scripts - ---- - data/generate-piper-gresource.xml.py | 2 +- - data/svgs/check-svg.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/data/generate-piper-gresource.xml.py b/data/generate-piper-gresource.xml.py -index 19bc43d..af12cac 100644 ---- a/data/generate-piper-gresource.xml.py -+++ b/data/generate-piper-gresource.xml.py -@@ -1,4 +1,4 @@ --#!/bin/python3 -+#!/usr/bin/env python3 - - import sys - -diff --git a/data/svgs/check-svg.py b/data/svgs/check-svg.py -index fafc3f2..f62ccea 100755 ---- a/data/svgs/check-svg.py -+++ b/data/svgs/check-svg.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # vim: set expandtab shiftwidth=4 tabstop=4: - - import os diff --git a/app-misc/piper/metadata.xml b/app-misc/piper/metadata.xml index dc07091..5a9fb6d 100644 --- a/app-misc/piper/metadata.xml +++ b/app-misc/piper/metadata.xml @@ -1,11 +1,11 @@ - - dg@accelance.fr - David Guglielmi - - - libratbag/piper - + + david.guglielmi@gmail.com + David GUGLIELMI + + + libratbag/piper + diff --git a/app-misc/piper/piper-0.2.904.ebuild b/app-misc/piper/piper-0.2.904.ebuild deleted file mode 100644 index 1a4b67d..0000000 --- a/app-misc/piper/piper-0.2.904.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) - -inherit gnome2 meson python-r1 - -DESCRIPTION="GTK application to configure gaming mice" -HOMEPAGE="https://github.com/libratbag/piper" -SRC_URI="https://github.com/libratbag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -PATCHES=( "${FILESDIR}"/${P}-fix-python3-shebang.patch ) - -DEPEND=" - virtual/pkgconfig - dev-python/pygobject:3 - >=x11-libs/gtk+-3.22:3[introspection] -" -RDEPEND=" - >=dev-libs/libratbag-0.9.905 - dev-python/python-evdev[${PYTHON_USEDEP}] -" -src_prepare() { - python_setup - default -} - -src_configure() { - meson_src_configure -} diff --git a/app-misc/piper/piper-0.3.ebuild b/app-misc/piper/piper-0.3.ebuild index 3050976..a9e1f65 100644 --- a/app-misc/piper/piper-0.3.ebuild +++ b/app-misc/piper/piper-0.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6,3_7} ) +EAPI=7 +PYTHON_COMPAT=( python{3_6,3_7} ) -inherit gnome2 meson python-r1 +inherit meson python-r1 DESCRIPTION="GTK application to configure gaming mice" HOMEPAGE="https://github.com/libratbag/piper" @@ -32,3 +32,8 @@ src_prepare() { src_configure() { meson_src_configure } + +src_install() { + meson_src_install + python_optimize "${D}" +}