5 files changed, 116 insertions, 8 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 5de83896e69c..08919afa7675 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 5f563ee7f0fd..c771f06a2c5c 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,5 +1,5 @@
 DIST backintime-1.1.12.tar.gz 656192 BLAKE2B 724a3836a816fa921b6f150bc4214f01c200766d2be3e9a28bf3a818b1e43c73d73ca43bb52bacc9950d22be3faacfcee8f88a20f00362ea18cda236f3b2bd38 SHA512 e1dc3e3d2bac8b0f390898029978e806128ffd6005471a7e8a697c44f9e271f9902b496b33b037133f9a509f4ca3f8b8f10adf681b670ec9a1a751dfc786cb62
-DIST backintime-1.1.8.tar.gz 617754 BLAKE2B ad85aee9750a3a204961ef33e25e80dc54f130b2cf34492092edeed68387252a61d30a1b9e209b9c76521fe1f6b2a4b77e71c135201d13813d6b6865e2dd5f45 SHA512 550e270dcf341ec5ad952f4decd836007d19ff9bf60cada834dfb488dbf29954b6fd3ed80a4f8fb4406a0166895a7f7c922e5622d06c43086dd54073e5aabd99
+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.8-r1.ebuild 1629 BLAKE2B f9d35714e33824db5f126563bd1494ddf3c9eae767c3b75ade3dc8da11d186d9434a17949cd9240428ff4a36da24a719ca6244ce344eac4a6ea230f9b0bb51b4 SHA512 db1ecccbb71f8241500629fa2147d540e0bc9f1353c6fb117b724505629cbdfecc478fb58ac9f5a0cce79b7c87e046f1ab8a005596185f0d0989d445be3a4bce
+EBUILD backintime-1.1.24.ebuild 1771 BLAKE2B 7b09ccef644c807ba56641dd6490ababa0ce5afedd963a784439d56e1fab5b65305943fae91b6a3d462bc6a89d1e2aeeb91e3334622667538a44e8e6a0ce53d2 SHA512 e6db3f89925870bbdac866a2426c2c7c94402db5ac5820b5c2a07e3c74a51131a27233c607237100be553e45af169cfa4b1b22dc8ba038ffd56a16b41f3c3620
 MISC metadata.xml 716 BLAKE2B 469a4318ff5607d74bb1d2166feba52686891921e59c117e15d54057eeafc1d5d3a2c9232e434c3783b04716b8784fcd092bc2d77553e1e56d27939ffb89dd50 SHA512 377471e000a0cb8f034f7c6a20596e48f7fe380c7910f0a97b6a47b779eb466efb6a02b4eef10569a9b9baf7e3eca03d6e22f87e36e4f11836ffb05fa38f7f0a
diff --git a/app-backup/backintime/backintime-1.1.8-r1.ebuild b/app-backup/backintime/backintime-1.1.24.ebuild
index 22be00238312..a72918d9c63d 100644
--- a/app-backup/backintime/backintime-1.1.8-r1.ebuild
+++ b/app-backup/backintime/backintime-1.1.24.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5} )
 
-inherit eutils python-single-r1
+inherit eutils python-single-r1 gnome2-utils
 
 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/"
+SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -45,6 +45,8 @@ src_prepare() {
 			fi
 		done
 	fi
+
+	default
 }
 
 src_configure() {
@@ -75,3 +77,11 @@ src_install() {
 
 	python_optimize "${D}"
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index d1bab7deb71b..f08e08c9a4e7 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
 DIST dar-2.5.12.tar.gz 1893694 BLAKE2B bbd364928377fc9c4b3c9cec47dd66abe2c02d7366f8373882664e263dbe29978d49ac73f3e4dbdb15d586d290807ef127c4142c8df22a04b6fc3aec11b13307 SHA512 58eafe69c730d8f3974a1b1e8f7ca67feee82babde9ba9577ef29c422861db2b29afa835c9b55160e5d226efb634b539a580845e429d08fd84beeb6f0d39be7e
+DIST dar-2.5.13.tar.gz 1903994 BLAKE2B 9e58e2d86d38203364f23b506d957fb78b1b6d33df780a2711aab13913e50ce83726fed9301bcfe7975987bef6b3b8de45a30ad32c4e0b9a2d3b5db14e8a108e SHA512 759a54c07bee787a02f751db4ecb4036fa578224ba69779e784ea4edebf3d9feb3547414fe605c0f655bb4ac364575638ae35aab952df1f6610dd436bc70b444
 EBUILD dar-2.5.11.ebuild 2402 BLAKE2B 2399becf88620c4f86746df445e74c39b677f17352c3468462e4a64a3719c53cfd2fa25471026d3e950cd07c9231d83169e470e0adab51ed13b3ff4e9b08dc3c SHA512 2519d1c4ee298e6439cf09946efd68d9ee8f627087f276e629ed0bb9af9b9b50889dc9cff8888e98b40f2bbe8cde59e26bdebaaffef177829bf7d40994ed9ded
 EBUILD dar-2.5.12.ebuild 2406 BLAKE2B 7f0a73200952c58eb492f65c46b66e763e6fba88134b45c9a3b902e7fd771385cca081ec4e8314b31eb49b00c96660b619619325cfd2fb73d9b68b0be0132392 SHA512 6d7185d1dbcf892ea038aa7c158a97ff9a77580d38a191914c704edbc78863d1c6ca74b30f5b3f39a76e137eca78e4cb42e5ce8d760fd624d3da47bb4933adb8
+EBUILD dar-2.5.13.ebuild 2406 BLAKE2B 7f0a73200952c58eb492f65c46b66e763e6fba88134b45c9a3b902e7fd771385cca081ec4e8314b31eb49b00c96660b619619325cfd2fb73d9b68b0be0132392 SHA512 6d7185d1dbcf892ea038aa7c158a97ff9a77580d38a191914c704edbc78863d1c6ca74b30f5b3f39a76e137eca78e4cb42e5ce8d760fd624d3da47bb4933adb8
 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817
diff --git a/app-backup/dar/dar-2.5.13.ebuild b/app-backup/dar/dar-2.5.13.ebuild
new file mode 100644
index 000000000000..bb527233dac9
--- /dev/null
+++ b/app-backup/dar/dar-2.5.13.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks"
+HOMEPAGE="http://dar.linux.free.fr/"
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+	!static? (
+		app-arch/bzip2:=
+		app-arch/xz-utils:=
+		sys-libs/libcap
+		gcrypt? ( dev-libs/libgcrypt:0= )
+		gpg? ( app-crypt/gpgme )
+		lzo? ( dev-libs/lzo:= )
+		xattr? ( sys-apps/attr:= )
+	)"
+
+DEPEND="${RDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		app-arch/xz-utils[static-libs]
+		sys-libs/libcap[static-libs]
+		sys-libs/zlib[static-libs]
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs] )
+		gpg? (
+			app-crypt/gpgme[static-libs]
+			dev-libs/libassuan[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		lzo? ( dev-libs/lzo[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+	)
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+		gpg? ( gcrypt )"
+
+#PATCHES=(
+#)
+
+src_configure() {
+	local myconf=( --disable-upx )
+
+	# Bug 103741
+	filter-flags -fomit-frame-pointer
+
+	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
+	# logic.
+	# For example "--enable-dar-static" causes configure to DISABLE
+	# static builds of dar.
+	# Do _not_ use $(use_enable) until you have verified that the
+	# logic has been fixed by upstream.
+	use xattr || myconf+=( --disable-ea-support )
+	use dar32 && myconf+=( --enable-mode=32 )
+	use dar64 && myconf+=( --enable-mode=64 )
+	use doc || myconf+=( --disable-build-html )
+	# use examples && myconf+=( --enable-examples )
+	use gcrypt || myconf+=( --disable-libgcrypt-linking )
+	use gpg || myconf+=( --disable-gpgme-linking )
+	use lzo || myconf+=( --disable-liblzo2-linking )
+	use nls || myconf+=( --disable-nls )
+	if ! use static ; then
+		myconf+=( --disable-dar-static )
+		if ! use static-libs ; then
+			myconf+=( --disable-static )
+		fi
+	fi
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	local DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+	einstalldocs
+
+	if ! use static-libs ; then
+		prune_libtool_files --all
+	fi
+}