version bump (#343665)

(Portage version: 2.2_rc99/cvs/Linux i686)

5 files changed, 168 insertions, 1 deletions

diff --git a/app-backup/backintime/ChangeLog b/app-backup/backintime/ChangeLog
index b416ee008ee2..e75bec7abc18 100644
--- a/app-backup/backintime/ChangeLog
+++ b/app-backup/backintime/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2010/02/17 19:35:48 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/ChangeLog,v 1.8 2010/11/08 13:58:34 bangert Exp $
+
+*backintime-1.0.4 (08 Nov 2010)
+
+  08 Nov 2010; Thilo Bangert <bangert@gentoo.org> +backintime-1.0.4.ebuild,
+  +files/backintime-1.0.4-dont-install-license.diff,
+  +files/backintime-1.0.4-fix-configure-warning.diff,
+  +files/backintime-1.0.4-kde4-root.desktop:
+  version bump (#343665)
 
   17 Feb 2010; Thilo Bangert <bangert@gentoo.org>
   backintime-0.9.26-r2.ebuild:
diff --git a/app-backup/backintime/backintime-1.0.4.ebuild b/app-backup/backintime/backintime-1.0.4.ebuild
new file mode 100644
index 000000000000..6eeee499ec5a
--- /dev/null
+++ b/app-backup/backintime/backintime-1.0.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.4.ebuild,v 1.1 2010/11/08 13:58:34 bangert Exp $
+
+EAPI="2"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde gnome"
+
+DEPEND="dev-lang/python
+	net-misc/rsync[xattr,acl]
+	kde? (
+		>=kde-base/kdelibs-4
+		kde-base/pykde4
+		kde-base/kompare
+		kde-base/kdesu
+		)
+	gnome? (
+		gnome-base/libglade
+		dev-util/meld
+		gnome-base/gnome-session
+		dev-python/gnome-vfs-python
+		dev-python/gnome-python
+		)
+	dev-python/notify-python
+	"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/backintime-1.0.4-dont-install-license.diff
+	epatch "${FILESDIR}"/backintime-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() {
+	cd "${S}"/common
+	econf
+
+	if use kde ; then
+		cd "${S}"/kde4
+		econf
+	fi
+
+	if use gnome ; then
+		cd "${S}"/gnome
+		econf
+	fi
+}
+
+src_compile() {
+	cd "${S}"/common
+	emake
+
+	if use kde ; then
+		cd "${S}"/kde4
+		emake
+	fi
+
+	if use gnome ; then
+		cd "${S}"/gnome
+		emake
+	fi
+}
+
+src_install() {
+	cd "${S}"/common
+	emake DESTDIR="${D}" install || die
+
+	if use kde ; then
+		cd "${S}"/kde4
+		emake DESTDIR="${D}" install || die
+	fi
+
+	if use gnome ; then
+		cd "${S}"/gnome
+		emake DESTDIR="${D}" install || die
+	fi
+}
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
new file mode 100644
index 000000000000..69a612bd4c70
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff
@@ -0,0 +1,39 @@
+--- 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.4-fix-configure-warning.diff b/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff
new file mode 100644
index 000000000000..40831b400f7a
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.0.4-fix-configure-warning.diff
@@ -0,0 +1,17 @@
+diff -Naur backintime-1.0.4.orig/kde4/configure backintime-1.0.4/kde4/configure
+--- backintime-1.0.4.orig/kde4/configure	2010-11-08 14:36:52.000000000 +0100
++++ backintime-1.0.4/kde4/configure	2010-11-08 14:42:18.000000000 +0100
+@@ -16,13 +16,6 @@
+ 	fi
+ fi
+ 
+-#check for kdesudo (if not use kdesu)
+-if [ -z `which kdesudo` ]; then
+-	mv backintime-kde4-root.desktop.kdesudo backintime-kde4-root.desktop
+-else
+-	mv backintime-kde4-root.desktop.kdesu backintime-kde4-root.desktop
+-fi
+-
+ cp Makefile.template Makefile
+ 
+ echo "All OK. Now run:"
diff --git a/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop b/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop
new file mode 100644
index 000000000000..54d340efcd46
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.0.4-kde4-root.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Back In Time (root)
+Exec=kdesu -c backintime-kde4
+Icon=document-save
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+StartupNotify=true
+Categories=Qt;KDE;System;
+Comment=Simple backup system
+Comment[sl]=Enostaven sistem ustvarjanja varnostnih kopij