Various ebuild fixes

(Portage version: 2.1.9.46/cvs/Linux x86_64)

2 files changed, 29 insertions, 20 deletions

diff --git a/app-backup/deja-dup/ChangeLog b/app-backup/deja-dup/ChangeLog
index fe9b9d72b639..475c641887b0 100644
--- a/app-backup/deja-dup/ChangeLog
+++ b/app-backup/deja-dup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-backup/deja-dup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/ChangeLog,v 1.1 2011/04/22 11:31:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/ChangeLog,v 1.2 2011/05/02 09:09:58 nirbheek Exp $
+
+  02 May 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  deja-dup-18.1.1.ebuild:
+  Various ebuild fixes
 
 *deja-dup-18.1.1 (22 Apr 2011)
 
diff --git a/app-backup/deja-dup/deja-dup-18.1.1.ebuild b/app-backup/deja-dup/deja-dup-18.1.1.ebuild
index 8aba1753fd94..d8b7370fde98 100644
--- a/app-backup/deja-dup/deja-dup-18.1.1.ebuild
+++ b/app-backup/deja-dup/deja-dup-18.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/04/22 11:31:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-18.1.1.ebuild,v 1.2 2011/05/02 09:09:58 nirbheek Exp $
 
 EAPI="3"
 
@@ -16,32 +16,37 @@ KEYWORDS="~x86 ~amd64"
 IUSE="nautilus nls"
 
 # TODO: need gnome-extra/indicator-application as a dep?
-DEPEND="
+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/glib:2
-	dev-libs/libunique
-	gnome-base/gconf
-	gnome-base/gnome-common
+	dev-libs/libunique:1
 	gnome-base/gnome-keyring
-	x11-libs/gtk+:2
-	>=x11-libs/libnotify-0.7.1
+
 	nautilus? ( gnome-base/nautilus )"
-RDEPEND="${DEPEND}
-	dev-lang/vala:0.12
+RDEPEND="${COMMON_DEPEND}
 	gnome-base/gvfs[fuse]"
-
-DOCS="NEWS AUTHORS"
+DEPEND="${COMMON_DEPEND}
+	dev-util/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-scrollkeeper
-	VALAC=$(type -P valac-0.12)"
+		$(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=""
 }