gentoo resync : 15.01.2020

5 files changed, 257 insertions, 55 deletions

diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index f3cc42a4be70..39a245bab4b2 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,4 +1,7 @@
+AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
 DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
-EBUILD backintime-1.2.0_pre20180221.ebuild 1828 BLAKE2B 6d2a8a29fd102ac129a1e7a3bb697b0dbeecfd1bc8b1f8ef84548a3532eda42779d5fe98e11e754411825a061ae47fc863ca0975b0eb36a2042b8108e3941a56 SHA512 10f35d9baf033a28d634f397aa090702fc0c92bed57e774c986033ab85b783b10cacbdf582701f89cff675829c735851ece24fc7bd2a27a9dcb8d84d5acbc731
-EBUILD backintime-9999.ebuild 1737 BLAKE2B b5e89b3a1a58734e6d178b079c7c64e805d0c13fec76127c07cf1761b4372e78445a4d5d34be735ef5fc3556beff8770219c25a13b1c09350e95b509e8adb2bb SHA512 494adbed07a7c2c0a1cd273e4574b6acff389bf2025270936c657daa956fcd9682a7c8e8f0f6f53ab3927e4a85e7ba78618bf0f4c9476ec25bd96a85b17f7558
+DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e
+EBUILD backintime-1.2.0_pre20180221.ebuild 1824 BLAKE2B 8f65cb07ccfa2e1045b8272ed24b122149d8e329d27a98216b9015d8baf2284788393ffeac581bf33efc771286df6770f93487cab2bf804f953f8c5da41d7971 SHA512 3688d3665c27d1496db838fa086e176c0496db4cee5c851f505ef417676ef9a7b36bb792b13c7877e9aa287998e025999cbc7f8b6f1073c5ed34fa9c7815ec5b
+EBUILD backintime-1.2.1.ebuild 1570 BLAKE2B e4f9c91f68e1cb2f4555710f7fa4f13e92f1510925164b4f37f0ea68e59088d1ed9dad825cb2750c3afdfcd77d9265056eb048d35af91edb522e22c8f2850c77 SHA512 b435eaef2132819345aa0afe20284e68d0a55bfc37d76998fd815b203e8231df42a1c221b4d11e01b397abf81b352325324ec828e439ed1b6553f7db0d47b22d
+EBUILD backintime-9999.ebuild 1550 BLAKE2B edc146152d284404369cef150bde83d55b5946ac8656a6cdea483618f993001f1160c6b34b7525f17a45f181a7b700f1af6856e49f35dde16098f554c5f6b749 SHA512 00a52d19d2b307b0696a51955fab2c219d2b13d4e6ac2684d21a1dc5c8af0c75a11e49fcfee905dad33b865c8bdc88afbe5c4dbf94ee309f72858d5abb6b8e88
 MISC metadata.xml 640 BLAKE2B 1f3990bb871e2158d4b1213caffc46fc83766619a6ad3e6c24f014ab62318e5140d91eb56e4806d34a2daed1e1a066f08b1205deb5c2aba7d60e6f90a7d193ea SHA512 d38c67f79e8a2a61314283bbd4c23979657dfdd4208f3d09d0a714251dd49c5420b1bc50c1817837541034df6b0c43e3a20bea625d5e67f488c027855456bdb6
diff --git a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
index f7312c15edf4..953a80145144 100644
--- a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 COMMIT=45ec81c185789b2dbafd7348d1af039b5183c9ff
 inherit python-single-r1 gnome2-utils vcs-snapshot
diff --git a/app-backup/backintime/backintime-1.2.1.ebuild b/app-backup/backintime/backintime-1.2.1.ebuild
new file mode 100644
index 000000000000..c7bc7578f634
--- /dev/null
+++ b/app-backup/backintime/backintime-1.2.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
+SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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[gui,widgets] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-compress-docs-examples.patch" )
+
+src_configure() {
+	pushd common > /dev/null || die
+		./configure --python3 --no-fuse-group || die
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			./configure --python3 || die
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	pushd common > /dev/null || die
+		emake
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	pushd common > /dev/null || die
+		emake DESTDIR="${D}" install
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake DESTDIR="${D}" install
+		popd > /dev/null || die
+	fi
+
+	einstalldocs
+	if use examples ; then
+		docinto examples
+		dodoc common/{config-example-local,config-example-ssh}
+	fi
+
+	python_optimize "${D}"
+}
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index 91c3e3acf41b..fc293b01096b 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,87 +1,72 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit python-single-r1 gnome2-utils git-r3
+inherit python-single-r1 git-r3 xdg
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
 EGIT_REPO_URI="https://github.com/bit-team/backintime/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt5"
+IUSE="examples qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	net-misc/openssh
-	net-misc/rsync[xattr,acl]"
+	net-misc/rsync[xattr,acl]
+"
 RDEPEND="${DEPEND}
-	qt5? ( dev-python/PyQt5 )"
+	qt5? ( dev-python/PyQt5[gui,widgets] )
+"
 
-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
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
 
 src_configure() {
-	cd "${S}"/common || die
-	./configure --python3 --no-fuse-group || die
+	pushd common > /dev/null || die
+		./configure --python3 --no-fuse-group || die
+	popd > /dev/null || die
 	if use qt5 ; then
-		cd "${S}"/qt || die
-		./configure --python3 || die
+		pushd qt > /dev/null || die
+			./configure --python3 || die
+		popd > /dev/null || die
 	fi
 }
 
 src_compile() {
-	cd "${S}"/common || die
-	emake
-	if use qt5 ; then
-		cd "${S}"/qt || die
+	pushd common > /dev/null || die
 		emake
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake
+		popd > /dev/null || die
 	fi
 }
 
 src_install() {
-	cd "${S}"/common || die
-	emake DESTDIR="${D}" install
-	if use qt5 ; then
-		cd "${S}"/qt || die
+	pushd common > /dev/null || die
 		emake DESTDIR="${D}" install
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake DESTDIR="${D}" install
+		popd > /dev/null || die
 	fi
 
-	python_optimize "${D}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	einstalldocs
+	if use examples ; then
+		docinto examples
+		dodoc common/{config-example-local,config-example-ssh}
+	fi
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	python_optimize "${D}"
 }
diff --git a/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
new file mode 100644
index 000000000000..4a2fd840fda9
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
@@ -0,0 +1,142 @@
+From 897f81aefa1dfcfb8c645375e0c4baeadd39c9c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Dec 2019 22:13:23 +0100
+Subject: [PATCH] No compress, no DOCS install, no examples install, fix
+ docbook path
+
+---
+ common/configure | 36 ++++--------------------------------
+ qt/configure     | 30 ++++++------------------------
+ 2 files changed, 10 insertions(+), 56 deletions(-)
+
+diff --git a/common/configure b/common/configure
+index 87cdc48..c1dd1af 100755
+--- a/common/configure
++++ b/common/configure
+@@ -166,7 +166,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\ttranslate compress\n\n" >> ${MAKEFILE}
++printf "build:\ttranslate\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -191,30 +191,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
+ addUninstallDir                "/share/backintime"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-common"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-common"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-common"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-common"
+-addInstallFile "../README.md"        "/share/doc/backintime-common"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-common"
+-addInstallFile "../VERSION"          "/share/doc/backintime-common"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-common"
+-addNewline
+-
+-addComment "config-examples"
+-addInstallDir                            "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-ssh.gz"   "/share/doc/backintime-common/examples"
+-addUninstallDir                          "/share/doc/backintime-common"
+-addUninstallDir                          "/share/doc"
+-addNewline
+-
+ addComment "man"
+ addInstallDir                                  "/share/man/man1"
+-addInstallFile "man/C/backintime.1.gz"         "/share/man/man1"
+-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-config.1.gz"  "/share/man/man1"
++addInstallFile "man/C/backintime.1"            "/share/man/man1"
++addInstallFile "man/C/backintime-askpass.1"    "/share/man/man1"
++addInstallFile "man/C/backintime-config.1"     "/share/man/man1"
+ addUninstallDir                                "/share/man"
+ addNewline
+ 
+@@ -238,15 +219,6 @@ addSymlink      "backintime"        "/share/bash-completion/completions/backinti
+ addUninstallDir                     "/share/bash-completion"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+-printf "\t#config-examples\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
+-
+ #translate
+ printf "translate:\t$mos\n\n" >> ${MAKEFILE}
+ 
+diff --git a/qt/configure b/qt/configure
+index 4b56b70..8bbdfcb 100755
+--- a/qt/configure
++++ b/qt/configure
+@@ -126,7 +126,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
++printf "build:\t\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -174,34 +174,21 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
+ addUninstallDir                                    "/share/polkit-1"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-qt"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-qt"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-qt"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-qt"
+-addInstallFile "../README.md"        "/share/doc/backintime-qt"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-qt"
+-addInstallFile "../VERSION"          "/share/doc/backintime-qt"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-qt"
+-addNewline
+-
+ addComment ".desktop"
+ addInstallDir               "/share/applications"
+ addInstallFiles "*.desktop" "/share/applications"
+ addNewline
+ 
+ addComment "docbook"
+-addInstallDir                          "/share/doc/qt/HTML/en/backintime"
+-addInstallFiles "docbook/en/*.docbook" "/share/doc/qt/HTML/en/backintime"
+-addUninstallDir                        "/share/doc/qt/HTML/en"
+-addUninstallDir                        "/share/doc/qt/HTML"
+-addUninstallDir                        "/share/doc/qt"
+-addUninstallDir                        "/share/doc"
++addInstallDir                          "/share/help/en/backintime"
++addInstallFiles "docbook/en/*.docbook" "/share/help/en/backintime"
++addUninstallDir                        "/share/help/en"
++addUninstallDir                        "/share/help"
+ addNewline
+ 
+ addComment "man"
+ addInstallDir    "/share/man/man1"
+-addInstallFile   "man/C/backintime-qt.1.gz" "/share/man/man1"
++addInstallFile   "man/C/backintime-qt.1"    "/share/man/man1"
+ addUninstallDir  "/share/man"
+ addNewline
+ 
+@@ -216,11 +203,6 @@ addUninstallDir                                             "/share/icons"
+ addUninstallDir                                             "/share"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+ #uninstall
+ printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
+ printf "uninstall_files:\n" >> ${MAKEFILE}
+-- 
+2.24.1
+