app-backup/backintime: Add fix for python3 --version on stderr (thanks Timo Ollech...

Package-Manager: portage-2.2.21

diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index 6f7c7847de6429a0c47aa8ef2061c93989b16002..8c3700b24c90c8b57b5de6ff2364de2a33663e5a 100644 (file)
--- a/app-backup/backintime/backintime-1.1.4.ebuild
+++ b/app-backup/backintime/backintime-1.1.4.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-python-version-stderr.patch
+
        #fix doc install location
        sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
                -i common/Makefile.template || die

diff --git a/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch b/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch
new file mode 100644 (file)
index 0000000..ffc0d9b
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.1.4-python-version-stderr.patch
@@ -0,0 +1,11 @@
+--- backintime-1.1.4/common/configure
++++ backintime-1.1.4/common/configure
+@@ -84,7 +84,7 @@
+ done
+ printf "\n" >> Makefile
+ 
+-if [ $(python${PYVERSION} --version | grep -c "^Python 3") -ne 1 ]; then
++if [ $(python${PYVERSION} --version 2>&1 | grep -c "^Python 3") -ne 1 ]; then
+     printf "Warning: Wrong Python version.\n"
+     printf "Please make sure Python 3.x is used by adding '--python' or '--python3'.\n"
+     exit 1