gentoo resync : 02.09.2020

4 files changed, 90 insertions, 19 deletions

diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index b7fef81fa80c..583a24fc6ca1 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,5 +1,7 @@
 AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5cbd08e5651ad48e89e07c72382f0ea7da62a4070f2e4607880f4ccb44b015c953ca8b9734d10db77081d2ff027fcc30c7163e39 SHA512 736b4da75bf905845964e2a097d192fe075095656818d9e9fd118327510d8fe176c713d5e77752be99b2b13fc10dc4c07bd246cb8b77bd2a99056e6ef0fe4904
+DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6
 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba
+EBUILD linkchecker-10.0.0_pre20200729.ebuild 1500 BLAKE2B 60d520d97f884eb51eb76f1563d8bfa48e95a3d6e5a10f0baccccd925e5ae19843cadac2187064ac4ed1f41d31a54f3267ae136af97c48b3344c7c145e0c21e7 SHA512 907d8916a4c42e26890b42167dc1a8d27531bb79153a519a3a9f3984bf95f169aae08cba87bbbdbe1bc72ded0e491857a36babd537eb372cb09f34b07e78c7b3
 EBUILD linkchecker-9.4.0-r1.ebuild 1413 BLAKE2B 6cd2e21b3de44c95362f5f25b9f058d556fc4878c0d35feec881e89723a38830180a7dc044f72026b9aaf74f3b25f9ccb0208a20444234c8b3f26437712f171b SHA512 5386a834bae0852e622e8c4f323bf3c9dad496278322d3d72944b8562469e76100e7cfd83931c6574615fb914a27438ad1e6f08d61df32700498824771a3fcc7
-EBUILD linkchecker-9999.ebuild 1217 BLAKE2B 14229d6a36b20b6827a3e5410525ecbb5728f3684479d2b2722f2fdfa63fbb51425db3ccda3d269c572addc90ad41029926516b8cbbdfbd30df00a3950b740a7 SHA512 26fa313483c47548775c9172780e86c80f9859f26c30ea7bf544b690f88889a803093df577da497a7629cf09ab54acb5f7e2a7f73b5f557929acb96f1121a479
-MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb
+EBUILD linkchecker-9999.ebuild 1323 BLAKE2B 6808403599e3b08862c9117194185361a5dda3dd3c38e27ba0aa1f9bdb9d0d7580c2e887bbcd45fbac4cb812911f67b017149f418a2a38023a903b55336b32f1 SHA512 ad0c97e7f796ddbde3b172c8cc01d8ca808f555be4903b7f909ac6e3317459c33ab466a8a37f1b571969db5b623274b823750a666cbef64aac49c1bbbdac00f5
+MISC metadata.xml 544 BLAKE2B 4ab01a5626c5397e7b550b717902525a6e3b5b8e3a7b1c916a48abc7181a1c1486a53ecb9e68e06ece5bcf5bcdf67167b0ab60186291033e84d2ed9237bfa35c SHA512 c0f91900f87cc48adc5628264a1948400da60d444c4c5ca251d4edc23a9042616fd90d60e4493e5e458c47991aeace55725bd181c82d6188be398cda2347a64c
diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
new file mode 100644
index 000000000000..0eecf32e4cd4
--- /dev/null
+++ b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Check websites for broken links"
+HOMEPAGE="https://github.com/linkcheck/linkchecker"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
+	inherit git-r3
+else
+	GIT_COMMIT="a977e4d7129450ba9fda8389724c80c1bde66883"
+	SRC_URI="https://github.com/linkchecker/linkchecker/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="sqlite"
+# requires py2 only libs
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-9.3-bash-completion.patch"
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local DOCS=(
+		doc/changelog.txt
+		doc/upgrading.txt
+	)
+	distutils-r1_python_install_all
+
+	newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
+	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
+	optfeature "Virus scanning" app-antivirus/clamav
+	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+	optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}]
+}
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index 32272ea2e2c4..b1b371fb4989 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite?"
 
-EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
-inherit bash-completion-r1 distutils-r1 eutils git-r3
+inherit bash-completion-r1 distutils-r1 eutils
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="https://github.com/linkcheck/linkchecker"
-SRC_URI=""
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git"
+	inherit git-r3
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="sqlite"
+# requires py2 only libs
+RESTRICT="test"
 
 RDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 "
-DEPEND=""
-
-RESTRICT="test"
 
 python_prepare_all() {
 	local PATCHES=(
@@ -36,16 +41,12 @@ python_prepare_all() {
 }
 
 python_install_all() {
-	DOCS=(
+	local DOCS=(
 		doc/changelog.txt
-		doc/development.mdwn
-		doc/python3.txt
 		doc/upgrading.txt
 	)
 	distutils-r1_python_install_all
 
-	rm "${ED}"/usr/share/applications/linkchecker.desktop || die
-
 	newbashcomp config/linkchecker-completion ${PN}
 }
 
@@ -53,4 +54,5 @@ pkg_postinst() {
 	optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}]
 	optfeature "Virus scanning" app-antivirus/clamav
 	optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]
+	optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}]
 }
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 02dc64200827..34057dbac2ab 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="sqlite">Mozilla Bookmark parsing</flag>
   </use>
   <upstream>
-    <remote-id type="pypi">LinkChecker</remote-id>
+    <remote-id type="github">linkchecker/linkchecker</remote-id>
   </upstream>
 </pkgmetadata>