gentoo auto-resync : 04:06:2024 - 00:07:50

6 files changed, 250 insertions, 93 deletions

diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 0be6bc87e368..f2b999c4750c 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,7 +1,8 @@
 AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
-DIST backintime-1.3.2.tar.gz 714459 BLAKE2B cc53bd5391155705016248511e30cdfa7bc25f0a7cb170dfeeffda397e8be1b22f8e335063289d8c192f94c469430655064899ac8059f22f3b7582e3af87d373 SHA512 19f756d03cc7533e02bb5172ae3f8c167206bf5e8d60c0f3af1f647e01297a4eeb7889bbb5b58e46636bc31392ee436249b276ddbfa41697a0538c542fa26cb8
+AUX backintime-1.4.3-no-compress-docs-examples.patch 5177 BLAKE2B 333ccfd9226bd041491692f27954ec02bcba20b56123864043e0faecf6367c54befbccf24616e14a110b6dda04dd07ec745efeac1d03e738d79559e6543dd51d SHA512 5f62c58d38ea5aace125b41d57501847a3fe82a2bf35630f92ca393fbab459f207e7e3530901e330da4c28642f44608620372620a21328316e7fd89baa5b710c
 DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372
-EBUILD backintime-1.3.2-r1.ebuild 1649 BLAKE2B 83cd3d47ff4f883572a53f1d992af017cf667cf954a2bd61fa9cd28cef119a73914fb5cd95e4c0bf666c3c0ca17e68ab1833a9ee62e088e67843f13341e49596 SHA512 8fa7105e1b463bf7906d1abf4cc01f11e4627feb00863f2a0b014a07f201b47fb0529f44abbe86fc2002602f705c682fd138e3bb73aafb976da1c4ae5b59a723
-EBUILD backintime-1.3.3-r1.ebuild 2143 BLAKE2B 02ed6e417c47f4d9647619e6084f8929aa49180c1ed9c7d93aac901204e94f40af5ec7d1eb5e6fc0fc31cfe108379bf0622d8d4f652b1c093f313ae0d92ad218 SHA512 1d9eba26e5427b8f435b0579d6aed448e0fc41765a5bdfe7e0fe61dede3042ac24c511347ec312becd6fc6e731d74b6084723700ff3f83e03ab1ad0e38f1b3a4
-EBUILD backintime-9999.ebuild 2145 BLAKE2B 5602e13cf464cfa428e6013c538cd7f54999f85883246f2ed5fdfe3af47112c93d01238d8fa249f8e44d9cf0a6c1a1f361e170a4831d2e44bc9e757dfccf7709 SHA512 c4d8b03bc2a2d246174285984d6e93dfe940334f600807c9c20d2fb81e01fc3294043fb367c91544ee7d1bdc38fa15015fbe5ae1b727aa8d23caa55902f1aead
+DIST backintime-1.4.3.tar.gz 1900866 BLAKE2B ee9f389a7995e0ca059dab7f94ce59b2a0285bc213ffa2fcdc2d3ed2b9920762c16beb0c2d961ac922837c55fa30e1ce27a9de26c6ad0e879f5c70e876644298 SHA512 d5470590d9807c5f4c1c6f46062465ecac9432831f15d1948a95b3f7ba06015939eb292bbb53d2f039ef9e967a93b6bea0e08b928a009370995d0cc2db1f7fdf
+EBUILD backintime-1.3.3-r1.ebuild 2143 BLAKE2B ed7bbbd80c7934977ae5db2a90d803660561d9bf1a9f30609ca0ec386e690a729f11d4faf350222a3cc7094097cf131fffb887b3c0c450926b2e167840494804 SHA512 648987a53be2b53891c35fdc3a6708feebd128d30273638f5fdd9617aebd55e9f38706a9806abfd8ddc7f490f23d25a60ac65a154adc0fa88ff5bf7081b8c660
+EBUILD backintime-1.4.3-r1.ebuild 2341 BLAKE2B 976b27c75a7c7cde84607e945d600058af3060206f922f7fde428c363c265d062dc151770c377393f3de9617cb35298cd93fcf967988280c9911957a5e041737 SHA512 2da5efe66d6c824dca51716e2327133cb6bf1b892e1b16299275b1f413592a7b9f8a786107f50188fb6ac2b42b81aa55ece716c80e2bae7a95b1099a8ea0e514
+EBUILD backintime-9999.ebuild 2341 BLAKE2B d8dcd3d276d2f553049f9c206572d33ca7995db6362abad233ba9de2a2e714e8b1d1b1be3a9a39ab69ac4fae43232123e354ca8ceacfda0f7a34dbd2831b1134 SHA512 597e6b1bdcfad7452722aace771c923ccd7c37137552b2aec0582509b0445b9cbe922de0b1cafdf6d3c71349cf3cbacd6d4a1e0665e826749519910d286dc134
 MISC metadata.xml 749 BLAKE2B f8741c8434d71df70c6ad9859318c935343315f1da5d98f5635d7b85cf7235018661765da5f76e0b740c1969e3602f5fdf55a19590c42c76f25a65ba97f8420f SHA512 c956b979a350711b7ff5e880b26dd424f25c80284ddc9e79b683e88ce049a479827a4949537c60c09b32ff386280b436b23f5af7bb5e0162ba965121b1640db6
diff --git a/app-backup/backintime/backintime-1.3.2-r1.ebuild b/app-backup/backintime/backintime-1.3.2-r1.ebuild
deleted file mode 100644
index 6eb50a6b1a7d..000000000000
--- a/app-backup/backintime/backintime-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
-	virtual/openssh
-	net-misc/rsync[xattr,acl]
-	qt5? ( dev-python/PyQt5[gui,widgets] )"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
-
-src_configure() {
-	pushd common > /dev/null || die
-	# Not autotools
-	./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-1.3.3-r1.ebuild b/app-backup/backintime/backintime-1.3.3-r1.ebuild
index 4168adaf8d16..1c12af8e9f54 100644
--- a/app-backup/backintime/backintime-1.3.3-r1.ebuild
+++ b/app-backup/backintime/backintime-1.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit python-single-r1 xdg
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
diff --git a/app-backup/backintime/backintime-1.4.3-r1.ebuild b/app-backup/backintime/backintime-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..9ab4a9338527
--- /dev/null
+++ b/app-backup/backintime/backintime-1.4.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/bit-team/backintime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples gui test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	virtual/openssh
+	net-misc/rsync[xattr,acl]
+	gui? ( dev-python/PyQt5[gui,widgets] )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.3-no-compress-docs-examples.patch"
+)
+
+src_prepare() {
+	default
+
+	# Looks at host system too much, so too flaky
+	rm common/test/test_tools.py || die
+	# Fails with dbus/udev issue (likely sandbox)
+	rm common/test/test_snapshots.py || die
+}
+
+src_configure() {
+	# TODO: Review https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#dependencies
+	# for deps (some may be optfeatures).
+	pushd common > /dev/null || die
+	# Not autotools
+	./configure --python="${PYTHON}" --no-fuse-group || die
+	popd > /dev/null || die
+
+	if use gui ; then
+		pushd qt > /dev/null || die
+		./configure --python="${PYTHON}" || die
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -C common
+
+	if use gui ; then
+		emake -C qt
+	fi
+}
+
+src_test() {
+	# pytest should work but it can't find the backintime binary, so
+	# use the unittest-based runner instead.
+	# https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#how-to-contribute-to-back-in-time
+	emake -C common test-v
+}
+
+src_install() {
+	emake -C common DESTDIR="${D}" install
+
+	if use gui ; then
+		emake -C qt DESTDIR="${D}" install
+	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 70b61fb635db..c59ba0236bf8 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit python-single-r1 xdg
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="examples qt5 test"
+IUSE="examples gui test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -29,13 +29,14 @@ DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="
 	${DEPEND}
 	virtual/openssh
 	net-misc/rsync[xattr,acl]
-	qt5? ( dev-python/PyQt5[gui,widgets] )
+	gui? ( dev-python/PyQt6[gui,widgets] )
 "
 BDEPEND="
 	sys-devel/gettext
@@ -46,7 +47,9 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.3-no-compress-docs-examples.patch"
+)
 
 src_prepare() {
 	default
@@ -58,14 +61,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: Review https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#dependencies
+	# for deps (some may be optfeatures).
 	pushd common > /dev/null || die
 	# Not autotools
-	./configure --python3 --no-fuse-group || die
+	./configure --python="${PYTHON}" --no-fuse-group || die
 	popd > /dev/null || die
 
-	if use qt5 ; then
+	if use gui ; then
 		pushd qt > /dev/null || die
-		./configure --python3 || die
+		./configure --python="${PYTHON}" || die
 		popd > /dev/null || die
 	fi
 }
@@ -73,7 +78,7 @@ src_configure() {
 src_compile() {
 	emake -C common
 
-	if use qt5 ; then
+	if use gui ; then
 		emake -C qt
 	fi
 }
@@ -88,7 +93,7 @@ src_test() {
 src_install() {
 	emake -C common DESTDIR="${D}" install
 
-	if use qt5 ; then
+	if use gui ; then
 		emake -C qt DESTDIR="${D}" install
 	fi
 
diff --git a/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
new file mode 100644
index 000000000000..9844f349b85e
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.4.3-no-compress-docs-examples.patch
@@ -0,0 +1,120 @@
+--- a/common/configure
++++ b/common/configure
+@@ -161,7 +161,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}
+@@ -189,30 +189,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
+ 
+@@ -236,16 +217,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}
+ 
+ for lang in $langs; do
+--- a/qt/configure
++++ b/qt/configure
+@@ -138,7 +138,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
++printf "build:\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -149,7 +149,6 @@ printf "install:\n" >> ${MAKEFILE}
+ 
+ # Migration
+ printf "\t#clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
+-printf "\trm -f /etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
+ printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
+ addNewline
+ 
+@@ -193,17 +192,6 @@ 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"
+@@ -211,7 +199,7 @@ 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
+ 
+@@ -226,11 +214,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}