gentoo resync : 23.12.2017

3 files changed, 31 insertions, 22 deletions

diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index c771f06a2c5c..cfa0a773dcc6 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,5 +1,4 @@
-DIST backintime-1.1.12.tar.gz 656192 BLAKE2B 724a3836a816fa921b6f150bc4214f01c200766d2be3e9a28bf3a818b1e43c73d73ca43bb52bacc9950d22be3faacfcee8f88a20f00362ea18cda236f3b2bd38 SHA512 e1dc3e3d2bac8b0f390898029978e806128ffd6005471a7e8a697c44f9e271f9902b496b33b037133f9a509f4ca3f8b8f10adf681b670ec9a1a751dfc786cb62
 DIST backintime-1.1.24.tar.gz 658961 BLAKE2B 88255ea138f31c4540f54d2053616d4c8ce35f7c969b15a9c46422bfed4f0fd2cabb01e0cd4d1505fb84eee31daacb9da36c6bf71225f5b9a1d47d6941e571b2 SHA512 d16b6d3a710154ca8bddf80a8f06835efe84dd2f2435102e06a732f7e6e291b1954864298542658bab2b7bc42d5a6bf1d9338a98c66fd3f888c450b9685cc011
-EBUILD backintime-1.1.12.ebuild 1633 BLAKE2B 807a754139de41f2d30e5801997daac954d2e618a9a53ccfcd2f24b66df3000b10e7339d1d9d52cb9bf5e7b10d2b4ad6c00d119871db54b35dadde138962efbd SHA512 c55b2dca49cacfec814dba615f50490d2a2edbf0b64ebc43f58b9319cde00082d86f89b74070d317791205e83e637e085019cc0b4b1fe3d7433d658c01bed2d1
-EBUILD backintime-1.1.24.ebuild 1771 BLAKE2B 7b09ccef644c807ba56641dd6490ababa0ce5afedd963a784439d56e1fab5b65305943fae91b6a3d462bc6a89d1e2aeeb91e3334622667538a44e8e6a0ce53d2 SHA512 e6db3f89925870bbdac866a2426c2c7c94402db5ac5820b5c2a07e3c74a51131a27233c607237100be553e45af169cfa4b1b22dc8ba038ffd56a16b41f3c3620
+EBUILD backintime-1.1.24.ebuild 1813 BLAKE2B 60766b823aa74012c76716da47e526b1b46889a4b536c1cc9414a99535cb922419bf5b3266e30d452bd34ea99da32cc591cf14b4ea5374050d746d5b7479719e SHA512 d4b76c90a12c31741dbaec30c881fee6458970921aa54465b0bd503e2bbca3f1801e2bc2cbffc1df7ad58a7a306d6fa0a7957c0f7e79dbe806a66801d2da7a37
+EBUILD backintime-9999.ebuild 1780 BLAKE2B 04c66c0db49c28cabc939192dbee09272533f13a4ef3f975cda5c8c58a3dbf1b35b9b6cdf8c2994a32d1a331238f42916cd70dfd17d0803e10867506ebc4e9c2 SHA512 6c037745cd124111a1f823512b8e34a84aa15568a52aa44e30375e5a2d3e2ca5265f33a9a268d2a9ff706d536b2a56d1ee2cd7070a2379703d46531c35dafa10
 MISC metadata.xml 716 BLAKE2B 469a4318ff5607d74bb1d2166feba52686891921e59c117e15d54057eeafc1d5d3a2c9232e434c3783b04716b8784fcd092bc2d77553e1e56d27939ffb89dd50 SHA512 377471e000a0cb8f034f7c6a20596e48f7fe380c7910f0a97b6a47b779eb466efb6a02b4eef10569a9b9baf7e3eca03d6e22f87e36e4f11836ffb05fa38f7f0a
diff --git a/app-backup/backintime/backintime-1.1.24.ebuild b/app-backup/backintime/backintime-1.1.24.ebuild
index a72918d9c63d..e06ed0d26293 100644
--- a/app-backup/backintime/backintime-1.1.24.ebuild
+++ b/app-backup/backintime/backintime-1.1.24.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit eutils python-single-r1 gnome2-utils
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="https://backintime.readthedocs.io/"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
 SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-backup/backintime/backintime-1.1.12.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 39ccb01f130a..1bff0ab51bab 100644
--- a/app-backup/backintime/backintime-1.1.12.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit eutils python-single-r1
+inherit eutils python-single-r1 gnome2-utils git-r3
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+EGIT_REPO_URI="https://github.com/bit-team/backintime/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4"
+KEYWORDS=""
+IUSE="qt5"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -22,7 +22,7 @@ DEPEND="${PYTHON_DEPS}
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]"
 RDEPEND="${DEPEND}
-	qt4? ( dev-python/PyQt4 )"
+	qt5? ( dev-python/PyQt5 )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -30,12 +30,12 @@ src_prepare() {
 	#fix doc install location
 	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
 		-i common/configure || die
-	sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
-		-i qt4/configure || die
+	sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \
+		-i qt/configure || die
 	sed -e "/addInstallFile \"..\/VERSION/d" \
 		-e "/addInstallFile \"..\/LICENSE/d" \
 		-e "/addInstallFile \"..\/debian\/copyright/d" \
-		-i {qt4,common}/configure || die
+		-i {qt,common}/configure || die
 
 	if [ -n ${LINGUAS+x} ] ; then
 		cd common/po || die
@@ -45,13 +45,15 @@ src_prepare() {
 			fi
 		done
 	fi
+
+	default
 }
 
 src_configure() {
 	cd "${S}"/common || die
 	./configure --python3 --no-fuse-group || die
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
 		./configure --python3 || die
 	fi
 }
@@ -59,8 +61,8 @@ src_configure() {
 src_compile() {
 	cd "${S}"/common || die
 	emake
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
 		emake
 	fi
 }
@@ -68,10 +70,18 @@ src_compile() {
 src_install() {
 	cd "${S}"/common || die
 	emake DESTDIR="${D}" install
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
+	if use qt5 ; then
+		cd "${S}"/qt || die
 		emake DESTDIR="${D}" install
 	fi
 
 	python_optimize "${D}"
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}