gentoo resync : 30.06.2019

4 files changed, 40 insertions, 30 deletions

diff --git a/sys-apps/gcp/Manifest b/sys-apps/gcp/Manifest
index ed8dac6b7d94..622fdec919a6 100644
--- a/sys-apps/gcp/Manifest
+++ b/sys-apps/gcp/Manifest
@@ -1,3 +1,4 @@
-DIST gcp-0.1.3.tar.bz2 30946 BLAKE2B 404adeb65396829afd1e51308e3e629b19dc8b27e142b349ee90282142b9fc151acad60010bf75031d9dc9ce805d5c561a6244994c1b69d1e7f87b76402984f3 SHA512 856561d7d1514b7e90ed4e976b4572b6a82113edb9c3127168053d8993f67ea4efa1d3d5543c318dd961ee9d42679232444e1f397b1c7ba22bfba6b5d7acfc76
-EBUILD gcp-0.1.3.ebuild 680 BLAKE2B 7a58b0317199111ccf51160c28752d2ba1d1a36f83d90bb210f03800cea22670f5e66c47acaace553a4d8046661b9649d299332a145af7c7f4e94448d73ea802 SHA512 e9e1ea9c802943f702dbb9f69916f28f52abb99804b320457be0a03db45289523e6e9141f044b53750c0f6fb0fca33386880624c60f51d152c6901a25a437b99
+AUX gcp-0.2.1-gentoo-fhs.patch 431 BLAKE2B a779679ea6f7ee897b66ce89b8d209969012cee0c1f1840c8607b4d458b3f9ef9371f5612804cab8fadef84171c53677388c53f78aff5bc20b4e6d10e5cbc58f SHA512 9ddaf9f0635eae415ae99cefc37157cba0758a1e89c2f7cd64502991452eec323d63b9949ed9f834afe7340b53d423ce4efd6dffc346b694a6d94424ea18aedd
+DIST gcp-0.2.1.tar.gz 33098 BLAKE2B 9affaf87db722c1e35fe71acf93521753a4372d42bf33892cde8605b17972ac46f616177114c5ccc36fad64011ae881ecc9382c79311dbca93ebedd04e688526 SHA512 900e08554e8f87e9572c52381c83bdcd89f02cab4fbf51335ddb81796057fa8bec156cf3ddab8712ed2c55ca7d6d0e1c209939ccead9bf7693d76bf882807017
+EBUILD gcp-0.2.1.ebuild 618 BLAKE2B 0d170e88aae774ee31dcfbc9d2668e07bf128f8cd2bbeae5b1ee84fa042abf4997d814462a9dce91ab64c132b993744a5e78b548ff0fa7e84e73c11986396ddc SHA512 a70920141c65d7cec89746c8d84bf4d597d6580d4e3b8e94bc607931e036657580c554e103fc18a91621cdb1af7ef1ced3a989fde6a4d4521657d90b093178dd
 MISC metadata.xml 219 BLAKE2B 96b35aca9e98ee4763a251a4dd9d63b7377c7183023f2ccda74cc76c7117fa885f518bebfad739d2e80f32dfdf4882e08012a94360666dd9cff26642e2df4513 SHA512 39ee913ff21c2aaa9f767872e2b49cb3cb982afab04d7b5045eda61368d63c2e3e1d637df59f7fb4ec4f95776e754615a260b37580cc9f18017a7c080955db77
diff --git a/sys-apps/gcp/files/gcp-0.2.1-gentoo-fhs.patch b/sys-apps/gcp/files/gcp-0.2.1-gentoo-fhs.patch
new file mode 100644
index 000000000000..78ddb5d09617
--- /dev/null
+++ b/sys-apps/gcp/files/gcp-0.2.1-gentoo-fhs.patch
@@ -0,0 +1,13 @@
+--- a/setup.py
++++ b/setup.py
+@@ -41,9 +41,8 @@
+ #        'console_scripts': ['gcp=gcp:main'],
+ #    },
+     data_files=[
+-        ('man/man1', ["gcp.1"]),
++        ('share/man/man1', ["gcp.1"]),
+         ('share/locale/fr/LC_MESSAGES', ['i18n/fr/LC_MESSAGES/gcp.mo']),
+-        ('share/doc/%s' % name, ['CHANGELOG', 'LICENSE', 'README.md']),
+     ],
+     install_requires=['PyGObject', 'dbus-python'],
+     python_requires='>=3',
diff --git a/sys-apps/gcp/gcp-0.1.3.ebuild b/sys-apps/gcp/gcp-0.1.3.ebuild
deleted file mode 100644
index bc2f7a8a3168..000000000000
--- a/sys-apps/gcp/gcp-0.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="File copying utility with progress and I/O indicator"
-HOMEPAGE="https://wiki.goffi.org/wiki/Gcp/en"
-SRC_URI="ftp://ftp.goffi.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/progressbar[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-	sed -e '/use_setuptools/d' \
-	    -e 's#.\+share/doc.\+#],#' -i setup.py || die
-}
diff --git a/sys-apps/gcp/gcp-0.2.1.ebuild b/sys-apps/gcp/gcp-0.2.1.ebuild
new file mode 100644
index 000000000000..3425601feba6
--- /dev/null
+++ b/sys-apps/gcp/gcp-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="File copying utility with progress and I/O indicator"
+HOMEPAGE="https://code.lm7.fr/mcy/gcp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.1-gentoo-fhs.patch )