Revbump to fix python2 invocation and hard depend on ssh-agent (bug 482106, thanks Rob Tongue; bug 487764, thanks Jaime Martin). Depend on gksu iff USE=gnome (bug 476774, thanks Christian Strahl). Drop old version.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

7 files changed, 166 insertions, 105 deletions

diff --git a/app-backup/backintime/ChangeLog b/app-backup/backintime/ChangeLog
index d41bfd44dcca..cb235a69592c 100644
--- a/app-backup/backintime/ChangeLog
+++ b/app-backup/backintime/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-backup/backintime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.21 2014/08/15 22:32:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.22 2014/08/16 01:33:55 xmw Exp $
+
+*backintime-1.0.24-r2 (16 Aug 2014)
+*backintime-1.0.36-r1 (16 Aug 2014)
+
+  16 Aug 2014; Michael Weber <xmw@gentoo.org> +backintime-1.0.24-r2.ebuild,
+  +backintime-1.0.36-r1.ebuild, +files/backintime-1.0.24-wrapper.patch,
+  +files/backintime-1.0.36-wrapper.patch, -backintime-1.0.24-r1.ebuild,
+  -backintime-1.0.36.ebuild, -files/backintime-1.0.4-dont-install-license.diff,
+  -files/backintime-1.0.6-wrapper.patch:
+  Revbump to fix python2 invocation and hard depend on ssh-agent (bug 482106,
+  thanks Rob Tongue; bug 487764, thanks Jaime Martin). Depend on gksu iff
+  USE=gnome (bug 476774, thanks Christian Strahl). Drop old version.
 
 *backintime-1.0.36 (15 Aug 2014)
 
diff --git a/app-backup/backintime/backintime-1.0.24-r1.ebuild b/app-backup/backintime/backintime-1.0.24-r2.ebuild
index 84a0ac3398e7..3ccd8518b9cb 100644
--- a/app-backup/backintime/backintime-1.0.24-r1.ebuild
+++ b/app-backup/backintime/backintime-1.0.24-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.24-r1.ebuild,v 1.3 2014/08/15 22:32:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.24-r2.ebuild,v 1.1 2014/08/16 01:33:55 xmw Exp $
 
 EAPI=5
 
@@ -20,13 +20,14 @@ IUSE="kde gnome"
 RDEPEND="${PYTHON_DEPEND}
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/notify-python[${PYTHON_USEDEP}]
+	net-misc/openssh
 	net-misc/rsync[xattr,acl]
 	kde? (
 		>=kde-base/kdelibs-4
 		kde-base/pykde4[${PYTHON_USEDEP}]
 		kde-base/kompare
 		kde-base/kdesu
-		)
+	)
 	gnome? (
 		gnome-base/libglade
 		dev-util/meld
@@ -35,7 +36,8 @@ RDEPEND="${PYTHON_DEPEND}
 		dev-python/libgnome-python
 		dev-python/pygobject:2[${PYTHON_USEDEP}]
 		dev-python/pygtk[${PYTHON_USEDEP}]
-		)"
+		x11-libs/gksu
+	)"
 
 DEPEND="${RDEPEND}"
 
@@ -54,14 +56,14 @@ src_prepare() {
 	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
 		kde4/backintime-kde4-root.desktop || die
 
-	epatch "${FILESDIR}"/${PN}-1.0.6-wrapper.patch
-	sed -e "/ python /s:python:${PYTHON}:" \
-		-e "/^APP_PATH=/s:/usr:${EPREFIX}/usr:" \
-		-i common/backintime \
-		-i gnome/backintime-gnome \
-		-i kde4/backintime-kde4 || die
+	#bug 482106
+	epatch "${FILESDIR}"/${P}-wrapper.patch
+	sed -e "s:^python2 :${PYTHON} :" \
+		-e "s:APP_PATH=\"/usr:APP_PATH=\"${EPREFIX}/usr:" \
+		-i kde4/backintime-kde4 gnome/backintime-gnome \
+			common/backintime || die
 
-	backintime_variants="common $(usex gnome gnome "") $(usex kde kde4 '')"
+	backintime_variants="common $(usex gnome gnome '') $(usex kde kde4 '')"
 	backintime_run() {
 		local variant
 		for variant in ${backintime_variants} ; do
diff --git a/app-backup/backintime/backintime-1.0.36.ebuild b/app-backup/backintime/backintime-1.0.36-r1.ebuild
index ff8c598a292f..63dfc7d2bff3 100644
--- a/app-backup/backintime/backintime-1.0.36.ebuild
+++ b/app-backup/backintime/backintime-1.0.36-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.36.ebuild,v 1.1 2014/08/15 22:32:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.36-r1.ebuild,v 1.1 2014/08/16 01:33:55 xmw Exp $
 
 EAPI=5
 
@@ -20,13 +20,14 @@ IUSE="kde gnome"
 RDEPEND="${PYTHON_DEPEND}
 	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/notify-python[${PYTHON_USEDEP}]
+	net-misc/openssh
 	net-misc/rsync[xattr,acl]
 	kde? (
 		>=kde-base/kdelibs-4
 		kde-base/pykde4[${PYTHON_USEDEP}]
 		kde-base/kompare
 		kde-base/kdesu
-		)
+	)
 	gnome? (
 		gnome-base/libglade
 		dev-util/meld
@@ -35,7 +36,8 @@ RDEPEND="${PYTHON_DEPEND}
 		dev-python/libgnome-python
 		dev-python/pygobject:2[${PYTHON_USEDEP}]
 		dev-python/pygtk[${PYTHON_USEDEP}]
-		)"
+		x11-libs/gksu
+	)"
 
 DEPEND="${RDEPEND}"
 
@@ -53,14 +55,14 @@ src_prepare() {
 	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
 		kde4/backintime-kde4-root.desktop || die
 
-	epatch "${FILESDIR}"/${PN}-1.0.6-wrapper.patch
-	sed -e "/ python /s:python:${PYTHON}:" \
-		-e "/^APP_PATH=/s:/usr:${EPREFIX}/usr:" \
-		-i common/backintime \
-		-i gnome/backintime-gnome \
-		-i kde4/backintime-kde4 || die
+	#bug 482106
+	epatch "${FILESDIR}"/${P}-wrapper.patch
+	sed -e "s:^python2 :${PYTHON} :" \
+		-e "s:APP_PATH=\"/usr:APP_PATH=\"${EPREFIX}/usr:" \
+		-i kde4/backintime-kde4 gnome/backintime-gnome \
+			common/backintime || die
 
-	backintime_variants="common $(usex gnome gnome "") $(usex kde kde4 '')"
+	backintime_variants="common $(usex gnome gnome '') $(usex kde kde4 '')"
 	backintime_run() {
 		local variant
 		for variant in ${backintime_variants} ; do
diff --git a/app-backup/backintime/files/backintime-1.0.24-wrapper.patch b/app-backup/backintime/files/backintime-1.0.24-wrapper.patch
new file mode 100644
index 000000000000..fa65098fff85
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.0.24-wrapper.patch
@@ -0,0 +1,64 @@
+--- backintime-1.0.24-r2/common/backintime
++++ backintime-1.0.24-r2/common/backintime
+@@ -17,15 +17,14 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f backintime.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/common"
+-fi
++APP_PATH="/usr/share/backintime/common"
+ 
+ #starting a new ssh-agent all the time is just a workaround for
+ #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
+ #normally this should only be necessary if run as cronjob
+ #and the user is not logged in
+-ssh-agent python $APP_PATH/backintime.py "$@"
++if [ "x$SSH_AUTH_SOCK" = "x" ]; then
++	eval "$(ssh-agent)"
++fi
+ 
++python2 $APP_PATH/backintime.py "$@"
+--- backintime-1.0.24-r2/gnome/backintime-gnome
++++ backintime-1.0.24-r2/gnome/backintime-gnome
+@@ -17,14 +17,13 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f app.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/gnome"
+-fi
++APP_PATH="/usr/share/backintime/gnome"
+ 
+ #starting a new ssh-agent all the time is just a workaround for
+ #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
+ #normally we don't need to start ssh-agent for backintime-gnome
+-ssh-agent python ${APP_PATH}/app.py "$@"
++if [ "x$SSH_AUTH_SOCK" = "x" ]; then
++	eval "$(ssh-agent)"
++fi
+ 
++python2 ${APP_PATH}/app.py "$@"
+--- backintime-1.0.24-r2/kde4/backintime-kde4
++++ backintime-1.0.24-r2/kde4/backintime-kde4
+@@ -17,11 +17,10 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f app.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/kde4"
++APP_PATH="/usr/share/backintime/kde4"
++#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
++if [ "x$SSH_AUTH_SOCK" = "x" ]; then
++	eval "$(ssh-agent)"
+ fi
+ 
+-python ${APP_PATH}/app.py "$@"
+-
++python2 ${APP_PATH}/app.py "$@"
diff --git a/app-backup/backintime/files/backintime-1.0.36-wrapper.patch b/app-backup/backintime/files/backintime-1.0.36-wrapper.patch
new file mode 100644
index 000000000000..a0b01245fe1f
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.0.36-wrapper.patch
@@ -0,0 +1,65 @@
+--- backintime-1.0.24-r2/common/backintime
++++ backintime-1.0.24-r2/common/backintime
+@@ -17,15 +17,14 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f backintime.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/common"
+-fi
++APP_PATH="/usr/share/backintime/common"
+ 
+ #starting a new ssh-agent all the time is just a workaround for
+ #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
+ #normally this should only be necessary if run as cronjob
+ #and the user is not logged in
+-ssh-agent python $APP_PATH/backintime.py "$@"
++if [ "x$SSH_AUTH_SOCK" = "x" ]; then
++	eval "$(ssh-agent)"
++fi
+ 
++python2 $APP_PATH/backintime.py "$@"
+--- backintime-1.0.24-r2/gnome/backintime-gnome
++++ backintime-1.0.24-r2/gnome/backintime-gnome
+@@ -17,14 +17,13 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f app.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/gnome"
+-fi
++APP_PATH="/usr/share/backintime/gnome"
+ 
+ #starting a new ssh-agent all the time is just a workaround for
+ #https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
+ #normally we don't need to start ssh-agent for backintime-gnome
+-ssh-agent python ${APP_PATH}/app.py "$@"
++if [ "x$SSH_AUTH_SOCK" = "x" ]; then
++	eval "$(ssh-agent)"
++fi
+ 
++python2 ${APP_PATH}/app.py "$@"
+--- backintime-1.0.24-r2/kde4/backintime-kde4
++++ backintime-1.0.24-r2/kde4/backintime-kde4
+@@ -17,15 +17,10 @@
+ #    with this program; if not, write to the Free Software Foundation, Inc.,
+ #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+-if [ -f app.py ]; then
+-	APP_PATH="."
+-else
+-	APP_PATH="/usr/share/backintime/kde4"
+-fi
++APP_PATH="/usr/share/backintime/kde4"
+ 
+ if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+         eval "$(ssh-agent)"
+ fi
+ 
+-python ${APP_PATH}/app.py "$@"
+-
++python2 ${APP_PATH}/app.py "$@"
diff --git a/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff b/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
deleted file mode 100644
index 69a612bd4c70..000000000000
--- a/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- backintime-1.0.4.orig/common/Makefile.template	2010-07-04 14:30:19.000000000 +0200
-+++ backintime-1.0.4/common/Makefile.template	2010-11-01 09:50:43.000000000 +0100
-@@ -17,10 +17,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-common
--	install --mode=644 debian_specific/copyright $(DEST)/share/doc/backintime-common
--	
- 	#install doc file(s)
- 	install -d $(DEST)/share/doc/backintime
- 	install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime
---- backintime-1.0.4.orig/gnome/Makefile.template	2010-07-18 10:25:58.000000000 +0200
-+++ backintime-1.0.4/gnome/Makefile.template	2010-11-01 09:50:42.000000000 +0100
-@@ -15,10 +15,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 plugins/*.py $(DEST)/share/backintime/plugins
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-gnome
--	install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-gnome
--	
- 	#install man file(s)
- 	install -d $(DEST)/share/man/man1
- 	install --mode=644 man/C/*.gz $(DEST)/share/man/man1
---- backintime-1.0.4.orig/kde4/Makefile.template	2010-07-18 10:26:09.000000000 +0200
-+++ backintime-1.0.4/kde4/Makefile.template	2010-11-01 09:50:41.000000000 +0100
-@@ -19,10 +19,6 @@
- 	install -d $(DEST)/bin
- 	install backintime-kde4 $(DEST)/bin
- 	
--	#install copyright file
--	install -d $(DEST)/share/doc/backintime-kde4
--	install --mode=644 ../common/debian_specific/copyright $(DEST)/share/doc/backintime-kde4
--	
- 	#install .desktop file(s)
- 	install -d $(DEST)/share/applications/kde4
- 	install --mode=644 *.desktop $(DEST)/share/applications/kde4
diff --git a/app-backup/backintime/files/backintime-1.0.6-wrapper.patch b/app-backup/backintime/files/backintime-1.0.6-wrapper.patch
deleted file mode 100644
index ff4283e270ef..000000000000
--- a/app-backup/backintime/files/backintime-1.0.6-wrapper.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- backintime-1.0.8/common/backintime
-+++ backintime-1.0.8/common/backintime
-@@ -17,11 +17,7 @@ 
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f backintime.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/common"
--fi
-+APP_PATH="/usr/share/backintime/common"
- 
- python ${APP_PATH}/backintime.py "$@"
- 
---- backintime-1.0.8/gnome/backintime-gnome
-+++ backintime-1.0.8/gnome/backintime-gnome
-@@ -17,11 +17,7 @@ 
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/gnome"
--fi
-+APP_PATH="/usr/share/backintime/gnome"
- 
- python ${APP_PATH}/app.py "$@"
- 
---- backintime-1.0.8/kde4/backintime-kde4
-+++ backintime-1.0.8/kde4/backintime-kde4
-@@ -17,11 +17,7 @@ 
- #    with this program; if not, write to the Free Software Foundation, Inc.,
- #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--if [ -f app.py ]; then
--	APP_PATH="."
--else
--	APP_PATH="/usr/share/backintime/kde4"
--fi
-+APP_PATH="/usr/share/backintime/kde4"
- 
- python ${APP_PATH}/app.py "$@"
-