app-backup/deja-dup: Cleaned old and unused code

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

9 files changed, 9 insertions, 357 deletions

diff --git a/app-backup/deja-dup/ChangeLog b/app-backup/deja-dup/ChangeLog
index 7a833542fa6b..3fc1520d9c33 100644
--- a/app-backup/deja-dup/ChangeLog
+++ b/app-backup/deja-dup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-backup/deja-dup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/ChangeLog,v 1.16 2012/05/03 02:06:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/ChangeLog,v 1.17 2012/05/05 15:22:18 jlec Exp $
+
+  05 May 2012; Justin Lecher <jlec@gentoo.org> -deja-dup-18.1.1.ebuild,
+  -deja-dup-21.2.ebuild, -deja-dup-21.2-r1.ebuild,
+  -files/deja-dup-21.2-linguas.patch, -files/deja-dup-21.2-prll.patch,
+  -files/deja-dup-21.2-test.patch, deja-dup-22.0.ebuild, deja-dup-22.1.ebuild:
+  Cleaned old and unused code
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> deja-dup-18.1.1.ebuild,
   deja-dup-21.2.ebuild, deja-dup-21.2-r1.ebuild, deja-dup-22.0.ebuild,
diff --git a/app-backup/deja-dup/deja-dup-18.1.1.ebuild b/app-backup/deja-dup/deja-dup-18.1.1.ebuild
deleted file mode 100644
index 110f7dc12dd9..000000000000
--- a/app-backup/deja-dup/deja-dup-18.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-18.1.1.ebuild,v 1.4 2012/05/03 02:06:09 jdhore Exp $
-
-EAPI=3
-
-inherit eutils gnome2
-
-DESCRIPTION="Simple backup tool using duplicity back-end"
-HOMEPAGE="https://launchpad.net/deja-dup/"
-SRC_URI="http://launchpad.net/${PN}/18/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="nautilus nls"
-
-# TODO: need gnome-extra/indicator-application as a dep?
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/libnotify-0.7.1
-
-	app-backup/duplicity
-	dev-libs/dbus-glib
-	dev-libs/libunique:1
-	gnome-base/gnome-keyring
-
-	nautilus? ( gnome-base/nautilus )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[fuse]"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/Locale-gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17"
-# Needed for eautoreconf:
-# app-text/gnome-doc-utils
-
-pkg_setup() {
-	DOCS="NEWS AUTHORS"
-	G2CONF="${G2CONF}
-		$(use_enable nls)
-		$(use_with nautilus)
-		--without-appindicator
-		--without-unity
-		--without-gtk3
-		--disable-maintainer-mode
-		--disable-scrollkeeper
-		--disable-schemas-compile"
-	use nls && unset LINGUAS || export LINGUAS=""
-}
-
-src_install() {
-	gnome2_src_install
-	domenu data/deja-dup.desktop
-}
diff --git a/app-backup/deja-dup/deja-dup-21.2-r1.ebuild b/app-backup/deja-dup/deja-dup-21.2-r1.ebuild
deleted file mode 100644
index 8c4d1b7e8fc2..000000000000
--- a/app-backup/deja-dup/deja-dup-21.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-21.2-r1.ebuild,v 1.4 2012/05/03 02:06:09 jdhore Exp $
-
-EAPI=4
-
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Simple backup tool using duplicity back-end"
-HOMEPAGE="https://launchpad.net/deja-dup/"
-SRC_URI="http://launchpad.net/${PN}/22/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7.1
-
-	app-backup/duplicity
-	dev-libs/dbus-glib
-	gnome-base/gnome-keyring
-
-	nautilus? ( gnome-base/nautilus )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[fuse]"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-lang/vala:0.14
-	dev-perl/Locale-gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="NEWS AUTHORS"
-	G2CONF="${G2CONF}
-		$(use_with nautilus)
-		--without-ccpanel
-		--without-unity
-		--disable-schemas-compile
-		--disable-static"
-	export VALAC=$(type -p valac-0.14)
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-prll.patch \
-		"${FILESDIR}"/${P}-test.patch \
-		"${FILESDIR}"/${P}-linguas.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	domenu data/deja-dup.desktop
-}
diff --git a/app-backup/deja-dup/deja-dup-21.2.ebuild b/app-backup/deja-dup/deja-dup-21.2.ebuild
deleted file mode 100644
index d8c9175d091c..000000000000
--- a/app-backup/deja-dup/deja-dup-21.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-21.2.ebuild,v 1.5 2012/05/03 02:06:09 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Simple backup tool using duplicity back-end"
-HOMEPAGE="https://launchpad.net/deja-dup/"
-SRC_URI="http://launchpad.net/${PN}/22/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nautilus nls"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7.1
-
-	app-backup/duplicity
-	dev-libs/dbus-glib
-	gnome-base/gnome-keyring
-
-	nautilus? ( gnome-base/nautilus )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs[fuse]"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-lang/vala:0.14
-	dev-perl/Locale-gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="NEWS AUTHORS"
-	G2CONF="${G2CONF}
-		$(use_enable nls)
-		$(use_with nautilus)
-		--without-ccpanel
-		--without-unity
-		--disable-schemas-compile"
-	use nls && unset LINGUAS || export LINGUAS=""
-	export VALAC=$(type -p valac-0.14)
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-prll.patch \
-		"${FILESDIR}"/${P}-test.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	domenu data/deja-dup.desktop
-}
diff --git a/app-backup/deja-dup/deja-dup-22.0.ebuild b/app-backup/deja-dup/deja-dup-22.0.ebuild
index b5ade83e818b..bd3f59d1dedc 100644
--- a/app-backup/deja-dup/deja-dup-22.0.ebuild
+++ b/app-backup/deja-dup/deja-dup-22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.0.ebuild,v 1.6 2012/05/03 02:06:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.0.ebuild,v 1.7 2012/05/05 15:22:18 jlec Exp $
 
 EAPI=4
 
@@ -50,13 +50,6 @@ pkg_setup() {
 	export VALAC=$(type -p valac-0.14)
 }
 
-#src_prepare() {
-#	epatch \
-#		"${FILESDIR}"/${PN}-21.2-linguas.patch
-#	eautoreconf
-#	gnome2_src_prepare
-#}
-
 src_install() {
 	gnome2_src_install
 	domenu data/deja-dup.desktop
diff --git a/app-backup/deja-dup/deja-dup-22.1.ebuild b/app-backup/deja-dup/deja-dup-22.1.ebuild
index b7f12bace707..47b401af182b 100644
--- a/app-backup/deja-dup/deja-dup-22.1.ebuild
+++ b/app-backup/deja-dup/deja-dup-22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.1.ebuild,v 1.2 2012/05/03 02:06:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-22.1.ebuild,v 1.3 2012/05/05 15:22:18 jlec Exp $
 
 EAPI=4
 
@@ -50,13 +50,6 @@ pkg_setup() {
 	export VALAC=$(type -p valac-0.14)
 }
 
-#src_prepare() {
-#	epatch \
-#		"${FILESDIR}"/${PN}-21.2-linguas.patch
-#	eautoreconf
-#	gnome2_src_prepare
-#}
-
 src_install() {
 	gnome2_src_install
 	domenu data/deja-dup.desktop
diff --git a/app-backup/deja-dup/files/deja-dup-21.2-linguas.patch b/app-backup/deja-dup/files/deja-dup-21.2-linguas.patch
deleted file mode 100644
index bc5539a28a68..000000000000
--- a/app-backup/deja-dup/files/deja-dup-21.2-linguas.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 45e4b91bc7a987dc784c18564c9f8d2585befb0d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 11 Feb 2012 02:43:18 -0500
-Subject: [PATCH] Use intltool's LINGUAS handling code for man pages
-
-LINGUAS needs to be handled the same way in man/ and po/.
-
-Otherwise, if building with LINGUAS set, the build system tries to
-generate man pages for languages for which localization messages
-had not been generated, resulting in build failure:
-
- make[2]: Entering directory
- `/var/tmp/portage/app-backup/deja-dup-21.2-r1/work/deja-dup-21.2/man'
- make[2]: Nothing to be done for `install-exec-am'.
- make[2]: *** No rule to make target `ar/stamp', needed by `man'.  Stop.
----
- man/Makefile.am |   17 +++++++++++++----
- 1 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 4aab2b1..cd837ed 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -17,9 +17,18 @@
- # along with Déjà Dup.  If not, see <http://www.gnu.org/licenses/>.
- 
- # Here's a bunch of translation support.  Some stolen from dpkg
-+# and intltool.
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(top_srcdir)/po/LINGUAS; then grep -v "^\#" $(top_srcdir)/po/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(top_srcdir)/po/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+MAN_LINGUAS = C $(USE_LINGUAS)
- 
--POLINGUAS = $(shell grep -v "^\#" $(top_srcdir)/po/LINGUAS)
--MAN_LINGUAS = C $(POLINGUAS)
- 
- PAGES = deja-dup.1 deja-dup-preferences.1
- 
-@@ -52,7 +61,7 @@ clean-local-yes:
- install-data-local: install-data-local-@USE_NLS@
- install-data-local-no:
- install-data-local-yes: man
--	for lang in $(POLINGUAS); do \
-+	for lang in $(USE_LINGUAS); do \
- 		$(mkinstalldirs) "$(DESTDIR)$(mandir)/$$lang/man1"; \
- 		$(INSTALL_DATA) $$lang/*.1 "$(DESTDIR)$(mandir)/$$lang/man1"; \
- 	done
-@@ -62,7 +71,7 @@ install-data-local-yes: man
- uninstall-local: uninstall-local-@USE_NLS@
- uninstall-local-no:
- uninstall-local-yes: man
--	for lang in $(POLINGUAS); do \
-+	for lang in $(USE_LINGUAS); do \
- 		for file in $(PAGES); do \
- 			rm -f "$(DESTDIR)$(mandir)/$$lang/man1/$$file"; \
- 		done \
--- 
-1.7.8.4
-
diff --git a/app-backup/deja-dup/files/deja-dup-21.2-prll.patch b/app-backup/deja-dup/files/deja-dup-21.2-prll.patch
deleted file mode 100644
index 1b9a752480ff..000000000000
--- a/app-backup/deja-dup/files/deja-dup-21.2-prll.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- common/Makefile.am  |    1 -
- widgets/Makefile.am |    3 +--
- 2 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/common/Makefile.am b/common/Makefile.am
-index a45f40e..1cad678 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -29,7 +29,6 @@ libcommon_la_LIBADD = \
- 	@INTLLIBS@
- 
- noinst_HEADERS = \
--	common.h \
- 	chacks.h \
- 	uriutils.h
- 
-diff --git a/widgets/Makefile.am b/widgets/Makefile.am
-index af007e3..5c7c545 100644
---- a/widgets/Makefile.am
-+++ b/widgets/Makefile.am
-@@ -31,8 +31,7 @@ libwidgets_la_LIBADD = \
- 	@INTLLIBS@ \
- 	$(top_builddir)/common/libcommon.la
- 
--noinst_HEADERS = \
--	widgets.h
-+noinst_HEADERS =
- 
- libwidgets_la_VALASOURCES = \
- 	ConfigBool.vala \
diff --git a/app-backup/deja-dup/files/deja-dup-21.2-test.patch b/app-backup/deja-dup/files/deja-dup-21.2-test.patch
deleted file mode 100644
index d77eed930639..000000000000
--- a/app-backup/deja-dup/files/deja-dup-21.2-test.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-=== modified file 'tests/common/common.vala'
---- tests/common/common.vala	2011-11-22 01:26:19 +0000
-+++ tests/common/common.vala	2011-12-11 19:30:42 +0000
-@@ -39,38 +39,29 @@
-   Environment.unset_variable("DEJA_DUP_TESTING");
- }
- 
-+void parse_one_dir (string to_parse, string? result)
-+{
-+  if (result != null)
-+    assert(DejaDup.parse_dir(to_parse).equal(File.new_for_path(result)));
-+}
-+
- void parse_dir()
- {
--  assert(DejaDup.parse_dir("$HOME").equal(
--         File.new_for_path(Environment.get_home_dir())));
--  assert(DejaDup.parse_dir("$TRASH").equal(
--         File.new_for_path(Path.build_filename(Environment.get_user_data_dir(), "Trash"))));
--  assert(DejaDup.parse_dir("$DESKTOP").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.DESKTOP))));
--  assert(DejaDup.parse_dir("$DOCUMENTS").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.DOCUMENTS))));
--  assert(DejaDup.parse_dir("$DOWNLOAD").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.DOWNLOAD))));
--  assert(DejaDup.parse_dir("$MUSIC").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.MUSIC))));
--  assert(DejaDup.parse_dir("$PICTURES").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.PICTURES))));
--  assert(DejaDup.parse_dir("$PUBLIC_SHARE").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.PUBLIC_SHARE))));
--  assert(DejaDup.parse_dir("$TEMPLATES").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.TEMPLATES))));
--  assert(DejaDup.parse_dir("$VIDEOS").equal(
--         File.new_for_path(Environment.get_user_special_dir(UserDirectory.VIDEOS))));
--  assert(DejaDup.parse_dir("VIDEOS").equal(
--         File.new_for_path(Path.build_filename(Environment.get_home_dir(), "VIDEOS"))));
--  assert(DejaDup.parse_dir("/VIDEOS").equal(
--         File.new_for_path("/VIDEOS")));
--  assert(DejaDup.parse_dir("file:VIDEOS").equal(
--         File.parse_name("file:VIDEOS")));
--  assert(DejaDup.parse_dir("file:///VIDEOS").equal(
--         File.new_for_path("/VIDEOS")));
--  assert(DejaDup.parse_dir("").equal(
--         File.new_for_path(Environment.get_home_dir())));
-+  parse_one_dir("", Environment.get_home_dir());
-+  parse_one_dir("$HOME", Environment.get_home_dir());
-+  parse_one_dir("$TRASH", Path.build_filename(Environment.get_user_data_dir(), "Trash"));
-+  parse_one_dir("$DESKTOP", Environment.get_user_special_dir(UserDirectory.DESKTOP));
-+  parse_one_dir("$DOCUMENTS", Environment.get_user_special_dir(UserDirectory.DOCUMENTS));
-+  parse_one_dir("$DOWNLOAD", Environment.get_user_special_dir(UserDirectory.DOWNLOAD));
-+  parse_one_dir("$MUSIC", Environment.get_user_special_dir(UserDirectory.MUSIC));
-+  parse_one_dir("$PICTURES", Environment.get_user_special_dir(UserDirectory.PICTURES));
-+  parse_one_dir("$PUBLIC_SHARE", Environment.get_user_special_dir(UserDirectory.PUBLIC_SHARE));
-+  parse_one_dir("$TEMPLATES", Environment.get_user_special_dir(UserDirectory.TEMPLATES));
-+  parse_one_dir("$VIDEOS", Environment.get_user_special_dir(UserDirectory.VIDEOS));
-+  parse_one_dir("VIDEOS", Path.build_filename(Environment.get_home_dir(), "VIDEOS"));
-+  parse_one_dir("/VIDEOS", "/VIDEOS");
-+  parse_one_dir("file:///VIDEOS", "/VIDEOS");
-+  assert(DejaDup.parse_dir("file:VIDEOS").equal(File.parse_name("file:VIDEOS")));
- }
- 
- void parse_dir_list()
-