Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-10-26 19:05:16 +00:00
4 changed files with 55 additions and 22 deletions

View File

@@ -1 +1,2 @@
DIST gallery-dl-1.15.0.tar.gz 323180 BLAKE2B 2b0bac0e0a3a3c1c3cab1860f1f584fd09e5f6163a69a94419f2924bd62e1fb9464f8139f6cdce4a7020accaaa44cf1e60c03dab2db7d9568d35693a8f935c4e SHA512 3d15ebeaa088130efb4c33ad2bc2d7ed2af78eafc68ef00b451d65db7f6b589cf10e248c309677dbbfe7202885d602afdbcab330dae0ebce190bd1f5dce25834
DIST gallery-dl-1.15.2.tar.gz 323739 BLAKE2B 99a06331bd7dc6ec951749129ad0ac797d9ce2d9f98e75a29198fd47d0481c43b96922ea08149abfe990e8994a19b3170853618de9b51465264d100dba777f32 SHA512 7f31c0485d9de6eaf76e7b0772e66049f9aa8fd7d77d3ef6fd2803d7ec7dddbf3419051c9d8b3984eb86a8fbbf9a168cf8ec69a55082a38e2ca23cfc3574b1f4

View File

@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=(python3_{7,8})
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit eutils distutils-r1 optfeature
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
HOMEPAGE="https://github.com/mikf/gallery-dl"
@@ -14,33 +14,26 @@ HOMEPAGE="https://github.com/mikf/gallery-dl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
# tests require network access
RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
IUSE="bash-completion zsh-completion"
RDEPEND="
>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
"
# tests require network access
distutils_enable_tests setup.py
src_compile() {
if use bash-completion || use zsh-completion
then
emake completion
fi
emake data/completion/gallery-dl
emake data/completion/_gallery-dl
emake man
# this will install shell completion and man pages generated above (if any)
distutils-r1_src_compile
}

View File

@@ -0,0 +1,46 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python3_{7,8})
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
HOMEPAGE="https://github.com/mikf/gallery-dl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
# tests require network access
RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
RDEPEND="
>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
"
distutils_enable_tests setup.py
src_compile() {
emake data/completion/gallery-dl
emake data/completion/_gallery-dl
emake man
distutils-r1_src_compile
}
pkg_postinst() {
elog "To get additional features, some optional runtime dependencies"
elog "may be installed:"
elog ""
optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
optfeature "video downloads" net-misc/youtube-dl
}

View File

@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=(python3_{7,8})
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit eutils distutils-r1 optfeature
inherit distutils-r1 optfeature
DESCRIPTION="Download image galleries and collections from several image hosting sites"
HOMEPAGE="https://github.com/mikf/gallery-dl"
@@ -14,33 +14,26 @@ HOMEPAGE="https://github.com/mikf/gallery-dl"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
# tests require network access
RESTRICT="test"
LICENSE="GPL-2"
SLOT="0"
IUSE="bash-completion zsh-completion"
RDEPEND="
>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
"
# tests require network access
distutils_enable_tests setup.py
src_compile() {
if use bash-completion || use zsh-completion
then
emake completion
fi
emake data/completion/gallery-dl
emake data/completion/_gallery-dl
emake man
# this will install shell completion and man pages generated above (if any)
distutils-r1_src_compile
}