From dd5c6f9963de4bb79cc7dce2f53c0f3aaf608b3c Mon Sep 17 00:00:00 2001 From: telans Date: Wed, 22 Jul 2020 21:43:06 +1200 Subject: [PATCH 1/6] net-libs/libcurl-gnutls: 7.71.1 Fixes 404 --- net-libs/libcurl-gnutls/Manifest | 2 +- ...ibcurl-gnutls-7.70.0.ebuild => libcurl-gnutls-7.71.1.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename net-libs/libcurl-gnutls/{libcurl-gnutls-7.70.0.ebuild => libcurl-gnutls-7.71.1.ebuild} (92%) diff --git a/net-libs/libcurl-gnutls/Manifest b/net-libs/libcurl-gnutls/Manifest index d972eae..ef83239 100644 --- a/net-libs/libcurl-gnutls/Manifest +++ b/net-libs/libcurl-gnutls/Manifest @@ -1 +1 @@ -DIST libcurl-gnutls-7.70.0-2-x86_64.pkg.tar.zst 233766 BLAKE2B 0d6888c278af7fe9e1b2a9a93259527e1b342b45d915cec25b98859b11f0fce21551df759e3a72120563b1c6f8feea760e4ab6c740bdb688cdcca6904f36d75b SHA512 a912c44aa449ae7ceab6f0a694fa33854007ef0fe8280ca7fc1d8713f2e1167b6a121724ffdf0367bb2c0f0c0d4541e27a87f174a2461687a766416cc12fd9fe +DIST libcurl-gnutls-7.71.1-1-x86_64.pkg.tar.zst 236395 BLAKE2B 4771999b7336deadee1667592558a38be8a068bc01763473c2a7dc83a34de0b461b7cf4354d9fe6416eed6952ca2f89fa84ce9f0768182903fd7ff2230efef99 SHA512 4b706788c80d43f99f5e598345dcb6015eaddd4722b9a32a0a2120976ff291c37396d5e4351ca8562f4f18b3036f682238e1523017d4bad82c55690af1b5b835 diff --git a/net-libs/libcurl-gnutls/libcurl-gnutls-7.70.0.ebuild b/net-libs/libcurl-gnutls/libcurl-gnutls-7.71.1.ebuild similarity index 92% rename from net-libs/libcurl-gnutls/libcurl-gnutls-7.70.0.ebuild rename to net-libs/libcurl-gnutls/libcurl-gnutls-7.71.1.ebuild index df89ad2..03a8c85 100644 --- a/net-libs/libcurl-gnutls/libcurl-gnutls-7.70.0.ebuild +++ b/net-libs/libcurl-gnutls/libcurl-gnutls-7.71.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://curl.haxx.se" MIRROR_URI="https://mirror.rackspace.com/archlinux" SRC_URI=" amd64? ( - ${MIRROR_URI}/community/os/x86_64/${PN}-${PV}-2-x86_64.pkg.tar.zst + ${MIRROR_URI}/community/os/x86_64/${PN}-${PV}-1-x86_64.pkg.tar.zst ) " From cd2e62b3ceba53f2bda51cd5a0e1995520ccd8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 24 Jul 2020 05:55:34 +0200 Subject: [PATCH 2/6] ci: use a gentoo image --- .gitlab-ci.yml | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0069acf..7929794 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,19 @@ -image: alpine:3 +image: gentoo/stage3-amd64:latest stages: - test before_script: - - apk update && apk add alpine-sdk bash git py3-lxml py3-pip python3-dev rsync wget xz - - pip3 install pkgcheck pyyaml - - git clone https://anongit.gentoo.org/git/proj/portage.git - - cd portage && python3 setup.py install - - cd repoman && python3 setup.py install - - cd ../.. && rm -rf portage - - adduser -S portage && addgroup portage - mkdir -p /var/cache/distfiles - - mkdir -p /var/db/repos - - git clone https://anongit.gentoo.org/git/repo/gentoo.git /var/db/repos/gentoo - - git clone https://gitlab.com/src_prepare/src_prepare-overlay.git /var/db/repos/src_prepare-overlay - - git clone https://gitlab.com/src_prepare/scripts.git - - cp scripts/src/check-commit /usr/bin + - mkdir -p /var/db/repos/gentoo + - emerge-webrsync + - export MAKEOPTS="--jobs=10" + - export USE="-perl" + - emerge -1 -q --jobs=10 --noreplace app-portage/repoman dev-vcs/git net-misc/wget + - wget "https://gitlab.com/src_prepare/scripts/-/raw/master/src/repomanci" -O /usr/bin/repomanci + - chmod 777 /usr/bin/repomanci test: stage: test script: - - cd /var/db/repos/src_prepare-overlay - - check-commit + - repomanci From b1bf4134eedb0df9ca49de16050dcfe870d90c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 24 Jul 2020 06:04:00 +0200 Subject: [PATCH 3/6] games-emulation/melonds: move to better eclasses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Maciej Barć --- games-emulation/melonds/melonds-0.8.3.ebuild | 4 +++- games-emulation/melonds/melonds-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/games-emulation/melonds/melonds-0.8.3.ebuild b/games-emulation/melonds/melonds-0.8.3.ebuild index fb08129..379c64a 100644 --- a/games-emulation/melonds/melonds-0.8.3.ebuild +++ b/games-emulation/melonds/melonds-0.8.3.ebuild @@ -6,7 +6,7 @@ EAPI=7 MY_PN="melonDS" MY_P="${MY_PN}-${PV}" -inherit cmake-utils desktop xdg-utils +inherit eutils xdg cmake DESCRIPTION="DS emulator, sorta" HOMEPAGE="http://melonds.kuribo64.net/" @@ -39,6 +39,7 @@ RDEPEND=" pkg_postinst() { xdg_desktop_database_update + xdg_icon_cache_update elog "You need the following files in order to run melonDS:" elog "- bios7.bin" elog "- bios9.bin" @@ -51,4 +52,5 @@ pkg_postinst() { pkg_postrm() { xdg_desktop_database_update + xdg_icon_cache_update } diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild index fb08129..379c64a 100644 --- a/games-emulation/melonds/melonds-9999.ebuild +++ b/games-emulation/melonds/melonds-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 MY_PN="melonDS" MY_P="${MY_PN}-${PV}" -inherit cmake-utils desktop xdg-utils +inherit eutils xdg cmake DESCRIPTION="DS emulator, sorta" HOMEPAGE="http://melonds.kuribo64.net/" @@ -39,6 +39,7 @@ RDEPEND=" pkg_postinst() { xdg_desktop_database_update + xdg_icon_cache_update elog "You need the following files in order to run melonDS:" elog "- bios7.bin" elog "- bios9.bin" @@ -51,4 +52,5 @@ pkg_postinst() { pkg_postrm() { xdg_desktop_database_update + xdg_icon_cache_update } From 4c7b27d41150748224775060d07916704ebe9ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 24 Jul 2020 06:16:34 +0200 Subject: [PATCH 4/6] app-admin/grub-customizer: use better eclasses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Maciej Barć --- app-admin/grub-customizer/grub-customizer-5.1.0.ebuild | 8 +++++--- app-admin/grub-customizer/grub-customizer-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild b/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild index a2f3501..1045560 100644 --- a/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild +++ b/app-admin/grub-customizer/grub-customizer-5.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit eutils xdg cmake DESCRIPTION="A graphical grub2 settings manager" HOMEPAGE="https://launchpad.net/grub-customizer" @@ -35,9 +35,11 @@ RDEPEND=" " pkg_postinst() { - xdg_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update } pkg_postrm() { - xdg_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update } diff --git a/app-admin/grub-customizer/grub-customizer-9999.ebuild b/app-admin/grub-customizer/grub-customizer-9999.ebuild index a2f3501..1045560 100644 --- a/app-admin/grub-customizer/grub-customizer-9999.ebuild +++ b/app-admin/grub-customizer/grub-customizer-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit eutils xdg cmake DESCRIPTION="A graphical grub2 settings manager" HOMEPAGE="https://launchpad.net/grub-customizer" @@ -35,9 +35,11 @@ RDEPEND=" " pkg_postinst() { - xdg_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update } pkg_postrm() { - xdg_icon_cache_update + xdg_desktop_database_update + xdg_icon_cache_update } From 61d8d090c7fec1472acd6d34e7bc4667a0f56b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 24 Jul 2020 06:22:12 +0200 Subject: [PATCH 5/6] x11-misc/polybar: use cmake eclass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Maciej Barć --- x11-misc/polybar/polybar-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild index 472f2f4..ebea344 100644 --- a/x11-misc/polybar/polybar-9999.ebuild +++ b/x11-misc/polybar/polybar-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -inherit cmake-utils python-single-r1 git-r3 +inherit python-single-r1 git-r3 cmake DESCRIPTION="A fast and easy-to-use status bar" HOMEPAGE="https://github.com/polybar/polybar" @@ -49,5 +49,5 @@ src_configure() { -DENABLE_PULSEAUDIO="$(usex pulseaudio)" ) - cmake-utils_src_configure + cmake_src_configure } From 6dce5defebac1d7e67e9e53775c20deefef68361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Fri, 24 Jul 2020 06:33:18 +0200 Subject: [PATCH 6/6] dev-python/ffmpeg-python: remove pytest-runner dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Maciej Barć --- dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild | 8 ++++++-- dev-python/ffmpeg-python/ffmpeg-python-9999.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild index 86d4c02..090c654 100644 --- a/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild +++ b/dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild @@ -30,9 +30,8 @@ IUSE="doc test" DEPEND=" >=dev-python/future-0.18.2[${PYTHON_USEDEP}] >=dev-python/numpy-1.16.5[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/wheel test? ( - >=dev-python/pytest-4.6.9[${PYTHON_USEDEP}] >=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}] ) " @@ -44,3 +43,8 @@ RDEPEND=" distutils_enable_tests pytest distutils_enable_sphinx doc/src + +python_prepare_all() { + sed -i -e '/pytest-runner/d' setup.py || die + distutils-r1_python_prepare_all +} diff --git a/dev-python/ffmpeg-python/ffmpeg-python-9999.ebuild b/dev-python/ffmpeg-python/ffmpeg-python-9999.ebuild index 86d4c02..090c654 100644 --- a/dev-python/ffmpeg-python/ffmpeg-python-9999.ebuild +++ b/dev-python/ffmpeg-python/ffmpeg-python-9999.ebuild @@ -30,9 +30,8 @@ IUSE="doc test" DEPEND=" >=dev-python/future-0.18.2[${PYTHON_USEDEP}] >=dev-python/numpy-1.16.5[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/wheel test? ( - >=dev-python/pytest-4.6.9[${PYTHON_USEDEP}] >=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}] ) " @@ -44,3 +43,8 @@ RDEPEND=" distutils_enable_tests pytest distutils_enable_sphinx doc/src + +python_prepare_all() { + sed -i -e '/pytest-runner/d' setup.py || die + distutils-r1_python_prepare_all +}