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

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 17 insertions, 59 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/Manifest b/gnome-extra/contacts/Manifest
index e8c9a213bff5..d829f2487bff 100644
--- a/gnome-extra/contacts/Manifest
+++ b/gnome-extra/contacts/Manifest
@@ -3,16 +3,14 @@ Hash: SHA1
 
 AUX contacts-0.11-fix-make-3.82.patch 420 RMD160 877209e94417aa34dcf6666c5edea122e932c2ff SHA1 4dc29604471f9c351897c4f870475468a31d0218 SHA256 0af667f267304a0b7f02757e1e544533cef49affd2be9e3a0c0133e730f0f4d7
 AUX contacts-0.9-dbus.patch 604 RMD160 006a40a7a36791107313c36c7e86b7c99721b767 SHA1 676eb551d633f055c8346fd0d5481a1e0a3c019f SHA256 36a09da50e055f54786fc86f27a309a8d8be29c5cb53f9314ce3f856bdc37949
-DIST contacts-0.11.tar.bz2 351030 RMD160 967876a0567f7430776f110b879635f9e122f1c1 SHA1 1d233189f73399da046eb66e75374e9e65ba64e5 SHA256 787f3759eec3d262b80d5fecebc7c558fb2c5ad77d65f4c5a3a638a7b414c084
 DIST contacts-0.12.tar.bz2 358322 RMD160 ff12cc45280311437e79e53859ca12d441dc0248 SHA1 f836963997c9dbdb34a6491a9f5a5431375a710c SHA256 0993f34819b92e09ab64e8a90231afc3178a19a4a99cf02c3050f51a44850782
-EBUILD contacts-0.11.ebuild 1087 RMD160 37582d9e51a19cf56b1656f902318f18f8364f06 SHA1 2caeeb00444ccab8c0454858d8ff3ee35540b81e SHA256 f50d9096e963efe26b612f88541146a9afbf454bdca65ef5c1d53d3f7b6bc37d
-EBUILD contacts-0.12.ebuild 1085 RMD160 b4fc5ea6c1d538c2ce5e3a0d90283b58bf1ae3b9 SHA1 6a4e01d9868c2bae757ef83b2b3482be66c98e1a SHA256 d9f938cdc24e77947eb16e5b36ec6e40e7ca5cd4c4a2bcab915e01273999d46f
-MISC ChangeLog 2005 RMD160 bd5ec8c4065e868094c614597b03785d213e1f28 SHA1 4f1ade5f00456b0997dd78cce67141af68791769 SHA256 370119b47e833f50657ba5660e4b3537227a1342947db799c965e1a28dc644dc
+EBUILD contacts-0.12.ebuild 1088 RMD160 1101eea9585bfd7c87e1c1e94455ce54c2c28309 SHA1 43ec80c356a87c5358517625096fc297d4134e73 SHA256 eec6084085d18be8f1249394ad8fd8094f0d62da6b0fd17b674432efa9d09fab
+MISC ChangeLog 2174 RMD160 bb0731e2fd7fee633228101de2f250684351fce9 SHA1 1057c8cf48121f6892cdfbe3d616f4d4e4268654 SHA256 e24581ab02b0dd45679bbcd4359da504e95b8cfe83b64e10a20cec6961669771
 MISC metadata.xml 455 RMD160 a8c07efa1ed0ab081393acb3eb13369f7f0983e8 SHA1 36d621ad6b825117b64a79c9fa2bef5190e7a312 SHA256 eeca963fe71eee5d32bcd2958bacf4871edcdd7ac7cce7ab2cf88e4d70f9ff30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyOk2MACgkQ1fmVwcYIWAYD7gCgqZhslwWNYVcQsTXzfH5SW00/
-RugAoLBipbh3cTd04XF70M5phOpwYWhy
-=VQh9
+iEYEARECAAYFAk09eJAACgkQ1fmVwcYIWAbD0gCfUtPERuB2sHFEuMrV8+2TxTKr
+QYcAnRajnCKMJazyX3fxxl2K2i13kZ0p
+=/nbQ
 -----END PGP SIGNATURE-----
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)"
 }