version bump - fix dep to split gnome python deps (#352910) - remove old

(Portage version: 2.2.0_alpha19/cvs/Linux i686)

4 files changed, 25 insertions, 79 deletions

diff --git a/app-backup/backintime/ChangeLog b/app-backup/backintime/ChangeLog
index e75bec7abc18..92ea070d1281 100644
--- a/app-backup/backintime/ChangeLog
+++ b/app-backup/backintime/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-backup/backintime
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.8 2010/11/08 13:58:34 bangert Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.9 2011/02/01 11:03:35 bangert Exp $
+
+  01 Feb 2011; Thilo Bangert <bangert@gentoo.org> -backintime-0.9.26-r2.ebuild,
+  -files/backintime-0.9.26-dont-install-license.diff,
+  -files/backintime-0.9.26-information-disclosure.diff:
+  remove old
+
+*backintime-1.0.6 (01 Feb 2011)
+
+  01 Feb 2011; Thilo Bangert <bangert@gentoo.org> +backintime-1.0.6.ebuild:
+  version bump - fix dep to split gnome python deps (#352910)
 
 *backintime-1.0.4 (08 Nov 2010)
 
diff --git a/app-backup/backintime/backintime-0.9.26-r2.ebuild b/app-backup/backintime/backintime-1.0.6.ebuild
index b43135cbdd73..96bd26dd5919 100644
--- a/app-backup/backintime/backintime-0.9.26-r2.ebuild
+++ b/app-backup/backintime/backintime-1.0.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-0.9.26-r2.ebuild,v 1.2 2010/02/17 19:35:48 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.6.ebuild,v 1.1 2011/02/01 11:03:35 bangert Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils
 
 DESCRIPTION="A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
 HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://backintime.le-web.org/download/backintime/${P}_src.tar.gz"
+SRC_URI="http://backintime.le-web.org/download/${PN}/${P}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,9 +25,12 @@ DEPEND="dev-lang/python
 		)
 	gnome? (
 		gnome-base/libglade
+		dev-util/meld
 		gnome-base/gnome-session
 		dev-python/gnome-vfs-python
-		dev-python/gnome-python
+		dev-python/libgnome-python
+		dev-python/pygobject
+		dev-python/pygtk
 		)
 	dev-python/notify-python
 	"
@@ -35,11 +38,14 @@ DEPEND="dev-lang/python
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/backintime-0.9.26-information-disclosure.diff
-	epatch "${FILESDIR}"/backintime-0.9.26-dont-install-license.diff
+	epatch "${FILESDIR}"/${PN}-1.0.4-dont-install-license.diff
+	epatch "${FILESDIR}"/${PN}-1.0.4-fix-configure-warning.diff
 	#fix doc install location
 	sed -i "s:/doc/kde4/HTML/:/doc/HTML/:g" kde4/Makefile.template
 	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template
+
+	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
+		"${S}"/kde4/backintime-kde4-root.desktop
 }
 
 src_configure() {
@@ -79,9 +85,6 @@ src_install() {
 	if use kde ; then
 		cd "${S}"/kde4
 		emake DESTDIR="${D}" install || die
-		#use kdesu instead of kdesudo
-		sed -i 's/kdesudo/kdesu/' \
-			"${D}"//usr/share/applications/kde4/backintime-kde4-root.desktop
 	fi
 
 	if use gnome ; then
diff --git a/app-backup/backintime/files/backintime-0.9.26-dont-install-license.diff b/app-backup/backintime/files/backintime-0.9.26-dont-install-license.diff
deleted file mode 100644
index 47bccd561f17..000000000000
--- a/app-backup/backintime/files/backintime-0.9.26-dont-install-license.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur backintime-0.9.26.orig/common/Makefile.template backintime-0.9.26/common/Makefile.template
---- backintime-0.9.26.orig/common/Makefile.template	2010-01-13 09:34:18.000000000 +0100
-+++ backintime-0.9.26/common/Makefile.template	2010-01-13 09:34:35.000000000 +0100
-@@ -17,10 +17,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 ../plugins/usercallbackplugin.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
-diff -Naur backintime-0.9.26.orig/gnome/Makefile.template backintime-0.9.26/gnome/Makefile.template
---- backintime-0.9.26.orig/gnome/Makefile.template	2010-01-13 09:34:17.000000000 +0100
-+++ backintime-0.9.26/gnome/Makefile.template	2010-01-13 09:34:46.000000000 +0100
-@@ -15,10 +15,6 @@
- 	install -d $(DEST)/share/backintime/plugins
- 	install --mode=644 ../plugins/gnome*.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
-diff -Naur backintime-0.9.26.orig/kde4/Makefile.template backintime-0.9.26/kde4/Makefile.template
---- backintime-0.9.26.orig/kde4/Makefile.template	2010-01-13 09:34:18.000000000 +0100
-+++ backintime-0.9.26/kde4/Makefile.template	2010-01-13 09:35:08.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-0.9.26-information-disclosure.diff b/app-backup/backintime/files/backintime-0.9.26-information-disclosure.diff
deleted file mode 100644
index 2e79d94cb0ab..000000000000
--- a/app-backup/backintime/files/backintime-0.9.26-information-disclosure.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch for bug 289047, taken from Fedora's backintime-0.9.26-3.fc10.src.rpm.
-
-diff -Naur backintime-0.9.26.orig/common/snapshots.py backintime-0.9.26/common/snapshots.py
---- backintime-0.9.26.orig/common/snapshots.py	2009-05-18 10:24:21.000000000 +0200
-+++ backintime-0.9.26/common/snapshots.py	2009-09-02 21:17:30.000000000 +0200
-@@ -314,7 +314,7 @@
- 			return
- 
- 		path = self.get_snapshot_path( snapshot_id )
--		cmd = "chmod -R a+rwx \"%s\"" %  path
-+		cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path
- 		self._execute( cmd )
- 		cmd = "rm -rfv \"%s\"" % path
- 		self._execute( cmd )
-@@ -574,8 +574,8 @@
- 		new_snapshot_path = self.get_snapshot_path( new_snapshot_id )
- 
- 		if os.path.exists( new_snapshot_path ):
--			#self._execute( "find \"%s\" -type d -exec chmod +w {} \;" % new_snapshot_path )
--			self._execute( "chmod -R a+rwx \"%s\"" %  new_snapshot_path )
-+			self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % new_snapshot_path )
-+			#self._execute( "chmod -R a+rwx \"%s\"" %  new_snapshot_path )
- 			self._execute( "rm -rf \"%s\"" % new_snapshot_path )
- 		
- 			if os.path.exists( new_snapshot_path ):