Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hedmo 2020-07-26 08:14:10 +02:00
commit 1ecc9e42d8
10 changed files with 41 additions and 31 deletions

View File

@ -1,25 +1,19 @@
image: alpine:3 image: gentoo/stage3-amd64:latest
stages: stages:
- test - test
before_script: 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/cache/distfiles
- mkdir -p /var/db/repos - mkdir -p /var/db/repos/gentoo
- git clone https://anongit.gentoo.org/git/repo/gentoo.git /var/db/repos/gentoo - emerge-webrsync
- git clone https://gitlab.com/src_prepare/src_prepare-overlay.git /var/db/repos/src_prepare-overlay - export MAKEOPTS="--jobs=10"
- git clone https://gitlab.com/src_prepare/scripts.git - export USE="-perl"
- cp scripts/src/check-commit /usr/bin - 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: test:
stage: test stage: test
script: script:
- cd /var/db/repos/src_prepare-overlay - repomanci
- check-commit

View File

@ -3,7 +3,7 @@
EAPI=7 EAPI=7
inherit cmake-utils xdg-utils inherit eutils xdg cmake
DESCRIPTION="A graphical grub2 settings manager" DESCRIPTION="A graphical grub2 settings manager"
HOMEPAGE="https://launchpad.net/grub-customizer" HOMEPAGE="https://launchpad.net/grub-customizer"
@ -35,9 +35,11 @@ RDEPEND="
" "
pkg_postinst() { pkg_postinst() {
xdg_icon_cache_update xdg_desktop_database_update
xdg_icon_cache_update
} }
pkg_postrm() { pkg_postrm() {
xdg_icon_cache_update xdg_desktop_database_update
xdg_icon_cache_update
} }

View File

@ -3,7 +3,7 @@
EAPI=7 EAPI=7
inherit cmake-utils xdg-utils inherit eutils xdg cmake
DESCRIPTION="A graphical grub2 settings manager" DESCRIPTION="A graphical grub2 settings manager"
HOMEPAGE="https://launchpad.net/grub-customizer" HOMEPAGE="https://launchpad.net/grub-customizer"
@ -35,9 +35,11 @@ RDEPEND="
" "
pkg_postinst() { pkg_postinst() {
xdg_icon_cache_update xdg_desktop_database_update
xdg_icon_cache_update
} }
pkg_postrm() { pkg_postrm() {
xdg_icon_cache_update xdg_desktop_database_update
xdg_icon_cache_update
} }

View File

@ -30,9 +30,8 @@ IUSE="doc test"
DEPEND=" DEPEND="
>=dev-python/future-0.18.2[${PYTHON_USEDEP}] >=dev-python/future-0.18.2[${PYTHON_USEDEP}]
>=dev-python/numpy-1.16.5[${PYTHON_USEDEP}] >=dev-python/numpy-1.16.5[${PYTHON_USEDEP}]
dev-python/pytest-runner[${PYTHON_USEDEP}] dev-python/wheel
test? ( test? (
>=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
>=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}] >=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}]
) )
" "
@ -44,3 +43,8 @@ RDEPEND="
distutils_enable_tests pytest distutils_enable_tests pytest
distutils_enable_sphinx doc/src distutils_enable_sphinx doc/src
python_prepare_all() {
sed -i -e '/pytest-runner/d' setup.py || die
distutils-r1_python_prepare_all
}

View File

@ -30,9 +30,8 @@ IUSE="doc test"
DEPEND=" DEPEND="
>=dev-python/future-0.18.2[${PYTHON_USEDEP}] >=dev-python/future-0.18.2[${PYTHON_USEDEP}]
>=dev-python/numpy-1.16.5[${PYTHON_USEDEP}] >=dev-python/numpy-1.16.5[${PYTHON_USEDEP}]
dev-python/pytest-runner[${PYTHON_USEDEP}] dev-python/wheel
test? ( test? (
>=dev-python/pytest-4.6.9[${PYTHON_USEDEP}]
>=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}] >=dev-python/pytest-mock-1.11.2[${PYTHON_USEDEP}]
) )
" "
@ -44,3 +43,8 @@ RDEPEND="
distutils_enable_tests pytest distutils_enable_tests pytest
distutils_enable_sphinx doc/src distutils_enable_sphinx doc/src
python_prepare_all() {
sed -i -e '/pytest-runner/d' setup.py || die
distutils-r1_python_prepare_all
}

View File

@ -6,7 +6,7 @@ EAPI=7
MY_PN="melonDS" MY_PN="melonDS"
MY_P="${MY_PN}-${PV}" MY_P="${MY_PN}-${PV}"
inherit cmake-utils desktop xdg-utils inherit eutils xdg cmake
DESCRIPTION="DS emulator, sorta" DESCRIPTION="DS emulator, sorta"
HOMEPAGE="http://melonds.kuribo64.net/" HOMEPAGE="http://melonds.kuribo64.net/"
@ -39,6 +39,7 @@ RDEPEND="
pkg_postinst() { pkg_postinst() {
xdg_desktop_database_update xdg_desktop_database_update
xdg_icon_cache_update
elog "You need the following files in order to run melonDS:" elog "You need the following files in order to run melonDS:"
elog "- bios7.bin" elog "- bios7.bin"
elog "- bios9.bin" elog "- bios9.bin"
@ -51,4 +52,5 @@ pkg_postinst() {
pkg_postrm() { pkg_postrm() {
xdg_desktop_database_update xdg_desktop_database_update
xdg_icon_cache_update
} }

View File

@ -6,7 +6,7 @@ EAPI=7
MY_PN="melonDS" MY_PN="melonDS"
MY_P="${MY_PN}-${PV}" MY_P="${MY_PN}-${PV}"
inherit cmake-utils desktop xdg-utils inherit eutils xdg cmake
DESCRIPTION="DS emulator, sorta" DESCRIPTION="DS emulator, sorta"
HOMEPAGE="http://melonds.kuribo64.net/" HOMEPAGE="http://melonds.kuribo64.net/"
@ -39,6 +39,7 @@ RDEPEND="
pkg_postinst() { pkg_postinst() {
xdg_desktop_database_update xdg_desktop_database_update
xdg_icon_cache_update
elog "You need the following files in order to run melonDS:" elog "You need the following files in order to run melonDS:"
elog "- bios7.bin" elog "- bios7.bin"
elog "- bios9.bin" elog "- bios9.bin"
@ -51,4 +52,5 @@ pkg_postinst() {
pkg_postrm() { pkg_postrm() {
xdg_desktop_database_update xdg_desktop_database_update
xdg_icon_cache_update
} }

View File

@ -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

View File

@ -10,7 +10,7 @@ HOMEPAGE="https://curl.haxx.se"
MIRROR_URI="https://mirror.rackspace.com/archlinux" MIRROR_URI="https://mirror.rackspace.com/archlinux"
SRC_URI=" SRC_URI="
amd64? ( 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
) )
" "

View File

@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) 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" DESCRIPTION="A fast and easy-to-use status bar"
HOMEPAGE="https://github.com/polybar/polybar" HOMEPAGE="https://github.com/polybar/polybar"
@ -49,5 +49,5 @@ src_configure() {
-DENABLE_PULSEAUDIO="$(usex pulseaudio)" -DENABLE_PULSEAUDIO="$(usex pulseaudio)"
) )
cmake-utils_src_configure cmake_src_configure
} }