Pin gtk+ to slot 2. Move DOCS to pkg_setup. Remove old revision.

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

3 files changed, 11 insertions, 51 deletions

diff --git a/gnome-extra/contacts/ChangeLog b/gnome-extra/contacts/ChangeLog
index 7759e30ebb2f..5611f7e28ed9 100644
--- a/gnome-extra/contacts/ChangeLog
+++ b/gnome-extra/contacts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/contacts
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.10 2010/09/13 21:10:53 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.11 2011/01/24 13:02:59 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> -contacts-0.11.ebuild,
+  contacts-0.12.ebuild:
+  Pin gtk+ to slot 2. Move DOCS to pkg_setup. Remove old revision.
 
 *contacts-0.12 (13 Sep 2010)
 
diff --git a/gnome-extra/contacts/contacts-0.11.ebuild b/gnome-extra/contacts/contacts-0.11.ebuild
deleted file mode 100644
index 9641f99b2887..000000000000
--- a/gnome-extra/contacts/contacts-0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild,v 1.2 2010/09/02 13:13:46 pacho Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A small, lightweight addressbook for GNOME"
-HOMEPAGE="http://pimlico-project.org/contacts.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus"
-
-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"
-
-# README is empty
-DOCS="AUTHORS ChangeLog NEWS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable dbus)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix compilation with USE="-dbus", bug #247519, upstream bug #628614
-	epatch "${FILESDIR}/${PN}-0.9-dbus.patch"
-
-	# Fix compilation with gmake-3.82, bug #333647, upstream bug #628615
-	epatch "${FILESDIR}/${PN}-0.11-fix-make-3.82.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-extra/contacts/contacts-0.12.ebuild b/gnome-extra/contacts/contacts-0.12.ebuild
index 0378599ff5c8..58599209110d 100644
--- a/gnome-extra/contacts/contacts-0.12.ebuild
+++ b/gnome-extra/contacts/contacts-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.12.ebuild,v 1.1 2010/09/13 21:10:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.12.ebuild,v 1.2 2011/01/24 13:02:59 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -16,16 +16,15 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dbus"
 
 RDEPEND=">=gnome-extra/evolution-data-server-1.8
-	>=x11-libs/gtk+-2.6"
+	>=x11-libs/gtk+-2.6:2"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35.0
 	>=dev-util/pkgconfig-0.9"
 
-# README is empty
-DOCS="AUTHORS ChangeLog NEWS"
-
 pkg_setup() {
+	# README is empty
+	DOCS="AUTHORS ChangeLog NEWS"
 	G2CONF="${G2CONF} $(use_enable dbus)"
 }