[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-exchange: evolution-exchange-2.32.3.ebuild ChangeLog evolution-exchange-2.32.2.ebuild evolution-exchange-3.4.3.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-exchange: evolution-exchange-2.32.3.ebuild ChangeLog evolution-exchange-2.32.2.ebuild evolution-exchange-3.4.3.ebuild

[Pacho Ramos (pacho)]

pacho       12/11/17 11:51:20

  Modified:             evolution-exchange-2.32.3.ebuild ChangeLog
  Removed:              evolution-exchange-2.32.2.ebuild
                        evolution-exchange-3.4.3.ebuild
  Log:
  Fix building (#442260 by Diego Elio Pettenò), drop 'doc' USE flag as it's only used to rebuild documentation, remove old.
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.7                  gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild?r1=1.6&r2=1.7

Index: evolution-exchange-2.32.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-exchange-2.32.3.ebuild	5 May 2012 06:25:21 -0000	1.6
+++ evolution-exchange-2.32.3.ebuild	17 Nov 2012 11:51:20 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.6 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild,v 1.7 2012/11/17 11:51:20 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@
 
 SLOT="2.0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="debug doc static"
+IUSE="debug static"
 
 RDEPEND="
 	>=mail-client/evolution-2.32.2:2.0
@@ -30,25 +30,25 @@
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--with-krb5=/usr
 		--with-openldap
 		--disable-static
-		--disable-maintainer-mode
 		--disable-gtk3
 		$(use_enable debug e2k-debug)
 		$(use_with static static-ldap)"
 	DOCS="AUTHORS ChangeLog NEWS README"
-}
 
-src_prepare() {
-	gnome2_src_prepare
+	# Drop g_thread_init (not needed in latest versions), bug #442260
+	sed -i -e '/g_thread_init/d' tools/ximian-connector-setup.c || die
 
 	# FIXME: Fix compilation flags crazyness
 	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
 		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
 }



1.150                gnome-extra/evolution-exchange/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog	13 Aug 2012 04:59:56 -0000	1.149
+++ ChangeLog	17 Nov 2012 11:51:20 -0000	1.150
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.149 2012/08/13 04:59:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.150 2012/11/17 11:51:20 pacho Exp $
+
+  17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -evolution-exchange-2.32.2.ebuild,
+  -evolution-exchange-3.4.3.ebuild, evolution-exchange-2.32.3.ebuild:
+  Fix building (#442260 by Diego Elio Pettenò), drop 'doc' USE flag as it's only
+  used to rebuild documentation, remove old.
 
 *evolution-exchange-3.4.4 (13 Aug 2012)
 
@@ -718,4 +723,3 @@
   +files/evolution-exchange-2.3.8-kerb.patch, +metadata.xml,
   +evolution-exchange-2.3.8.ebuild:
   Initial commit, eventually pkgmove ximian-connector to this.
-