gentoo resync : 05.12.2021

6 files changed, 67 insertions, 37 deletions

diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 7fd626cbf08d..4889ed6e2965 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,6 +1,8 @@
-DIST gallery-dl-1.17.5.tar.gz 359212 BLAKE2B 12c8ba8e25e8979cb9230283b40f9e11c23032f281cdf73975b1099c76d9007c68246be0e961d29d4686ce12790cf31c4ed0e3c83d91984ce11b0008176157a3 SHA512 c630156c3b16499f33d3850935f5f37d85a443041448f1edf5d0b91a36b8b73a83248a9b2f6da99d5c679b6d1759100eb42f6b50650b914f67c1928e2491bf00
 DIST gallery-dl-1.18.1.tar.gz 368692 BLAKE2B f92eb7a876563ed5bc78ca1222b8c45fe78ad6d899a55bf2edefece14209acfc784bc3ac84c7e84397746f5a5ab01c2c6f94efcb0f28d2aacac3cbd68ebcd545 SHA512 20e4f983160870a646a66963505d2c53f5498b9bbbb869a603ae53848ee788f26c6df4c5951805d99f225954ddbe692c2da5501a409650cc3e522d97f34a7c0d
-EBUILD gallery-dl-1.17.5.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
-EBUILD gallery-dl-1.18.1.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
-EBUILD gallery-dl-9999.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
-MISC metadata.xml 794 BLAKE2B 099318e799ff2f0bff48321a9c0a209eb991c690d4c2472d1fbf20bd324e5c78923ec4a4c70493ef60e842cab0263e715c243c7e75a318a94604d3ca0478298f SHA512 45eedc6bb206393ef6082a69312308b7bc8133750406b2ed0ab1785078c76238c9f682fd150d68b05b66bc20f721005f24cf1dcf5cbc64968d3ee6c741d55dfa
+DIST gallery-dl-1.19.2.tar.gz 393664 BLAKE2B cae6b2cdd9f940892032498c0450918481aea22a701b236f580e6c7d2f77b7ce5fb2336a93c882b35063eb0193b9ebb956f8d12e8b6794255318b6eb65ee9de9 SHA512 7aa014e0e84d856bd9ca45131baed513f1d3c73c1500df32c39b5a40f17cd951e80b819130254f9b563a504866e5feebabf6b5c8bf517a43a6ad7a15e41f0476
+DIST gallery-dl-1.19.3.tar.gz 399869 BLAKE2B cef40ac7759bffb42536fed866df946e6c22e333ddae98db149109779dd9439c775722b887898e322de26860aee0990a440aa0812620dadb9d223da09f25d662 SHA512 b50c0e341a0b2b08ddd8f5674c1f4df097b862827f8bca2270d3fd62be619fab8a4c097de9d3193e8161ebcb64eb6c77676c243bca4cabc7dc1d3f192b485ad3
+EBUILD gallery-dl-1.18.1.ebuild 930 BLAKE2B a1a3bbf757d21d87f8813e8afe080946ffacf4f4d7cdcd1f6608d7e67c5c25b6ec7a941ebbddf8760f42a0da6eacd213a8a1e8e3ae70bf08efd72f09827a7c42 SHA512 b6d7e658f90d49356efcd4561bc71cd936f0e25d8577299803555f405de3af8259800a7301ee7974aedf6b83047791353e41e394e5d191831d794654ace5d037
+EBUILD gallery-dl-1.19.2.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
+EBUILD gallery-dl-1.19.3.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
+EBUILD gallery-dl-9999.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
+MISC metadata.xml 606 BLAKE2B 231314cca96ba14b3da1d9876ae9096f321ffd7803dee9c9242b87c7fad20977d9e3a8c5d0fb9060583eea95ec8726c58b9d4a4074972eabd4e6dd34bd263c94 SHA512 8401ded38af47ac11b6a11a1847e6ec5ff4609aef50ec96bca539a2d0601c53d46913decc0a03ffc757f79dc6284072ffd29e2cdab4504e7e1a91a03e006f160
diff --git a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
index fec914ad2ced..f202ee3c50b3 100644
--- a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 optfeature
 
@@ -29,10 +28,8 @@ RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests setup.py
 
-src_compile() {
-	emake data/completion/{,_}gallery-dl man
-
-	distutils-r1_src_compile
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
 }
 
 pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-1.17.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild
index fec914ad2ced..79c29ccc0450 100644
--- a/net-misc/gallery-dl/gallery-dl-1.17.5.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 optfeature
 
@@ -29,10 +28,8 @@ RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests setup.py
 
-src_compile() {
-	emake data/completion/{,_}gallery-dl man
-
-	distutils-r1_src_compile
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
 }
 
 pkg_postinst() {
diff --git a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
new file mode 100644
index 000000000000..79c29ccc0450
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{8,9})
+PYTHON_REQ_USE="sqlite,ssl,xml"
+
+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
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index fec914ad2ced..79c29ccc0450 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 optfeature
 
@@ -29,10 +28,8 @@ RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
 
 distutils_enable_tests setup.py
 
-src_compile() {
-	emake data/completion/{,_}gallery-dl man
-
-	distutils-r1_src_compile
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
 }
 
 pkg_postinst() {
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
index 9f4247ab0e31..fb14489e739b 100644
--- a/net-misc/gallery-dl/metadata.xml
+++ b/net-misc/gallery-dl/metadata.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-    <maintainer type="person" proxied="yes">
-        <email>xgqt@riseup.net</email>
-        <name>Maciej Barć</name>
-    </maintainer>
-    <maintainer type="project" proxied="proxy">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mikf/gallery-dl</remote-id>
-    </upstream>
-    <longdescription>
-        gallery-dl is a command-line program to download image-galleries and -collections from several image hosting sites.
-        It is a cross-platform tool with many configuration options and powerful filenaming capabilities.
-    </longdescription>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mikf/gallery-dl</remote-id>
+  </upstream>
+  <longdescription>
+    gallery-dl is a command-line program to download image-galleries
+    and -collections from several image hosting sites.
+    It is a cross-platform tool with many configuration options
+    and powerful filenaming capabilities.
+  </longdescription>
 </pkgmetadata>