From b75db7ac93a433d1ab6260ea9d19e03308e11f25 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 May 2021 18:05:22 +0200 Subject: [PATCH 1/3] games-arcade/taisei: Fix wrong deps introduced in c1a508a5 Closes: https://bugs.gentoo.org/787992 Signed-off-by: Haelwenn (lanodan) Monnier --- games-arcade/taisei/taisei-1.3.2-r1.ebuild | 3 +- gui-apps/wdisplays/wdisplays-9999.ebuild | 35 ---------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 gui-apps/wdisplays/wdisplays-9999.ebuild diff --git a/games-arcade/taisei/taisei-1.3.2-r1.ebuild b/games-arcade/taisei/taisei-1.3.2-r1.ebuild index e58c115206..e596cc9780 100644 --- a/games-arcade/taisei/taisei-1.3.2-r1.ebuild +++ b/games-arcade/taisei/taisei-1.3.2-r1.ebuild @@ -27,9 +27,8 @@ RDEPEND=" media-libs/freetype:2 >=media-libs/libpng-1.5 media-libs/libsdl2 - media-libs/opusfile + media-libs/sdl2-mixer[opus] media-libs/libwebp - app-arch/zstd sys-libs/zlib zip? ( dev-libs/libzip ) " diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild deleted file mode 100644 index e9c017e2e0..0000000000 --- a/gui-apps/wdisplays/wdisplays-9999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg - -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" - -if [[ "${PV}" == 9999 ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" -else - SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -RDEPEND=" - dev-libs/glib - media-libs/libepoxy - x11-libs/gtk+:3[wayland] - x11-libs/cairo - x11-libs/pango -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/wayland-protocols -" - -LICENSE="GPL-3+" -SLOT="0" - -PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) From 5eb32c0beaa6a48c8942325aacf5287f51798a09 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 4 May 2021 18:12:05 +0200 Subject: [PATCH 2/3] gui-apps/wdisplays: Undelete 9999 (the upstream is dead but might not need to be removed yet) Signed-off-by: Haelwenn (lanodan) Monnier --- gui-apps/wdisplays/wdisplays-9999.ebuild | 35 ++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 gui-apps/wdisplays/wdisplays-9999.ebuild diff --git a/gui-apps/wdisplays/wdisplays-9999.ebuild b/gui-apps/wdisplays/wdisplays-9999.ebuild new file mode 100644 index 0000000000..e9c017e2e0 --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays" + +if [[ "${PV}" == 9999 ]] +then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git" +else + SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +RDEPEND=" + dev-libs/glib + media-libs/libepoxy + x11-libs/gtk+:3[wayland] + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" + +LICENSE="GPL-3+" +SLOT="0" + +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) From c5020ea75aa92db24cc10cc030bbd1502e508992 Mon Sep 17 00:00:00 2001 From: Marco Scardovi Date: Tue, 4 May 2021 18:28:43 +0200 Subject: [PATCH 3/3] dev-python/tornado: drop package It is already in gentoo as www-server/tornado Signed-off-by: Marco Scardovi --- dev-python/tornado/Manifest | 1 - dev-python/tornado/metadata.xml | 12 ------------ dev-python/tornado/tornado-6.1.ebuild | 17 ----------------- 3 files changed, 30 deletions(-) delete mode 100644 dev-python/tornado/Manifest delete mode 100644 dev-python/tornado/metadata.xml delete mode 100644 dev-python/tornado/tornado-6.1.ebuild diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest deleted file mode 100644 index 5d3a2d66a1..0000000000 --- a/dev-python/tornado/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8 diff --git a/dev-python/tornado/metadata.xml b/dev-python/tornado/metadata.xml deleted file mode 100644 index 4ff3620b55..0000000000 --- a/dev-python/tornado/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - marco@scardovi.com - Marco Scardovi - - - python@gentoo.org - Python - - diff --git a/dev-python/tornado/tornado-6.1.ebuild b/dev-python/tornado/tornado-6.1.ebuild deleted file mode 100644 index a0a3297c81..0000000000 --- a/dev-python/tornado/tornado-6.1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="Spotify Web API client" -HOMEPAGE="https://www.tornadoweb.org/en/stable/ https://pypi.org/project/tornado/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0 CC-BY-SA-3.0" -KEYWORDS="~amd64 ~x86" -SLOT="0" -RESTRICT="test" # only works on py2.7