3 files changed, 154 insertions, 22 deletions
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 46605ab24558..f2606bc54ff3 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,5 +1,7 @@
 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
+DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372
 EBUILD backintime-1.3.2.ebuild 1650 BLAKE2B 99c648b6116cb7dd1996c89f998c8edd3a675b5fb19fd37cdf83eabb2727d10c576a8c06836218d0a4496e69b28d7ac2f9d51c8c544ae5548a4db18cd945b678 SHA512 8e4bfdbcaf1d247a108f294113d21637e1708087a2969a15931ccc558a1f53a145e111a99e7c64bb9ab49d61b262cffaffa25933ba3d0de7533e539990150b68
-EBUILD backintime-9999.ebuild 1611 BLAKE2B 870d8b86f961070cb471b90e8033e01b1cd4957c5992c10ea5e17aeb6c8cef50d65e798030a26fc5640ce896326f79e48d62b890225fbba619a5bd4386e96570 SHA512 1a0318a847d8983d69dd7666ae08ce9ebf3669c6f8fd147510d683428ce6ef15404cd89fce36d5a81df86cb77ae521a7611418049610513bcabd9df7640c95ea
+EBUILD backintime-1.3.3.ebuild 2146 BLAKE2B 4cdc60cf1aff6f2a80e349826ac5601e76f7ca7a45001cbd1108d596fb2df57ba6b9d77d3b57e09b694fd276257cbc44e7b85e1d5599a681e467846aba65a43b SHA512 0ecae2dd6c79292443caec07f53938dbde56ea3771af05478bfc08e7a7e7e3dc3d076e452da6bfe97dbc1f73ff559b1fc7b4d7bd60eef251196a013bc7b1d1ba
+EBUILD backintime-9999.ebuild 2146 BLAKE2B 4cdc60cf1aff6f2a80e349826ac5601e76f7ca7a45001cbd1108d596fb2df57ba6b9d77d3b57e09b694fd276257cbc44e7b85e1d5599a681e467846aba65a43b SHA512 0ecae2dd6c79292443caec07f53938dbde56ea3771af05478bfc08e7a7e7e3dc3d076e452da6bfe97dbc1f73ff559b1fc7b4d7bd60eef251196a013bc7b1d1ba
 MISC metadata.xml 749 BLAKE2B f8741c8434d71df70c6ad9859318c935343315f1da5d98f5635d7b85cf7235018661765da5f76e0b740c1969e3602f5fdf55a19590c42c76f25a65ba97f8420f SHA512 c956b979a350711b7ff5e880b26dd424f25c80284ddc9e79b683e88ce049a479827a4949537c60c09b32ff386280b436b23f5af7bb5e0162ba965121b1640db6
diff --git a/app-backup/backintime/backintime-1.3.3.ebuild b/app-backup/backintime/backintime-1.3.3.ebuild
new file mode 100644
index 000000000000..f5d3483dd04a
--- /dev/null
+++ b/app-backup/backintime/backintime-1.3.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+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 qt5 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}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]
+	qt5? ( dev-python/PyQt5[gui,widgets] )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.1-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() {
+	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() {
+	emake -C common
+
+	if use qt5 ; 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 qt5 ; 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 a95837877012..f5d3483dd04a 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -3,32 +3,60 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-r1 git-r3 xdg
+PYTHON_COMPAT=( python3_{10..11} )
+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/"
-EGIT_REPO_URI="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 qt5"
+IUSE="examples qt5 test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+DEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/keyring[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
+	')
+"
+RDEPEND="
+	${DEPEND}
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
-	qt5? ( dev-python/PyQt5[gui,widgets] )"
-BDEPEND="sys-devel/gettext"
+	qt5? ( dev-python/PyQt5[gui,widgets] )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+		')
+	)
+"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.1-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() {
 	pushd common > /dev/null || die
 	# Not autotools
@@ -43,26 +71,25 @@ src_configure() {
 }
 
 src_compile() {
-	pushd common > /dev/null || die
-	emake
-	popd > /dev/null || die
+	emake -C common
 
 	if use qt5 ; then
-		pushd qt > /dev/null || die
-		emake
-		popd > /dev/null || die
+		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() {
-	pushd common > /dev/null || die
-	emake DESTDIR="${D}" install
-	popd > /dev/null || die
+	emake -C common DESTDIR="${D}" install
 
 	if use qt5 ; then
-		pushd qt > /dev/null || die
-		emake DESTDIR="${D}" install
-		popd > /dev/null || die
+		emake -C qt DESTDIR="${D}" install
 	fi
 
 	einstalldocs