[gentoo-commits] repo/gentoo:master commit in: app-backup/backintime/files/, app-backup/backintime/

["Michael Weber" <xmw@gentoo.org>]

commit:     197ebb9c0e8534a992c2dc06490cfef915aec386
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 09:19:00 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 09:19:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197ebb9c

app-backup/backintime: Add fix for python3 --version on stderr (thanks Timo Ollech and Fabian Kislat, bug 551780).

Package-Manager: portage-2.2.21

 app-backup/backintime/backintime-1.1.4.ebuild                 |  2 ++
 .../files/backintime-1.1.4-python-version-stderr.patch        | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index 6f7c784..8c3700b 100644
--- 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
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