Fix build failure due to git-2 decommission #2

Signed-off-by: Chen, Chih-Chia <pigfoot@gmail.com>

14 files changed, 107 insertions, 101 deletions

diff --git a/dev-python/flickr-api/Manifest b/dev-python/flickr-api/Manifest
index a32013e..c585451 100644
--- a/dev-python/flickr-api/Manifest
+++ b/dev-python/flickr-api/Manifest
@@ -1,2 +1 @@
-EBUILD flickr-api-9999.ebuild 644 SHA256 a066516538430e448a771beba66dcc8ff36207ac716e6efaca87142670d75101 SHA512 1c1e83095df0b347a2c688173a08f7bbe0376549619b289db29a266496fe5b2856db710293fa7dffa1b5e98ae13eb3c445ae33c6b7719482b154fb3947f71119 WHIRLPOOL 1df15d9838b27d38735c59934a7125c8aa965c4eb43fa9501cf006aab625f1166aac47b317b5566ea57656cbf322f9cef3c6aa255ce1303feb31f0376f1c3d96
-MISC metadata.xml 304 SHA256 e41afe40ccbbdba8fb36d0128779e3fc5d1897b2ec9258e59e94490d9f7dfbfe SHA512 f1bb1ebca73bbee02755bf750f308a3f130320aa6f1c862d68ac07b4a2c9966c497162d8add1623a9ac3e93391ba16fdf9be5db5812fae156dfce824040e3040 WHIRLPOOL de0aac2e7eceab3f62073d9ae3331a6821933543cbd15670ee67dcead18a200d560658ebc3044e7cb4100d4b0aa9efd9ea24bab4b2490458806d909e685f3f7f
+DIST flickr-api-0.6.1.tar.gz 102102 BLAKE2B e28d54bb9bc767a4f5cdb95a97dd1ccdabd925c1acda3d57a27f20698c1ca7471dc4fdb6c883b4368ec9749b83a1fd74fcb9673a5b2e320dd878b6470935eadc SHA512 81540a120e5b07077c03218569c5a7411bb476490e0d68f4102408247e3baf34570b02a087efd880d2b6d134336071a500edd5d10f01b9f5f3facb88c3633495
diff --git a/dev-python/flickr-api/flickr-api-0.6.1.ebuild b/dev-python/flickr-api/flickr-api-0.6.1.ebuild
new file mode 120000
index 0000000..08ea084
--- /dev/null
+++ b/dev-python/flickr-api/flickr-api-0.6.1.ebuild
@@ -0,0 +1 @@
+flickr-api-9999.ebuild
\ No newline at end of file
diff --git a/dev-python/flickr-api/flickr-api-9999.ebuild b/dev-python/flickr-api/flickr-api-9999.ebuild
index 6fc5d97..5e066ad 100644
--- a/dev-python/flickr-api/flickr-api-9999.ebuild
+++ b/dev-python/flickr-api/flickr-api-9999.ebuild
@@ -1,23 +1,34 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/alexis-mignon/python-${PN}.git
-	               git://github.com/beaufour/python-${PN}.git"
-	EGIT_MASTER="master"
-	inherit git-2
+MY_PN="github.com/alexis-mignon/python-${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="${PV}"
+	MY_P="python-${PN}-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Simple tool to upload photos to Flickr"
 HOMEPAGE="https://github.com/alexis-mignon/python-flickr-api/"
+
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RDEPEND="dev-python/oauth[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flickr-api/metadata.xml b/dev-python/flickr-api/metadata.xml
deleted file mode 100644
index af561bd..0000000
--- a/dev-python/flickr-api/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>pigfoot@gmail.com</email>
- <name>Chen, Chih-Chia</name>
- <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/flickr-upload/Manifest b/dev-python/flickr-upload/Manifest
index 3702ff2..08e7567 100644
--- a/dev-python/flickr-upload/Manifest
+++ b/dev-python/flickr-upload/Manifest
@@ -1,2 +1 @@
-EBUILD flickr-upload-9999.ebuild 668 SHA256 1bbb5a1b39538412ef4353475084112fd333e26867591b562d001d547acb021f SHA512 234c70f64b0767af4acb9d51e46b1c23de351a21f780ad38aa929dd6c89c6540aceb24aa1bc2b9214c72f692e97baac17e9bcccfc4e69fe8065ada99ac6fa94e WHIRLPOOL ebe1dd180452bace16b053438e889cb3a8b5717f995900d2676cee0a0cdfb875ea5c1feee9661f674c32dbdef0e2c700caa9c32b10ad7b6b138d1fc4167de3cb
-MISC metadata.xml 304 SHA256 e41afe40ccbbdba8fb36d0128779e3fc5d1897b2ec9258e59e94490d9f7dfbfe SHA512 f1bb1ebca73bbee02755bf750f308a3f130320aa6f1c862d68ac07b4a2c9966c497162d8add1623a9ac3e93391ba16fdf9be5db5812fae156dfce824040e3040 WHIRLPOOL de0aac2e7eceab3f62073d9ae3331a6821933543cbd15670ee67dcead18a200d560658ebc3044e7cb4100d4b0aa9efd9ea24bab4b2490458806d909e685f3f7f
+DIST flickr-upload-0_pre20130527.tar.gz 3268 BLAKE2B f8d16cb6f32c9c4365c6dd3a9ac416f66141b524f354686892c6e9e81d14dc43a580afa45f945602278e8f252ac1fcb1d0c3f5985f033282eae6bb5551fcd80e SHA512 7cbf554a0ca3a7e5a6e0e904d580910237aeee918eb3996258f7cd4a790c124d2c0343debaa7662a9a78f6d5c2480acd61a06ea5064b196a6ab65fefa8213a7c
diff --git a/dev-python/flickr-upload/flickr-upload-0_pre20130527.ebuild b/dev-python/flickr-upload/flickr-upload-0_pre20130527.ebuild
new file mode 120000
index 0000000..a80b505
--- /dev/null
+++ b/dev-python/flickr-upload/flickr-upload-0_pre20130527.ebuild
@@ -0,0 +1 @@
+flickr-upload-9999.ebuild
\ No newline at end of file
diff --git a/dev-python/flickr-upload/flickr-upload-9999.ebuild b/dev-python/flickr-upload/flickr-upload-9999.ebuild
index 3752c19..f946db8 100644
--- a/dev-python/flickr-upload/flickr-upload-9999.ebuild
+++ b/dev-python/flickr-upload/flickr-upload-9999.ebuild
@@ -1,24 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/beaufour/${PN}.git
-	               git://github.com/beaufour/${PN}.git"
-	EGIT_MASTER="master"
-	inherit git-2
+MY_PN="github.com/beaufour/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="b86d484080daa13c706c6f8dbad7135078978fb9"
+	MY_P="${PN}-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Simple tool to upload photos to Flickr"
 HOMEPAGE="https://github.com/beaufour/flickr-upload"
+
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RDEPEND="dev-python/flickr-api[${PYTHON_USEDEP}]
-	     dev-python/phpserialize[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND="dev-python/flickr-api[${PYTHON_USEDEP}]
+		dev-python/phpserialize[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flickr-upload/metadata.xml b/dev-python/flickr-upload/metadata.xml
deleted file mode 100644
index af561bd..0000000
--- a/dev-python/flickr-upload/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>pigfoot@gmail.com</email>
- <name>Chen, Chih-Chia</name>
- <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/icdiff/Manifest b/dev-python/icdiff/Manifest
index be94456..ed44236 100644
--- a/dev-python/icdiff/Manifest
+++ b/dev-python/icdiff/Manifest
@@ -1 +1 @@
-EBUILD icdiff-9999.ebuild 595 SHA256 7b2d92756b92b0475ffbd050a535904641be5d6578f437aca5b3f7eb06f443ba SHA512 d03e25f59c70f7bb3e8372c207fc612d138ace9e0d333196206864c4aa36e96b45b8c8fbde87cbfa990f4fca636e9ee3e9c028082e0e5ab8367838447b70fb41 WHIRLPOOL 3b83f69809a5aefacbc319859d06047cbf2b659d14f63c87d50281a7506988b0a5de907b4ccca61a46efa140ebc869ced407e7aa721c87bfe155fe32c0169e53
+DIST icdiff-1.9.5.tar.gz 31914 BLAKE2B 8d9b9b5104c3075addae2954b41c27ccebe3b4723b0e71ef88a214d7fa0ff7d8cb9ac52cada8ddec929d308a356daf37ef4463a52667f7e229a4a33d1d993e86 SHA512 f4c50da1e73a1af2fd63feabfd180125637a856a8757356eb3b48bbc21871f36a2c876acd2e2ba9d354c8f6e658f6e262fbbfd65fa4078d0adebc1353d87e40a
diff --git a/dev-python/icdiff/icdiff-1.9.5.ebuild b/dev-python/icdiff/icdiff-1.9.5.ebuild
new file mode 120000
index 0000000..864c25f
--- /dev/null
+++ b/dev-python/icdiff/icdiff-1.9.5.ebuild
@@ -0,0 +1 @@
+icdiff-9999.ebuild
\ No newline at end of file
diff --git a/dev-python/icdiff/icdiff-9999.ebuild b/dev-python/icdiff/icdiff-9999.ebuild
index 2ff079f..5d88ade 100644
--- a/dev-python/icdiff/icdiff-9999.ebuild
+++ b/dev-python/icdiff/icdiff-9999.ebuild
@@ -1,29 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
-inherit eutils
+EAPI=7
 
-if [[ ${PV} == "9999" ]] ; then
-    EGIT_REPO_URI="https://github.com/jeffkaufman/${PN}.git
-                   git://github.com/jeffkaufman/${PN}.git"
-    EGIT_MASTER="master"
-    inherit git-2
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
+inherit distutils-r1
+
+MY_PN="github.com/jeffkaufman/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
+else
+	EGIT_COMMIT="${PV}"
+	MY_P="${PN}-release-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Improved colored diff"
 HOMEPAGE="http://www.jefftk.com/icdiff"
-LICENSE=""
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RDEPEND="${DEPEND}"
 
-src_compile(){
-	python setup.py build || die
-}
+LICENSE="PSF-2.3"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
 
-src_install(){
-	 python setup.py install --root="${D}" || die
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/phpserialize/Manifest b/dev-python/phpserialize/Manifest
index 2795e27..2c031b7 100644
--- a/dev-python/phpserialize/Manifest
+++ b/dev-python/phpserialize/Manifest
@@ -1,4 +1 @@
-DIST phpserialize-1.3.tar.gz 7466 SHA256 bf672d312d203d09a84c26366fab8f438a3ffb355c407e69974b7ef2d39a0fa7 SHA512 8b5cabbccb4e336912c376ac70b4c4b7d192f22660d5f679caeb583e9f47f45b933c19683bed003a88b86f59099bcd63a576fd72ce67ea6573587ffb3fa9e5a0 WHIRLPOOL da72ff695c4857dcf03a8f316f9c62e3fb85fbb699810ce3d176577499c4c483dfb0719d800f72c4f4c1a146296ff561672a7ecc14c0bd702a99b4a5320e95e4
-EBUILD phpserialize-1.3.ebuild 692 SHA256 66028789d0799bac3c0e6112908740e43455750864fd360c8a66c90cf45f2c51 SHA512 a650c45ff0f1ba3322bdcc6dba22c5b4c9c099dab267558cb5a98e2c949d540913c00bd8ad4c7b71f9b849f633e676b2c16caf331d23662e79939788afd9930b WHIRLPOOL 4a275d3c36b5a56b9f8e3c86e3b80cee942fdd17291747f6f39753d8564335a3230aa0642b126ffbb6673f16e1a779582f0e810e2d347eb3b0f4fb466088e6e5
-EBUILD phpserialize-9999.ebuild 692 SHA256 66028789d0799bac3c0e6112908740e43455750864fd360c8a66c90cf45f2c51 SHA512 a650c45ff0f1ba3322bdcc6dba22c5b4c9c099dab267558cb5a98e2c949d540913c00bd8ad4c7b71f9b849f633e676b2c16caf331d23662e79939788afd9930b WHIRLPOOL 4a275d3c36b5a56b9f8e3c86e3b80cee942fdd17291747f6f39753d8564335a3230aa0642b126ffbb6673f16e1a779582f0e810e2d347eb3b0f4fb466088e6e5
-MISC metadata.xml 304 SHA256 e41afe40ccbbdba8fb36d0128779e3fc5d1897b2ec9258e59e94490d9f7dfbfe SHA512 f1bb1ebca73bbee02755bf750f308a3f130320aa6f1c862d68ac07b4a2c9966c497162d8add1623a9ac3e93391ba16fdf9be5db5812fae156dfce824040e3040 WHIRLPOOL de0aac2e7eceab3f62073d9ae3331a6821933543cbd15670ee67dcead18a200d560658ebc3044e7cb4100d4b0aa9efd9ea24bab4b2490458806d909e685f3f7f
+DIST phpserialize-1.3.tar.gz 7225 BLAKE2B 63a5e88c93ae5c75c476deb8ceb37fd3e250c86e745a587eca0ae2ff4484f923f0f50f31002176d3ce8c38585d827212b9c45a4b701a9f5ffe1782ee336bb2fa SHA512 d96e3aa87d2f03fef6c7cee234e90b373989a9c8e3a07a8e2147a2e7487d3448ea0ef646263e517d6b307bf66f9ba1a4e8def04f919767532cede802cc7db144
diff --git a/dev-python/phpserialize/metadata.xml b/dev-python/phpserialize/metadata.xml
deleted file mode 100644
index af561bd..0000000
--- a/dev-python/phpserialize/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>pigfoot@gmail.com</email>
- <name>Chen, Chih-Chia</name>
- <description>Maintainer. Assign bugs to him</description>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/phpserialize/phpserialize-9999.ebuild b/dev-python/phpserialize/phpserialize-9999.ebuild
index 54cdebd..1f3ea44 100644
--- a/dev-python/phpserialize/phpserialize-9999.ebuild
+++ b/dev-python/phpserialize/phpserialize-9999.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/${PN}.git
-	               git://github.com/mitsuhiko/${PN}.git"
-	EGIT_MASTER="master"
-	inherit git-2
-	KEYWORDS="~x86 ~amd64"
+MY_PN="github.com/mitsuhiko/${PN}"
+MY_P="${P}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${MY_PN}"
+	EGIT_SUBMODULES=()
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="x86 amd64"
+	EGIT_COMMIT="${PV}"
+	MY_P="${PN}-${EGIT_COMMIT}"
+	SRC_URI="https://${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A small library for extracting rich content from urls"
 HOMEPAGE="http://github.com/mitsuhiko/phpserialize"
+
 LICENSE="BSD"
-SLOT="0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"