* [gentoo-commits] repo/gentoo:master commit in: app-misc/piper/files/, app-misc/piper/
@ 2021-08-13 11:49 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-08-13 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 84aa44089077454a2550e03ab015fdac7eef3061
Author: Alexander Barker <alex <AT> 1stleg <DOT> com>
AuthorDate: Sun Aug 8 19:24:47 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 11:39:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aa4408
app-misc/piper: Remove flake8 test
Closes: https://bugs.gentoo.org/807205
Signed-off-by: Alexander Barker <alex <AT> 1stleg.com>
Closes: https://github.com/gentoo/gentoo/pull/21919
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/piper-0.5.1-disable-flake8-linting.patch | 17 +++++++++++++++++
app-misc/piper/piper-0.5.1-r2.ebuild | 4 ++++
2 files changed, 21 insertions(+)
diff --git a/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch b/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch
new file mode 100644
index 00000000000..a0ede6671e0
--- /dev/null
+++ b/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch
@@ -0,0 +1,17 @@
+Remove linting test that is broken upstream.
+Bug: https://bugs.gentoo.org/807205
+
+--- piper-0.5.1/meson.build
++++ piper-0.5.1/meson.build
+@@ -119,11 +119,3 @@
+ configuration: config_piper_devel)
+
+ meson.add_install_script('meson_install.sh')
+-
+-flake8 = find_program('flake8', required: false)
+-if flake8.found()
+- test('flake8', flake8,
+- args: ['--ignore=E501,W504',
+- join_paths(meson.source_root(), 'piper'),
+- join_paths(meson.source_root(), 'piper.in')])
+-endif
diff --git a/app-misc/piper/piper-0.5.1-r2.ebuild b/app-misc/piper/piper-0.5.1-r2.ebuild
index 029aadea4ce..9379797c495 100644
--- a/app-misc/piper/piper-0.5.1-r2.ebuild
+++ b/app-misc/piper/piper-0.5.1-r2.ebuild
@@ -40,6 +40,10 @@ DEPEND="
virtual/libudev
"
+PATCHES=(
+ "${FILESDIR}"/${P}-disable-flake8-linting.patch
+)
+
src_configure() {
python_setup
meson_src_configure
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/piper/files/, app-misc/piper/
@ 2022-11-14 7:06 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2022-11-14 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 213f1ed68f50be443f1bf70e1dc61c7f6b17cd89
Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Mon Oct 24 13:03:05 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 07:06:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213f1ed6
app-misc/piper: drop 0.5.1-r2
Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-misc/piper/Manifest | 1 -
.../files/piper-0.5.1-disable-flake8-linting.patch | 17 -------
app-misc/piper/piper-0.5.1-r2.ebuild | 56 ----------------------
3 files changed, 74 deletions(-)
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index c640a281e4f1..4ad3156d2a6e 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,2 +1 @@
-DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
DIST piper-0.6.tar.gz 254653 BLAKE2B ea621e556e2ee6a98e334f2e61df70d700a9cb371dcd5bddc690b4a4c97543a6957bc339bddbde2cf91ac3b201d3bd70fe336974f17e36cfdcbb4895257af993 SHA512 9d76cbc5f3a91c68d10355a1b429c05873effcaa80086fb51c7d4a7bdbbb3e0faf42ec8ccad611a15f5c954d3014a8416e4a497c86167c227818771a24d108a0
diff --git a/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch b/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch
deleted file mode 100644
index a0ede6671e04..000000000000
--- a/app-misc/piper/files/piper-0.5.1-disable-flake8-linting.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove linting test that is broken upstream.
-Bug: https://bugs.gentoo.org/807205
-
---- piper-0.5.1/meson.build
-+++ piper-0.5.1/meson.build
-@@ -119,11 +119,3 @@
- configuration: config_piper_devel)
-
- meson.add_install_script('meson_install.sh')
--
--flake8 = find_program('flake8', required: false)
--if flake8.found()
-- test('flake8', flake8,
-- args: ['--ignore=E501,W504',
-- join_paths(meson.source_root(), 'piper'),
-- join_paths(meson.source_root(), 'piper.in')])
--endif
diff --git a/app-misc/piper/piper-0.5.1-r2.ebuild b/app-misc/piper/piper-0.5.1-r2.ebuild
deleted file mode 100644
index e72e7068ab4e..000000000000
--- a/app-misc/piper/piper-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="GTK configuration application for libratbag"
-HOMEPAGE="https://github.com/libratbag/piper"
-SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/gobject-introspection
- >=dev-libs/libratbag-0.13
- gnome-base/librsvg[introspection]
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- dev-python/python-evdev[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/libevdev
- virtual/libudev
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-disable-flake8-linting.patch
-)
-
-src_configure() {
- python_setup
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- python_optimize
- python_fix_shebang "${ED}"/usr/bin/
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/piper/files/, app-misc/piper/
@ 2024-06-02 2:26 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-06-02 2:26 UTC (permalink / raw
To: gentoo-commits
commit: 6ab1cb470d41d4e2959f9c481661bcc95ecf21a9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 01:46:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 01:46:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ab1cb47
app-misc/piper: drop 0.6
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-misc/piper/Manifest | 1 -
app-misc/piper/files/piper-0.6-fix-tests.patch | 68 --------------------------
app-misc/piper/piper-0.6.ebuild | 66 -------------------------
3 files changed, 135 deletions(-)
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
index 61d71da61cf6..c049b2ea7d14 100644
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,2 +1 @@
-DIST piper-0.6.tar.gz 254653 BLAKE2B ea621e556e2ee6a98e334f2e61df70d700a9cb371dcd5bddc690b4a4c97543a6957bc339bddbde2cf91ac3b201d3bd70fe336974f17e36cfdcbb4895257af993 SHA512 9d76cbc5f3a91c68d10355a1b429c05873effcaa80086fb51c7d4a7bdbbb3e0faf42ec8ccad611a15f5c954d3014a8416e4a497c86167c227818771a24d108a0
DIST piper-0.7.tar.gz 271658 BLAKE2B 8d3d411cc771a286ae0d7654b6d70f394e11edb182924619195b947d0d54df4db308e94aceebe0754ddd446538f1dce2ccb88dbf1cd44595b614d852e7394698 SHA512 fcbc30a4954ea6b0aa67c66052eab1e6b2d3039c927eeddcfc8b03d00f1c91e8f0ae80788ba0e4f053a612b03f594e74fd119dd11f52dd47608c99602e7e4940
diff --git a/app-misc/piper/files/piper-0.6-fix-tests.patch b/app-misc/piper/files/piper-0.6-fix-tests.patch
deleted file mode 100644
index e4a358e0ab59..000000000000
--- a/app-misc/piper/files/piper-0.6-fix-tests.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream commit https://github.com/libratbag/piper/commit/603d68726364cea5e71ef1f0153e3641ec889063, backported to 0.6
-Bug: https://bugs.gentoo.org/827510
-Bug: https://bugs.gentoo.org/834967
-
-From 603d68726364cea5e71ef1f0153e3641ec889063 Mon Sep 17 00:00:00 2001
-From: Tobias Kortkamp <tobias.kortkamp@gmail.com>
-Date: Mon, 1 Aug 2022 15:57:28 +0200
-Subject: [PATCH] Fix tests for out-of-source builds
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the build directory is not _under_ the source directory then
-flake8 cannot find the local config file and it will try to check
-piper.in which fails per 1ed66262b77ebd9fe188894d36842527da39508a
-
-To fix this I propose to
-
-1. pass the config to flake8 explicitly
-2. remove piper.in from the args list since it is excluded in the
- flake8 config anyway
-3. check the generated $build/piper.devel and $build/piper too per
- 1ed66262b77ebd9fe188894d36842527da39508a
-4. merge the --ignore in meson.build with the config
-
-Steps to reproduce:
-
-```
-$ meson ../build
-$ ninja -C../build test
-...
-[17/18] Running all tests.
-1/5 piper:all / files-in-git SKIP 0.01s exit status 77
-2/5 piper / validate appdata file OK 0.04s
-3/5 piper / svg-lookup-check OK 0.10s
-4/5 piper / check-svg OK 0.18s
-5/5 piper / flake8 FAIL 1.00s exit status 1
->>> MALLOC_PERTURB_=32 /gnu/store/yhhvrj6bns3ws85d338ah3bsc8jv4x64-profile/bin/flake8 --ignore=E501,W504 /home/tobias/ghq/github.com/libratbag/piper/piper /home/tobias/ghq/github.com/libratbag/piper/piper.in
-――――――――――――――――――――――――――――――――――――――――――――――― ✀ ―――――――――――――――――――――――――――――――――――――――――――――――
-/home/tobias/ghq/github.com/libratbag/piper/piper.in:11:19: E999 SyntaxError: invalid syntax
-――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
-```
-
-diff --git a/.flake8 b/.flake8
-index 8f1ba6f..170b294 100644
---- a/.flake8
-+++ b/.flake8
-@@ -1,3 +1,3 @@
- [flake8]
--ignore = E402,E501
-+ignore = E402,E501,W504
- exclude = .git,__pycache__,build,data,piper/piper.py,piper.in
-diff --git a/meson.build b/meson.build
-index 180a552..a4c73a1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,8 +135,9 @@ if enable_tests
- flake8 = find_program('flake8')
- if flake8.found()
- test('flake8', flake8,
-- args: ['--ignore=E501,W504',
-+ args: ['--config=' + join_paths(meson.current_source_dir(), '.flake8'),
- join_paths(meson.source_root(), 'piper'),
-- join_paths(meson.source_root(), 'piper.in')])
-+ join_paths(meson.current_build_dir(), 'piper'),
-+ join_paths(meson.current_build_dir(), 'piper.devel')])
- endif
- endif
diff --git a/app-misc/piper/piper-0.6.ebuild b/app-misc/piper/piper-0.6.ebuild
deleted file mode 100644
index 5b9840cc142a..000000000000
--- a/app-misc/piper/piper-0.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="GTK application to configure gaming devices"
-HOMEPAGE="https://github.com/libratbag/piper"
-SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? (
- $(python_gen_cond_dep '
- dev-python/flake8[${PYTHON_USEDEP}]
- ')
- )
-"
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/gobject-introspection
- >=dev-libs/libratbag-0.13
- gnome-base/librsvg[introspection]
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- $(python_gen_cond_dep '
- dev-python/evdev[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
- ')
-"
-DEPEND="
- ${RDEPEND}
- dev-libs/libevdev
- virtual/libudev
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-src_configure() {
- python_setup
-
- local emesonargs=(
- $(meson_use test tests)
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- python_optimize
- python_fix_shebang "${ED}"/usr/bin/
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-02 2:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-14 7:06 [gentoo-commits] repo/gentoo:master commit in: app-misc/piper/files/, app-misc/piper/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-06-02 2:26 Sam James
2021-08-13 11:49 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox