From bf294f6a4e08aa5bb13524b8a3d3c469f2e56924 Mon Sep 17 00:00:00 2001 From: Andreas Zuber Date: Tue, 21 Jul 2020 21:32:13 +0200 Subject: [PATCH 1/7] games-engines/boxtron: ebuild improvements - use the correct python eclass - move sed command to correct build phase - fix shebangs of python scripts Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Zuber --- ...oxtron-0.5.4.ebuild => boxtron-0.5.4-r1.ebuild} | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) rename games-engines/boxtron/{boxtron-0.5.4.ebuild => boxtron-0.5.4-r1.ebuild} (74%) diff --git a/games-engines/boxtron/boxtron-0.5.4.ebuild b/games-engines/boxtron/boxtron-0.5.4-r1.ebuild similarity index 74% rename from games-engines/boxtron/boxtron-0.5.4.ebuild rename to games-engines/boxtron/boxtron-0.5.4-r1.ebuild index cf2d3d6e40..f6f4a379cd 100644 --- a/games-engines/boxtron/boxtron-0.5.4.ebuild +++ b/games-engines/boxtron/boxtron-0.5.4-r1.ebuild @@ -3,6 +3,9 @@ EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-single-r1 + DESCRIPTION="Steam Play compatibility tool to run DOS games using native Linux DOSBox" HOMEPAGE="https://github.com/dreamer/boxtron/" SRC_URI="https://github.com/dreamer/boxtron/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -11,22 +14,29 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" BDEPEND=" sys-devel/make app-arch/tar" RDEPEND=" - >=dev-lang/python-3.5.0 + ${PYTHON_DEPS} >=games-emulation/dosbox-staging-0.75.0 media-sound/fluid-soundfont media-sound/timidity++ sys-fs/inotify-tools" +src_prepare() { + default + sed -i '/README.md/d' Makefile || die "sed failed" +} + src_compile() { :; } src_install() { - sed -i '/README.md/d' Makefile || die "sed failed" emake DESTDIR="${D}" prefix=/usr install || die "died running emake" dodoc README.md + python_fix_shebang "${D}"/usr/share/boxtron/run-dosbox + python_fix_shebang "${D}"/usr/bin/install-gog-game } From fff6ba4178ff7e1814f27ecec055c6669870484b Mon Sep 17 00:00:00 2001 From: Matthias Coppens Date: Wed, 22 Jul 2020 16:13:43 +0200 Subject: [PATCH 2/7] media-gfx/memethesis-cli: New package Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Matthias Coppens --- media-gfx/memethesis-cli/Manifest | 1 + media-gfx/memethesis-cli/files/prompt.patch | 13 +++++++ .../memethesis-cli-3.2.1.ebuild | 37 +++++++++++++++++++ .../memethesis-cli/memethesis-cli-9999.ebuild | 35 ++++++++++++++++++ media-gfx/memethesis-cli/metadata.xml | 8 ++++ 5 files changed, 94 insertions(+) create mode 100644 media-gfx/memethesis-cli/Manifest create mode 100644 media-gfx/memethesis-cli/files/prompt.patch create mode 100644 media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild create mode 100644 media-gfx/memethesis-cli/memethesis-cli-9999.ebuild create mode 100644 media-gfx/memethesis-cli/metadata.xml diff --git a/media-gfx/memethesis-cli/Manifest b/media-gfx/memethesis-cli/Manifest new file mode 100644 index 0000000000..ff0031be2c --- /dev/null +++ b/media-gfx/memethesis-cli/Manifest @@ -0,0 +1 @@ +DIST memethesis-cli-3.2.1.tar.gz 2708404 BLAKE2B fb31de388f1f602f5f7e24a5e10ebe59c5ac628da05acc37c8b4204736f6dba9573e3b9ed0966b09b046fee3066a156807e983a081103a0d4258d9794b035b54 SHA512 d4737ae5bbbd1e32b0707cfadd5d521e2eabc567105218122dea31ab45b8ac57e3b677c1c83d76bf85605be82e3c06c2dd746141a153234a787140068eada183 diff --git a/media-gfx/memethesis-cli/files/prompt.patch b/media-gfx/memethesis-cli/files/prompt.patch new file mode 100644 index 0000000000..7eac4e7b12 --- /dev/null +++ b/media-gfx/memethesis-cli/files/prompt.patch @@ -0,0 +1,13 @@ +diff --git a/memethesis/interactive.py b/memethesis/interactive.py +index aede6dc..4c069c6 100644 +--- a/memethesis/interactive.py ++++ b/memethesis/interactive.py +@@ -1,7 +1,7 @@ + import sys + import re + import yaml +-from PyInquirer import prompt ++from PyInquirer.prompt import prompt + from .fancyprint import color, style + from .memethesizers import * + from .fonts import FONTS diff --git a/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild new file mode 100644 index 0000000000..b232bbcac2 --- /dev/null +++ b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/fakefred/${PN}" +case "${PV}" in + 9999) + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" + # pyinquirer's latest version is outdated, so memethesis depends + # on a live ebuild for pyinquirer at the moment + KEYWORDS="" +esac + +DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit distutils-r1 + +DESCRIPTION="Create memes from the terminal" +HOMEPAGE="${EGIT_REPO_URI}" +LICENSE="GPL-3" +SLOT="0" + +PATCHES=( "${FILESDIR}/prompt.patch" ) + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pillow[truetype,${PYTHON_USEDEP}] + >dev-python/pyinquirer-1.0.3[${PYTHON_USEDEP}] + dev-python/colored[${PYTHON_USEDEP}]') + >=media-gfx/imagemagick-7" +BDEPEND="${RDEPEND}" diff --git a/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild b/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild new file mode 100644 index 0000000000..53700b7f6f --- /dev/null +++ b/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/fakefred/${PN}" +case "${PV}" in + 9999) + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +esac + +DISTUTILS_USE_SETUPTOOLS=rdepend +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit distutils-r1 + +DESCRIPTION="Create memes from the terminal" +HOMEPAGE="${EGIT_REPO_URI}" +LICENSE="GPL-3" +SLOT="0" + +PATCHES=( "${FILESDIR}/prompt.patch" ) + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pillow[truetype,${PYTHON_USEDEP}] + >dev-python/pyinquirer-1.0.3[${PYTHON_USEDEP}] + dev-python/colored[${PYTHON_USEDEP}]') + >=media-gfx/imagemagick-7" +BDEPEND="${RDEPEND}" diff --git a/media-gfx/memethesis-cli/metadata.xml b/media-gfx/memethesis-cli/metadata.xml new file mode 100644 index 0000000000..e40cebf35c --- /dev/null +++ b/media-gfx/memethesis-cli/metadata.xml @@ -0,0 +1,8 @@ + + + + + coppens.matthias.abc@gmail.com + Matthias Coppens + + From d1d370c8d0c9a1204323de1134f456961f7d473e Mon Sep 17 00:00:00 2001 From: Daniel Novomesky Date: Wed, 22 Jul 2020 17:09:23 +0200 Subject: [PATCH 3/7] media-plugins/qt-avif-image-plugin: version bump to 0.3.1 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Daniel Novomesky --- media-plugins/qt-avif-image-plugin/Manifest | 2 +- ...ge-plugin-0.3.0.ebuild => qt-avif-image-plugin-0.3.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename media-plugins/qt-avif-image-plugin/{qt-avif-image-plugin-0.3.0.ebuild => qt-avif-image-plugin-0.3.1.ebuild} (100%) diff --git a/media-plugins/qt-avif-image-plugin/Manifest b/media-plugins/qt-avif-image-plugin/Manifest index 261d1e9c4e..5c75bce9ba 100644 --- a/media-plugins/qt-avif-image-plugin/Manifest +++ b/media-plugins/qt-avif-image-plugin/Manifest @@ -1 +1 @@ -DIST qt-avif-image-plugin-0.3.0.tar.gz 12586273 BLAKE2B 6f668946a4e1de613b077677d1a25d42642aaf30e489cd0eafc572ab518ead1d927904a545fa1181285065c8f1a85d8193c5472870484e7c0e26afb946ee277c SHA512 91e3ad130176432b21abd6ec0e8732b2077f98d1d94fd8ccbe67f6dcaa187cc258099d7018743143d8155089c7d1ee35951dbd3e8184679d83f0ce8eb204a825 +DIST qt-avif-image-plugin-0.3.1.tar.gz 13215410 BLAKE2B 381f4f19c3df42333ee0885641ca1275b8a30efc04c415de1c6a597ee6c7e7cfd5313267b8cae3c615dfb445d8980c52394dee2db4e35f9ea3e89d03c57fe353 SHA512 44da0f1bcdba3871b2662a9a6e3919f46984db9ae3588e19aed6a0fde87ee1204209bbb635956d75f0de22e307104650b0f63472fb777bb479bff09c10095948 diff --git a/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.3.0.ebuild b/media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.3.1.ebuild similarity index 100% rename from media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.3.0.ebuild rename to media-plugins/qt-avif-image-plugin/qt-avif-image-plugin-0.3.1.ebuild From a6fffaf307f7ff90d518afc6516520ff20b06bc3 Mon Sep 17 00:00:00 2001 From: Daniel Novomesky Date: Wed, 22 Jul 2020 17:46:16 +0200 Subject: [PATCH 4/7] media-libs/libavif: removed gdk-pixbuf use flag The gdk-pixbuf loader is causing crashes in this version Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Daniel Novomesky --- .../libavif/{libavif-0.8.0.ebuild => libavif-0.8.0-r1.ebuild} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename media-libs/libavif/{libavif-0.8.0.ebuild => libavif-0.8.0-r1.ebuild} (90%) diff --git a/media-libs/libavif/libavif-0.8.0.ebuild b/media-libs/libavif/libavif-0.8.0-r1.ebuild similarity index 90% rename from media-libs/libavif/libavif-0.8.0.ebuild rename to media-libs/libavif/libavif-0.8.0-r1.ebuild index 7e7a212558..aa66391b97 100644 --- a/media-libs/libavif/libavif-0.8.0.ebuild +++ b/media-libs/libavif/libavif-0.8.0-r1.ebuild @@ -18,7 +18,7 @@ fi LICENSE="BSD-2" SLOT="0" -IUSE="dav1d gdk-pixbuf +libaom rav1e" +IUSE="dav1d +libaom rav1e" REQUIRED_USE="|| ( dav1d libaom )" @@ -27,7 +27,6 @@ DEPEND="dav1d? ( media-libs/dav1d ) rav1e? ( media-video/rav1e:=[capi] ) media-libs/libpng virtual/jpeg - gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) " RDEPEND="${DEPEND}" BDEPEND="" @@ -39,7 +38,6 @@ src_configure() { -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) -DBUILD_SHARED_LIBS=ON - -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) ) cmake_src_configure } From 3a29af0c81077c526b8b0ab5d29d9218257840c7 Mon Sep 17 00:00:00 2001 From: Matthias Coppens Date: Wed, 22 Jul 2020 17:50:00 +0200 Subject: [PATCH 5/7] media-gfx/memethesis-cli: Added dependency Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Matthias Coppens --- media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild | 3 ++- media-gfx/memethesis-cli/memethesis-cli-9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild index b232bbcac2..c40702c012 100644 --- a/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild +++ b/media-gfx/memethesis-cli/memethesis-cli-3.2.1.ebuild @@ -32,6 +32,7 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pillow[truetype,${PYTHON_USEDEP}] >dev-python/pyinquirer-1.0.3[${PYTHON_USEDEP}] - dev-python/colored[${PYTHON_USEDEP}]') + dev-python/colored[${PYTHON_USEDEP}] + dev-python/ascim[${PYTHON_USEDEP}]') >=media-gfx/imagemagick-7" BDEPEND="${RDEPEND}" diff --git a/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild b/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild index 53700b7f6f..23c892fc14 100644 --- a/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild +++ b/media-gfx/memethesis-cli/memethesis-cli-9999.ebuild @@ -30,6 +30,7 @@ RDEPEND=" dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pillow[truetype,${PYTHON_USEDEP}] >dev-python/pyinquirer-1.0.3[${PYTHON_USEDEP}] - dev-python/colored[${PYTHON_USEDEP}]') + dev-python/colored[${PYTHON_USEDEP}] + dev-python/ascim[${PYTHON_USEDEP}]') >=media-gfx/imagemagick-7" BDEPEND="${RDEPEND}" From 59248dae611c883a21780cab9645a58eb958d15e Mon Sep 17 00:00:00 2001 From: Petrus Zhao Date: Thu, 23 Jul 2020 12:52:20 +0800 Subject: [PATCH 6/7] x11-misc/i3lock-color: verson bump to 2.12.5, drop old Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Petrus Zhao --- x11-misc/i3lock-color/Manifest | 2 +- ...lock-color-2.12_rc4.ebuild => i3lock-color-2.12.5.ebuild} | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) rename x11-misc/i3lock-color/{i3lock-color-2.12_rc4.ebuild => i3lock-color-2.12.5.ebuild} (93%) diff --git a/x11-misc/i3lock-color/Manifest b/x11-misc/i3lock-color/Manifest index 776d94c455..6767dcc52e 100644 --- a/x11-misc/i3lock-color/Manifest +++ b/x11-misc/i3lock-color/Manifest @@ -1 +1 @@ -DIST i3lock-color-2.12_rc4.tar.gz 208175 BLAKE2B b5d9596eb6e96b4e9016b4bb4e4e6f2cd9c6563053246f6ba8dc3ccefbb1a0df36c2e3a8d34fb9e68439cf380d096084acc6aa3f5c3f155bcfa608f202fb4053 SHA512 93447f1a7225ab5af4bc476e81009937036efe017ef85fa2a5ae2e2ec59a5dbec6658ccd9f1dc3e45810915d4c8faa90d636e1c771f982f6424274e6e78e09e4 +DIST i3lock-color-2.12.5.tar.gz 208433 BLAKE2B c799e853783765766f49cbfccd2b568d22999a5ef18b1dbb8f1ab63d3c71c146a78d4807594039e9cff4350633d513af7533709d41917ed5dc424e72529b8467 SHA512 c59e6561a1d1ffd0abd5ff56c295d71b6cc8439c7d5697cfed4d2f06a87aa0aa102cee5d55363de1d91c501eee102547d0ebef4bb4bd316ef31370eec062ddbb diff --git a/x11-misc/i3lock-color/i3lock-color-2.12_rc4.ebuild b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild similarity index 93% rename from x11-misc/i3lock-color/i3lock-color-2.12_rc4.ebuild rename to x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild index 8b8e4f0262..152923c08f 100644 --- a/x11-misc/i3lock-color/i3lock-color-2.12_rc4.ebuild +++ b/x11-misc/i3lock-color/i3lock-color-2.12.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -MY_PV="${PV//_rc4/.c.4}" +MY_PV="${PV//.5/.c.5}" DESCRIPTION="Improved i3lock with color customization" HOMEPAGE="https://github.com/Raymo111/i3lock-color" @@ -25,7 +25,6 @@ RDEPEND=" dev-libs/libev media-libs/fontconfig:= media-libs/libjpeg-turbo - !x11-misc/i3lock " DEPEND="${RDEPEND}" @@ -34,7 +33,7 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${PN}-${MY_PV}" src_configure() { - autoreconf -fiv || die + autoreconf -fiv econf } From b6d4a1a85784a648e8f44f3b06efc51b7b03936d Mon Sep 17 00:00:00 2001 From: Daniel Novomesky Date: Thu, 23 Jul 2020 13:47:30 +0200 Subject: [PATCH 7/7] media-libs/libavif: update gdk-pixbuf cache after install Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Daniel Novomesky --- media-libs/libavif/libavif-9999.ebuild | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild index 7e7a212558..55e2b97fc7 100644 --- a/media-libs/libavif/libavif-9999.ebuild +++ b/media-libs/libavif/libavif-9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake +inherit cmake gnome2-utils DESCRIPTION="Library for encoding and decoding .avif files" HOMEPAGE="https://github.com/AOMediaCodec/libavif" @@ -44,10 +44,26 @@ src_configure() { cmake_src_configure } +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + pkg_postinst() { if ! use libaom && ! use rav1e ; then ewarn "libaom and rav1e flags are not set," ewarn "libavif will work in read-only mode." ewarn "Enable libaom or rav1e flag if you want to save .AVIF files." fi + + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} + +pkg_postrm() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi }