gentoo resync : 05.04.2018

7 files changed, 144 insertions, 6 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 698bffeef2b2..fe5aecd4953a 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index cfa0a773dcc6..c0d39afb49bc 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,4 +1,6 @@
 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-9999.ebuild 1780 BLAKE2B 04c66c0db49c28cabc939192dbee09272533f13a4ef3f975cda5c8c58a3dbf1b35b9b6cdf8c2994a32d1a331238f42916cd70dfd17d0803e10867506ebc4e9c2 SHA512 6c037745cd124111a1f823512b8e34a84aa15568a52aa44e30375e5a2d3e2ca5265f33a9a268d2a9ff706d536b2a56d1ee2cd7070a2379703d46531c35dafa10
+EBUILD backintime-1.2.0_pre20180221.ebuild 1835 BLAKE2B d017cea7a86598f04f151c449c67426d76d592452f8ac855986fceda0a1053e966003299c321709826da3e33184307ebb87287ba24b063d56ab104ad58a6c211 SHA512 c6b5475bc8c8ef9095db09e7c5263e2ac8cd0fdadf8271f83b4df461b9969120ac296fdf53a0f2680516d575ded7380ab5091a2be05a2dae64b30293c9881cc8
+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.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
new file mode 100644
index 000000000000..fbc9194ee8d3
--- /dev/null
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+COMMIT=45ec81c185789b2dbafd7348d1af039b5183c9ff
+inherit python-single-r1 gnome2-utils vcs-snapshot
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]"
+RDEPEND="${DEPEND}
+	qt5? ( dev-python/PyQt5 )"
+
+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}-qt:/doc/${PF}:g" \
+		-i qt/configure || die
+	sed -e "/addInstallFile \"..\/VERSION/d" \
+		-e "/addInstallFile \"..\/LICENSE/d" \
+		-e "/addInstallFile \"..\/debian\/copyright/d" \
+		-i {qt,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 qt5 ; then
+		cd "${S}"/qt || die
+		./configure --python3 || die
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common || die
+	emake
+	if use qt5 ; then
+		cd "${S}"/qt || die
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common || die
+	emake DESTDIR="${D}" install
+	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
+}
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 1bff0ab51bab..9fcb400d83e9 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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 git-r3
+inherit python-single-r1 gnome2-utils git-r3
 
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
 HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
 EGIT_REPO_URI="https://github.com/bit-team/backintime/"
 
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 3a5bdd90be61..2fb4a6f6e014 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,6 +1,8 @@
 DIST borgbackup-1.1.3.tar.gz 2942183 BLAKE2B c7ca37459d35e06694cf9fdbef7328806cf03e6a4290368d47a2c06e1b6a0700d9dbba3efb170e130c7e59951d65ff8ca677955782150154f0ad2d12b93fe57b SHA512 8378e4f805bfb3e9a4e454f5ccfa58eef0517f13a2e8a2c3c6cbdb0304b763fa67152963b17d677daff09590eb777f12fbe1f3f69c3459bcc68781e5a747cb49
 DIST borgbackup-1.1.4.tar.gz 3390046 BLAKE2B 27d1743718b9fdd303dbc7a01a586b9f87c119ed7f2464582a229bf2357c3f7d929bdf614689be7d7306a707e7332b8ae0ce5bd9898cea5af2311ca2210c5f41 SHA512 0853033f72406a2913dd74c6ebb8b33a318179843255c92481f5e4fdd0f436de6e4c77eed259a422e00bfadcf260facdfd00c813bb0628b82b8ff63a87e1bcfb
+DIST borgbackup-1.1.5.tar.gz 3392774 BLAKE2B 7eaa3dee548748b4b741607934c9344203e318f4558cf9497938caf5ae5af7dfac075748a2c78a767de618d5ca07c80d7dcd2f5c61e7314d643e2974c4eb4b29 SHA512 22071e4b37059d816592baff852772720769b3d86eb1d071abba67f9d13de809066aa29cdf18f1aaef127d1f24288913a7b0b63d157fb98840b1a71606dc0554
 EBUILD borgbackup-1.1.3-r1.ebuild 1089 BLAKE2B 227958b734a324262ec7e2b5cd68ed388bed8919a0ade56d357e7d21a7558ac7c8c0467bec06d96cdd4e6d63ae73677e9d9209462beab44c0faf512fb3aef0e3 SHA512 8b4863da598d8a1b198ea2e6e40326051a867fc0671bf5e660aa5c5aac9f4838620f48e9a4787aad463b342fb6e68d04ea0fe93f160a8261f450d4ec629eea82
 EBUILD borgbackup-1.1.4-r1.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
-EBUILD borgbackup-9999.ebuild 1076 BLAKE2B 6077574567e4f83fb3b620688585cb414ee56759d723ab722ffd6b5a6a28c69e71706b1ab54d4f41a9f3a29ebab3d40c8741614e76c7b8a6847f06f45bb57016 SHA512 787ccd8d08b917e8e08cb7e80000193e9b0c94f522b42c53cddbfdb1d294219dc94d0281668fc1dbaafe89f69dd882ea6248e240d155e19b1f6d592470ac413c
+EBUILD borgbackup-1.1.5.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
+EBUILD borgbackup-9999.ebuild 1090 BLAKE2B 54321c9dadf7b6bf077a286375c3ebc84b5f8e545e6d103d0af24253fed071f67a547b6a33af03b00bf72b765122125c16041fe6668d42f99d4809a74f87047e SHA512 c135ae63d7fa35c806fd9ffb0bcf4be28fb935a539843253054c4169d38affaefa1dce2d9388def85022bcbe4b232f4e0e762abe5715b5e87d18fb70d7cb64a9
 MISC metadata.xml 380 BLAKE2B 2ac9cd2f49c605955fb4133ff30d52e578bb45b0717348e6909cf7cd172ce9a7436d30394466ece7d889d02802f500f86297072a755b24905c17342cd7aee5e4 SHA512 4160c5674dbb51e9e3fa3c0d29fca6b7ab4073f2e2be1a2eca88ff049b4b5f066d04c747130c45d31a9c63ee2fe3bcb5f521017a581e7f6b69eb07fb94b83661
diff --git a/app-backup/borgbackup/borgbackup-1.1.5.ebuild b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
new file mode 100644
index 000000000000..fdd80a89ecd9
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index e04ac14d4248..fdd80a89ecd9 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -41,6 +41,6 @@ DEPEND="
 
 python_prepare_all() {
 	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' setup.py || die
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
 	distutils-r1_python_prepare_all
 }