[gentoo-commits] gentoo-x86 commit in gnome-extra/contacts: ChangeLog contacts-0.11.ebuild contacts-0.10.ebuild

[Pacho Ramos (pacho)]

pacho       10/09/02 13:13:46

  Modified:             ChangeLog contacts-0.11.ebuild
  Removed:              contacts-0.10.ebuild
  Log:
  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)

Revision  Changes    Path
1.9                  gnome-extra/contacts/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/contacts/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	12 Nov 2009 22:34:25 -0000	1.8
+++ ChangeLog	2 Sep 2010 13:13:46 -0000	1.9
@@ -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@g.o> -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)
 



1.2                  gnome-extra/contacts/contacts-0.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild?r1=1.1&r2=1.2

Index: contacts-0.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/contacts/contacts-0.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contacts-0.11.ebuild	12 Nov 2009 22:34:25 -0000	1.1
+++ contacts-0.11.ebuild	2 Sep 2010 13:13:46 -0000	1.2
@@ -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 @@
 	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
 }