[gentoo-commits] repo/proj/guru:master commit in: net-misc/gallery-dl/

[Andrew Ammerlaan]

commit:     4c662d2c0f785f9ceaeda2e4d17c1bb0e39ed43d
Author:     Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Mon Oct 26 13:22:38 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Oct 26 13:22:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c662d2c

net-misc/gallery-dl: bring QA fixes from PR review

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>

 net-misc/gallery-dl/gallery-dl-1.15.0.ebuild | 15 ++++-----------
 net-misc/gallery-dl/gallery-dl-9999.ebuild   | 15 ++++-----------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/net-misc/gallery-dl/gallery-dl-1.15.0.ebuild 
b/net-misc/gallery-dl/gallery-dl-1.15.0.ebuild
index cd69e03d..1fc6f3ea 100644
--- a/net-misc/gallery-dl/gallery-dl-1.15.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.15.0.ebuild
@@ -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
 }
 

diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild 
b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index cd69e03d..1fc6f3ea 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -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
 }