Version bump. Translation updates. Clean up old revisions.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

4 files changed, 21 insertions, 45 deletions

diff --git a/gnome-extra/contacts/ChangeLog b/gnome-extra/contacts/ChangeLog
index eb57fb4307d3..a0652fc04789 100644
--- a/gnome-extra/contacts/ChangeLog
+++ b/gnome-extra/contacts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/contacts
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.7 2009/06/11 21:31:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.8 2009/11/12 22:34:25 eva Exp $
+
+*contacts-0.11 (12 Nov 2009)
+
+  12 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/contacts-0.5-po.patch, -contacts-0.8.ebuild, -contacts-0.9.ebuild,
+  +contacts-0.11.ebuild:
+  Version bump. Translation updates. Clean up old revisions.
 
 *contacts-0.10 (11 Jun 2009)
 
diff --git a/gnome-extra/contacts/contacts-0.9.ebuild b/gnome-extra/contacts/contacts-0.11.ebuild
index 29de4214e737..45f0affd7af6 100644
--- a/gnome-extra/contacts/contacts-0.9.ebuild
+++ b/gnome-extra/contacts/contacts-0.11.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.9.ebuild,v 1.2 2008/11/21 21:54:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild,v 1.1 2009/11/12 22:34:25 eva Exp $
+
+GCONF_DEBUG="no"
 
 inherit eutils gnome2
 
 DESCRIPTION="A small, lightweight addressbook for GNOME"
 HOMEPAGE="http://pimlico-project.org/contacts.html"
-SRC_URI="http://pimlico-project.org/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,19 +15,22 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dbus"
 
 RDEPEND=">=gnome-extra/evolution-data-server-1.8
-		>=x11-libs/gtk+-2.6"
+	>=x11-libs/gtk+-2.6"
 DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.35.0
-		>=dev-util/pkgconfig-0.9"
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	>=dev-util/pkgconfig-0.9"
+
+# README is empty
+DOCS="AUTHORS ChangeLog NEWS"
 
 pkg_setup() {
-	G2CONF="$(use_enable dbus)"
+	G2CONF="${G2CONF} $(use_enable dbus)"
 }
 
 src_unpack() {
 	gnome2_src_unpack
 
 	# Fix compilation with USE="-dbus", bug #247519
-	epatch "${FILESDIR}/${P}-dbus.patch"
+	epatch "${FILESDIR}/${PN}-0.9-dbus.patch"
 }
diff --git a/gnome-extra/contacts/contacts-0.8.ebuild b/gnome-extra/contacts/contacts-0.8.ebuild
deleted file mode 100644
index 7f69ec19496e..000000000000
--- a/gnome-extra/contacts/contacts-0.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.8.ebuild,v 1.1 2007/12/20 18:04:33 dertobi123 Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A small, lightweight addressbook for GNOME"
-HOMEPAGE="http://pimlico-project.org/contacts.html"
-SRC_URI="http://pimlico-project.org/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=gnome-extra/evolution-data-server-1.8
-		>=x11-libs/gtk+-2.6"
-
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.35.0
-		>=dev-util/pkgconfig-0.9
-		dev-perl/XML-Parser"
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.5-po.patch
-}
diff --git a/gnome-extra/contacts/files/contacts-0.5-po.patch b/gnome-extra/contacts/files/contacts-0.5-po.patch
deleted file mode 100644
index 10314f4cd04b..000000000000
--- a/gnome-extra/contacts/files/contacts-0.5-po.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/POTFILES.in-	2007-04-29 19:40:12.518473872 +0200
-+++ po/POTFILES.in	2007-04-29 19:40:18.474813302 +0200
-@@ -4,3 +4,4 @@
- src/contacts-main.c
- src/contacts-utils.c
- src/contacts-gtk.c
-+src/contacts-ui.c