--- /usr/portage/app-backup/backintime/backintime-1.0.24-r1.ebuild	2013-07-28 10:31:01.000000000 +0200
+++ /usr/portage/app-backup/backintime/backintime-1.0.24-r1.ebuild	2013-12-05 22:45:30.000000000 +0100
@@ -44,7 +44,7 @@ 
 S=${WORKDIR}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-install-license.patch
+	epatch "${FILESDIR}"/${PN}-dont-install-license.patch
 	epatch "${FILESDIR}"/${PN}-1.0.4-fix-configure-warning.diff
 
 	#fix doc install location
--- /usr/portage/app-backup/backintime/backintime-1.0.28.ebuild	1970-01-01 01:00:00.000000000 +0100
+++ /usr/portage/app-backup/backintime/backintime-1.0.28.ebuild	2013-12-05 23:04:09.000000000 +0100
@@ -0,0 +1,95 @@ 
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-single-r1
+
+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://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde gnome"
+
+RDEPEND="${PYTHON_DEPEND}
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	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
+		gnome-base/gnome-session
+		dev-python/gnome-vfs-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		)"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-dont-install-license.patch
+	#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 || die
+	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template || die
+
+	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
+
+	backintime_variants="common $(usex gnome gnome "") $(usex kde kde4 '')"
+	backintime_run() {
+		local variant
+		for variant in ${backintime_variants} ; do
+			einfo "$variant: run \"$@\""
+			pushd "${S}"/${variant} || die
+			"${@}" || die
+			popd
+		done
+	}
+	if [ -n ${LINGUAS+x} ] ; then
+		cd common/po || die
+		for po in *.po ; do
+			if ! has ${po/.po} ${LINGUAS} ; then
+				rm ${po} || die
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	backintime_run econf
+}
+
+src_compile() {
+	backintime_run emake
+}
+
+src_install() {
+	backintime_run emake DESTDIR="${D}" install
+	python_optimize "${D}"
+}
--- /usr/portage/app-backup/backintime/backintime-1.0.8-r1.ebuild	2011-11-11 00:53:47.000000000 +0100
+++ /usr/portage/app-backup/backintime/backintime-1.0.8-r1.ebuild	2013-12-05 22:45:12.000000000 +0100
@@ -43,7 +43,7 @@ 
 	python_pkg_setup
 }
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.4-dont-install-license.diff
+	epatch "${FILESDIR}"/${PN}-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 || die
--- /usr/portage/app-backup/backintime/backintime-488350.patch	1970-01-01 01:00:00.000000000 +0100
+++ /usr/portage/app-backup/backintime/backintime-488350.patch	2013-12-05 23:06:18.000000000 +0100
@@ -0,0 +1,123 @@ 
+diff -Naur /usr/portage/app-backup/backintime/backintime-1.0.24-r1.ebuild ./backintime-1.0.24-r1.ebuild
+--- /usr/portage/app-backup/backintime/backintime-1.0.24-r1.ebuild	2013-07-28 10:31:01.000000000 +0200
@@ -1,49 +0,0 @@ 
---- backintime-1.0.4/common/Makefile.template
-+++ backintime-1.0.4/common/Makefile.template
-@@ -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.24/common/Makefile.template
-+++ backintime-1.0.24/common/Makefile.template
-@@ -20,7 +20,6 @@
- 	#install doc file(s)
- 	install -d $(DEST)/share/doc/backintime
- 	install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime
--	install --mode=644 ../LICENSE $(DEST)/share/doc/backintime
- 	install --mode=644 ../README $(DEST)/share/doc/backintime
- 	install --mode=644 ../TRANSLATIONS $(DEST)/share/doc/backintime
- 	install --mode=644 ../VERSION $(DEST)/share/doc/backintime
---- backintime-1.0.4/gnome/Makefile.template
-+++ backintime-1.0.4/gnome/Makefile.template
-@@ -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/kde4/Makefile.template
-+++ backintime-1.0.4/kde4/Makefile.template
-@@ -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
--- /usr/portage/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff	2010-11-08 14:58:34.000000000 +0100
+++ /usr/portage/app-backup/backintime/files/backintime-1.0.4-dont-install-license.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@ 
--- /usr/portage/app-backup/backintime/files/backintime-dont-install-license.patch	1970-01-01 01:00:00.000000000 +0100
+++ /usr/portage/app-backup/backintime/files/backintime-dont-install-license.patch	2013-12-05 22:37:27.000000000 +0100
@@ -0,0 +1,49 @@ 
+--- backintime-1.0.4/common/Makefile.template
++++ backintime-1.0.4/common/Makefile.template
+@@ -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.24/common/Makefile.template
++++ backintime-1.0.24/common/Makefile.template
+@@ -20,7 +20,6 @@
+ 	#install doc file(s)
+ 	install -d $(DEST)/share/doc/backintime
+ 	install --mode=644 ../AUTHORS $(DEST)/share/doc/backintime
+-	install --mode=644 ../LICENSE $(DEST)/share/doc/backintime
+ 	install --mode=644 ../README $(DEST)/share/doc/backintime
+ 	install --mode=644 ../TRANSLATIONS $(DEST)/share/doc/backintime
+ 	install --mode=644 ../VERSION $(DEST)/share/doc/backintime
+--- backintime-1.0.4/gnome/Makefile.template
++++ backintime-1.0.4/gnome/Makefile.template
+@@ -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/kde4/Makefile.template
++++ backintime-1.0.4/kde4/Makefile.template
+@@ -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