gentoo resync : 28.04.2018

3 files changed, 2 insertions, 91 deletions

diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index b8f131d68a58..16341a967afe 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,6 +1,4 @@
-DIST backintime-1.1.24.tar.gz 658961 BLAKE2B 88255ea138f31c4540f54d2053616d4c8ce35f7c969b15a9c46422bfed4f0fd2cabb01e0cd4d1505fb84eee31daacb9da36c6bf71225f5b9a1d47d6941e571b2 SHA512 d16b6d3a710154ca8bddf80a8f06835efe84dd2f2435102e06a732f7e6e291b1954864298542658bab2b7bc42d5a6bf1d9338a98c66fd3f888c450b9685cc011
 DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
-EBUILD backintime-1.1.24.ebuild 1813 BLAKE2B 60766b823aa74012c76716da47e526b1b46889a4b536c1cc9414a99535cb922419bf5b3266e30d452bd34ea99da32cc591cf14b4ea5374050d746d5b7479719e SHA512 d4b76c90a12c31741dbaec30c881fee6458970921aa54465b0bd503e2bbca3f1801e2bc2cbffc1df7ad58a7a306d6fa0a7957c0f7e79dbe806a66801d2da7a37
-EBUILD backintime-1.2.0_pre20180221.ebuild 1834 BLAKE2B 0dc311d045f0dc7ccb477b5ec22cdd3932a05d7c361967808c1233b9ad143b3d50d988907d2f74a084d1dd08b36212b448c2c4054d1dfea6acd1cd48758243b9 SHA512 360f4be91e2025923251fb4d62de0632ec217ad212141bb90ab838e147085ebbc1b6a8a852e0d97a0b72921bc7c84d3f35953d83835f7e69dcf9e044b58202e6
+EBUILD backintime-1.2.0_pre20180221.ebuild 1833 BLAKE2B dd1cb47f69f160df1ea0ae5cb60276001517cbc4647ede66d4bc55351c65012eb105fc63bbac81dd2f3321f90f7f078f75ecfaa07f1f4c9fd550902ecb90e059 SHA512 00f3dbace06bb8609dd14bc1253deb505f63a97685e32fa3ade6c89e226ebd52f7c3b0be97b8713e86f270517eaad284b9298c1b3cb3f90a885a2966ebb21305
 EBUILD backintime-9999.ebuild 1742 BLAKE2B 2f898508c8297374a05f3c5a69bd5cdc1ca306729a1ee79fed8d60d319b2f4ff788a882bc789fd1be6c9a8d61413a84b2b055b55dead2845f68c317960065867 SHA512 acbbee1a19b0c627cfe7268770e1c51d41059c375ed022d94983b530d06f83e5d05f53a189a0a3e844d8baf77fb1df2ef62312e583dcd94245215ae3ae6b2015
 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
deleted file mode 100644
index e06ed0d26293..000000000000
--- a/app-backup/backintime/backintime-1.1.24.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/ 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"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]"
-RDEPEND="${DEPEND}
-	qt4? ( dev-python/PyQt4 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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 "/addInstallFile \"..\/VERSION/d" \
-		-e "/addInstallFile \"..\/LICENSE/d" \
-		-e "/addInstallFile \"..\/debian\/copyright/d" \
-		-i {qt4,common}/configure || die
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	cd "${S}"/common || die
-	./configure --python3 --no-fuse-group || die
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		./configure --python3 || die
-	fi
-}
-
-src_compile() {
-	cd "${S}"/common || die
-	emake
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake
-	fi
-}
-
-src_install() {
-	cd "${S}"/common || die
-	emake DESTDIR="${D}" install
-	if use qt4 ; then
-		cd "${S}"/qt4 || die
-		emake DESTDIR="${D}" install
-	fi
-
-	python_optimize "${D}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
index 0df305389205..1b1e607dc857 100644
--- a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qt5"
 
 DEPEND="${PYTHON_DEPS}