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.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 29 insertions, 44 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/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"`