gentoo resync : 17.05.2018

5 files changed, 36 insertions, 22 deletions

diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index 06d8a3808bb2..b2205969bbba 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,5 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r3.ebuild 585 BLAKE2B 812f5033b428bd54d0d11b031dc54fc2af310632383b1d2582cca407e1ca2639bf6ffa5672ecbba5ef40862e53f0ece0cdbbc2b4ce222320944d68f574cfaf96 SHA512 c9a52ffdd2397fe5cb88144ae188ec1fe2ace345f8748a9c75f9d2807782b207d990ca6a10e25166ae0735c3a1d5ffbb74ed53324e7240fa5bf24b7bccae9ded
-EBUILD diffmask-9999.ebuild 684 BLAKE2B e1fa01030cf283302e3051c6ca72ad53bb4585dfd80af9b619e94606997a9dd846229d3956b1d0724cb02bdf6ea22176edbc3eb24345e027b50d00e966249e65 SHA512 cde5cfd3956b2349dcc15dbbd6c07d2b4448bcbd3f921dbc374eb884e4add22be204c2227ad39a7f1c827943d341867cc487048c7337cfba62ecc17508496d57
-MISC metadata.xml 871 BLAKE2B 68ec7d532a39561adbcb959e05b223b679f07e19bb68257a9ef6961c25ec5e850e893ed06fd899cee059a57c60655c4ed060cae3bf309adf81400b5e3a3654bf SHA512 98374fb6cc37dac755916a9ea83fc642707c54338a7b4abf151475916be379859f76987d575eb4e4d6d455e7a7081316d8442396d59e5591edef44eca89f72d0
+EBUILD diffmask-0.3.3-r3.ebuild 591 BLAKE2B c3ad201fb140b007a6b31b89ffdf5957d736273f710aab5a9a68ecbf5faa3ae79c99bbc177e3087300d21343b33c07ac5b1ffc7c42c6455668b6d244ad9d382c SHA512 dade13c85ac94f3ac44d7894380c7eb90852f65ba9909299bc8ac27d1c38d7c88f80759ae3b98904092d9993ae95d8628b49fff068af3e8bcf5832f57ff0fee2
+EBUILD diffmask-0.3.3-r4.ebuild 591 BLAKE2B 8e9382795795a264430b52399f934f683afc92bb98964c989dfd482cb6673e4ac495bf960087117074b0ac806f8ca91fee063b47fa95e107177135a1950b9270 SHA512 d6085745542397828e909931bf58605c725166af6f1018ad7c8b8dc12c21e6f2ebade3cd2816af1e6f65f8aa0a3fb3a921bd80d655f40a142bdd47f843b46c3d
+EBUILD diffmask-9999.ebuild 529 BLAKE2B 7f0ee0e021de985ef464da681356119597f047ee94621fc0d652d5d7ba6775621b7324a5d6a481a6a8032e27ceb571e2b5f67bf747c22f64f058369d8bb3c143 SHA512 db899c9a751a223cfa93328d396f38a4f3698ccaca03ad24bb3f0a2712fda8ee5b09214bc3df29284bd15406a54fd3fcd9548426aba434c58550f8e8d40cdac8
+MISC metadata.xml 865 BLAKE2B c9fac77bca18c860782a29fbbd18bcf32013f03d35a4caf12a720b9ccd8cf93becdf5a775e6673717da25d08b11c4b871150dd878241c8fea364e383fe1d1094 SHA512 e5f89a3756c6ad777fac8961bbf74f2a62d2b555ff9d7d5ebcba0533173ef6086d3e364460ae84932099d45f7bd9640acfa831d45e0d8317a47eceb1ddba314b
diff --git a/app-portage/diffmask/diffmask-0.3.3-r3.ebuild b/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
index 1b7c91a0cd0f..7baf9d9b47ce 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r3.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://bitbucket.org/mgorny/diffmask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/diffmask/"
+SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
new file mode 100644
index 000000000000..80b09bc47ee5
--- /dev/null
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
+HOMEPAGE="https://github.com/mgorny/diffmask/"
+SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	|| (
+		sys-apps/portage[${PYTHON_USEDEP}]
+		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+	)"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
index 3b906ae054ef..8c0f4525f829 100644
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ b/app-portage/diffmask/diffmask-9999.ebuild
@@ -1,23 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
+inherit distutils-r1 git-r3
 
 DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://bitbucket.org/mgorny/diffmask/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/diffmask/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="
@@ -25,8 +21,3 @@ RDEPEND="
 		sys-apps/portage[${PYTHON_USEDEP}]
 		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 	)"
-#if LIVE
-
-KEYWORDS=
-SRC_URI=
-#endif
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
index 787683efe046..a7831157d057 100644
--- a/app-portage/diffmask/metadata.xml
+++ b/app-portage/diffmask/metadata.xml
@@ -17,7 +17,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/diffmask/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/diffmask</remote-id>
+		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
+		<remote-id type="github">mgorny/diffmask</remote-id>
 	</upstream>
 </pkgmetadata>