Make this gmake-3.82 compliant, bug #333647 (reported by Diego E. 'Flameeyes' Pettenò and patch made by Jory A. Pratt). Use eapi2 and remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 36 insertions, 52 deletions

diff --git a/gnome-extra/contacts/ChangeLog b/gnome-extra/contacts/ChangeLog
index a0652fc04789..bb7d4c6a2e69 100644
--- a/gnome-extra/contacts/ChangeLog
+++ b/gnome-extra/contacts/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2009/11/12 22:34:25 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v 1.9 2010/09/02 13:13:46 pacho Exp $
+
+  02 Sep 2010; Pacho Ramos <pacho@gentoo.org> -contacts-0.10.ebuild,
+  contacts-0.11.ebuild, +files/contacts-0.11-fix-make-3.82.patch:
+  Make this gmake-3.82 compliant, bug #333647 (reported by Diego E.
+  'Flameeyes' Pettenò and patch made by Jory A. Pratt). Use eapi2 and
+  remove old.
 
 *contacts-0.11 (12 Nov 2009)
 
diff --git a/gnome-extra/contacts/Manifest b/gnome-extra/contacts/Manifest
index eda92203491d..fdf3e9304f1e 100644
--- a/gnome-extra/contacts/Manifest
+++ b/gnome-extra/contacts/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.10.tar.bz2 312456 RMD160 634db09e47fcc4bb9e74f98d3c44d089dd7c4245 SHA1 8f65cf302a3922757e42cf05cc8d1f8cfd164224 SHA256 6178e8fe2a87182450e830bcb2333ba31ea0c1a7dd91cfada8dac72e48451a01
 DIST contacts-0.11.tar.bz2 351030 RMD160 967876a0567f7430776f110b879635f9e122f1c1 SHA1 1d233189f73399da046eb66e75374e9e65ba64e5 SHA256 787f3759eec3d262b80d5fecebc7c558fb2c5ad77d65f4c5a3a638a7b414c084
-EBUILD contacts-0.10.ebuild 837 RMD160 b856ed71524b52abc84908d11f87017461174045 SHA1 fc4ea801b0a744854a3dc8cd57f863d8c85fbb40 SHA256 2cf8247d8cbc533f2bd5059a1de8e8c3db31618a4405ac5e5dc5225d9a3fdc21
-EBUILD contacts-0.11.ebuild 837 RMD160 443c1da39f32cb2e2c850d923906dd7285033e92 SHA1 d8c7f04bac90ed3dbeb443cfb0f992a776bcfce7 SHA256 93c11b1cddd59b5b4fd654722f2cb69b4072bfc3c86aaf23e4613acc6f924b43
-MISC ChangeLog 1570 RMD160 32f11d6bb564dd3cb4dd40973b803e87f3aec63c SHA1 731421bcbef4d7e7c0820ff8e8931c1b0f45c33a SHA256 4dc427199bae8f79ee9387ccec2bb0092e094bfcb861c582bdbdf989ea7869e3
+EBUILD contacts-0.11.ebuild 1087 RMD160 37582d9e51a19cf56b1656f902318f18f8364f06 SHA1 2caeeb00444ccab8c0454858d8ff3ee35540b81e SHA256 f50d9096e963efe26b612f88541146a9afbf454bdca65ef5c1d53d3f7b6bc37d
+MISC ChangeLog 1861 RMD160 0c896375af80366ecab61cd3a310023a836b1cf4 SHA1 15c264c7b210d104546e08fdd94176f0364326fa SHA256 783c8aa4272ee4cd68d651784c15d58174517f3c5c9165bf53772630319f9e48
 MISC metadata.xml 455 RMD160 a8c07efa1ed0ab081393acb3eb13369f7f0983e8 SHA1 36d621ad6b825117b64a79c9fa2bef5190e7a312 SHA256 eeca963fe71eee5d32bcd2958bacf4871edcdd7ac7cce7ab2cf88e4d70f9ff30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkr8jXYACgkQ1fmVwcYIWAYYEwCgk+wjv0G5jyP650NJR3cmrE2c
-hw0An0mOUj+GYnpWN5hrDVXfZZACaA2o
-=MGJI
+iEYEARECAAYFAkx/ow8ACgkQCaWpQKGI+9TeZwCeJx/p7QfvXY3zwc+qg1gkA/El
+sfAAn3ytItPn/qmShXIjoBXEKBEHCuIt
+=8K92
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/contacts/contacts-0.10.ebuild b/gnome-extra/contacts/contacts-0.10.ebuild
deleted file mode 100644
index 9ea613d72d28..000000000000
--- a/gnome-extra/contacts/contacts-0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.10.ebuild,v 1.1 2009/06/11 21:31:43 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit 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_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation with USE="-dbus", bug #247519
-	epatch "${FILESDIR}/${PN}-0.9-dbus.patch"
-}
diff --git a/gnome-extra/contacts/contacts-0.11.ebuild b/gnome-extra/contacts/contacts-0.11.ebuild
index 45f0affd7af6..9641f99b2887 100644
--- a/gnome-extra/contacts/contacts-0.11.ebuild
+++ b/gnome-extra/contacts/contacts-0.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1 2009/11/12 22:34:25 eva Exp $
+# $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 eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A small, lightweight addressbook for GNOME"
 HOMEPAGE="http://pimlico-project.org/contacts.html"
@@ -28,9 +29,15 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable dbus)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 
-	# Fix compilation with USE="-dbus", bug #247519
+	# 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/files/contacts-0.11-fix-make-3.82.patch b/gnome-extra/contacts/files/contacts-0.11-fix-make-3.82.patch
new file mode 100644
index 000000000000..8760477fce10
--- /dev/null
+++ b/gnome-extra/contacts/files/contacts-0.11-fix-make-3.82.patch
@@ -0,0 +1,8 @@
+--- Makefile.am-orig	2010-08-22 16:25:24.229598412 -0500
++++ Makefile.am	2010-08-22 16:25:26.488586678 -0500
+@@ -11,4 +11,4 @@
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`