Fix building (#442260 by Diego Elio Pettenò), drop 'doc' USE flag as it's only used to rebuild documentation, remove old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 20 insertions, 125 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index 345978b9694d..904dd181099b 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -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.
-
diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest
index 4a1c62d7febb..a6fd0b7fda60 100644
--- a/gnome-extra/evolution-exchange/Manifest
+++ b/gnome-extra/evolution-exchange/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST evolution-exchange-2.32.2.tar.bz2 1306445 SHA256 60030eb2de042cef1d703cda7d64c3ec87fcef0bd966012e816954a96cc37d63 SHA512 5b2366ad01e75623eec9a6619c4ac8636671f4df4214a8c2992ed6bb78c67a2adc27a12e5b0947bfa00dbd35f3c2b159d2a515d2dd101eca58b9550736bef997 WHIRLPOOL 6fc97f8d1a4fd1c6f8b3ae23b456f21f4bb02a71427dae6984dbc1d745560d25e8066c96b624433ef3d787212230395dbd1dcfc184a6307c69a007c31615cdfe
 DIST evolution-exchange-2.32.3.tar.bz2 1308675 SHA256 2993d08d16fd8aac2ba0a397455a43ca39398037b49ffc158bb6d2e700771621 SHA512 9b25309d6b0f84aed77ae3612b69d9857b800cdb1e7e7547b37be6e1100f747fe6fe4d35c5adee2490922a639397681c7f88501713b0e373c6184ac1700ce0a9 WHIRLPOOL 93370f9b8ea55d72f92b8061d5ded94f9a3549e27a3fa972bb1eabfec442194836e4e80d8561555a2e3288d77b5bb70fa1d43022c852d0c8e79ba244ea97923e
 DIST evolution-exchange-3.2.3.tar.xz 1139076 SHA256 759a73c7c49aaf45a5ea9d846b44e1314e13e78d4bfe959fc3ded311c1c690a2 SHA512 74dd5fa25a4b91ba468940d3e567587401623be14ba7fc52cb39410c9eba0a4e632895333a591aa3c5c0f49f312e1ccfce2a8cc37ffc4e5f16348ade3fd0d403 WHIRLPOOL 4f0ea340037fa850ab0de49fa0c626a3711ca8556f850396809ec3a94213e2870381834fee4a4acee08185fbce38af830c0b5a9646a67f12d94582359e58040b
-DIST evolution-exchange-3.4.3.tar.xz 1117344 SHA256 28b2b47bfdae097b13722dfd0aae6e1335de8d98bd10534a3c7675489352f7b7 SHA512 9355c96ae6d86df743ce5c1f65d722186374412e581f0aae66b095211471cbfd6d912c80294b62db1ee82d0b104e430d86fa2453ad0421c7d1fb019f162b6a55 WHIRLPOOL c95a1d13c1fd820e1742847764abe05d4937b687b9f5bf28eed6652bb90e7e56a9387e4da93f12820f8715e50f9751013c24d9ec21b5049ebe339f4fa5dadc84
 DIST evolution-exchange-3.4.4.tar.xz 1117268 SHA256 964f0fc44578c98f6d3a5a59a70b0aa5c8a88b27061473c090f5611d6572b0d4 SHA512 70f66f3a9312b261ba06d76c0cca1fe8ed547bfd1347f6553b926945beacba0cbe0cd6835e5639848b2c8c6a143d06b1714e83ba0e21a6b9b344882259c74f79 WHIRLPOOL 9a247f52a063e275b737e9b42d2b0972d7510dd7c4730e318ead90ca654706e6528cbc38082cec86a4d2266123a91df29d2b7b9eb40f388a88488ee6822721cd
-EBUILD evolution-exchange-2.32.2.ebuild 1396 SHA256 2f94287cefb42de766d2dc57731fcc93b59b41a167f09c56c64d89ec44e28996 SHA512 b032786571f6849987d86822918ad199ebf62a65ac075213eda8ee552658bb54cfe9a4b4331fa97af87e20800da74932cf9a03e598a65189628832a513fe6bae WHIRLPOOL 487dca2aa954a5c25414762cbefa8699f037fa187b26c1fc7145f91e1046745edd9935efb9bb72821059462c99000aac15c17ff3978f311f064de09f0352e7cb
-EBUILD evolution-exchange-2.32.3.ebuild 1339 SHA256 cc016c8f0ade7410f6abc78fd97aaec29edb059176a42810904f2bc0c63c4f0b SHA512 49749169da1cb6c086ceeab8b1db0d81c36f7198c5d17dbec249d68ca91bf06137a86f2b85758ee06f4033e579e4de44679a3261559235d919ec57aaab4a70e2 WHIRLPOOL bcbef2a19017afec17dbfd09c5b7e39e3db6952b6f2843288ed704b8317b53411a6348777d4ec70731b3e77b1b9c8804ba066b42c4ead42cc5324ff297aed0b4
+EBUILD evolution-exchange-2.32.3.ebuild 1414 SHA256 f8827ca7794c988287fa1f555ecbfb21cbb1512d0bf2c4f69549b4cab3c0312a SHA512 3af6ee2dc4a05952f3a296fd22e315fa77c585ffe848b33a08564acdb35610a728b01783ee8d807bfc250caa847f67898f78619bc2ab048cd86a74ab7e1241a6 WHIRLPOOL 6cff1e66eac6d801ea65f3c625867138fc1e2e36bd5323aa56d2ff81b8aed40ef5b23dd6cc17ba5049e5c1af4753f7d964486539df20d66ecd1043bdb828860c
 EBUILD evolution-exchange-3.2.3.ebuild 1068 SHA256 4a076a3fef2132245b17abd46456cd836498a0f43ced905886009803a9566dcc SHA512 5c8a4717701fced5bce46fae21b47973baa4e52c7b1b42991fe9e18f82b46eea21f3667b6d1d9ecaa87d8a33ca0810a919fac7579bf185a9ea937940082be6ba WHIRLPOOL 0bb3d46a396f57afab21480fee32afa61fe751b5487258ebc1f7ea22b7db51d43992497bc0d2360911e997eda7ac14774b8b65812fcbe091023ba0ed9869686e
-EBUILD evolution-exchange-3.4.3.ebuild 1095 SHA256 9946b620b45bd264a531bdcccb8e0b7eef5556e1f45d488d3593d0e30f325511 SHA512 1d0a368a3a0b6eef1621b356bd4aefb6233c02bacab94595f1b96f5f3902a9405c3d174d503870c5877a52181d4354fccb7b0796e7315f721359d169003894d7 WHIRLPOOL 7beee0b17cd6a3a5dcb850ace142011f3705ec70b704fab2b445c4e6193046ce133a48ab7aaa65dbae87ddbffbfd8ab33131db0972b09bee5442101a88b0eb9f
 EBUILD evolution-exchange-3.4.4.ebuild 1096 SHA256 b905788e107d8030c4287bac998bc90fa10a6e3d78998aadcd5ca3472ab49dc8 SHA512 1b499c8547bf2d9c55976746f8bc5fc9fc3cbffbfa529f4e97c37a5c94cef21ea2ba3acda748c1e85f8d7a2406bfd9db3e5f1a65b65a956a26f24d3d0dc6ecc8 WHIRLPOOL 62bb19335d3785a10a1671b5c0f9208218897b69a74c8911ad8529bc3984f23615e7a72c30f86c85c27bc2f2c6439e9bce01deebb1a30eb53883c4a25217812a
-MISC ChangeLog 23506 SHA256 cde14ccc3c360d2866e5ddb38b4f805b3663424981d9428a7c621b063beed979 SHA512 adca6a848719cdb93d30d73477bdd1a05cb2b91341b0385ae831e2873ed4919989aa05964d1fc5866c05859d2d33a020be5f7aec6ed0dc4da7de33ae2167765d WHIRLPOOL a0883c98b0e668a3e18894613e3a1b811ba4474433a3226c0a0f344237e013b5a72988fb4442ad7c71e19083d241a7d8b5ebc7f7b4c8bf0000dd1d19762f2d5b
+MISC ChangeLog 23780 SHA256 b85edae1ed190aea5fe2e23d7be11199219f9af916a1011e520ebee0b6bfd766 SHA512 a2bad491f57e0f3f29cc682ac929e2ffe1c4b5cae8e5d43a30ca9ce0d50a5c08402851a463ae66a51a38a33db8fdcab9071d8235c3a80d9453a417784b462187 WHIRLPOOL 3ebcdadcdacf06d3f597b8d7cac3ca0121d1fe42a47dc119688c990161304d409205e7df833b8277f082598fbe250fa33248bcf66d660e903f18cc083aee6353
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKInNAAoJEJ0WA1zPCt1hCh8H/3cSFhyJS2XCfmRGNJXNBDs2
-w+FNwQGeVtxcgE69CCd/QPq0FiFBI60/3jXAa22wHG4Uf/eXN+AybkAQmJ1e14ip
-zfaae8smvKScelJULtpPi9SPt2U6FS48BaRQvm3yDgD7rczLu30sjJvUKhDFzTs1
-E5+/kbGUTw0+oRSk3oBLNgrisKicDpp7y0MvezQxfbIvry7x8l46Xeqnlx4VPoJU
-sNlrvxeCQ6UvB7xXZGStUd2oTIaeLZACGTOATFNWmzYFeR/k7sn295rR7R5OV3v5
-6geMnQwrT1tiqzWXfI1dwrA06k4Q+ilIuQfM0LIK6ChHLdrYF9rFpAELOP5LJis=
-=R5wc
+iEYEAREIAAYFAlCnejkACgkQCaWpQKGI+9SBmQCfUVvLPiydkdGIhYO676He0/S5
+/xoAn1DWvc8KQbxv7mU8FdIrxMi2zDdb
+=+HRa
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild
deleted file mode 100644
index 28b93edf2eab..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.32.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2.ebuild,v 1.8 2012/05/05 06:25:21 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.20:2
-	>=gnome-base/gconf-2:2
-	dev-libs/libxml2:2
-	net-libs/libsoup:2.4
-	>=net-nds/openldap-2.1.30-r2
-	virtual/krb5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	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
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure.ac configure || die "sed 1 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
index 268fa5f13d0f..6f5385034475 100644
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild
@@ -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 @@ LICENSE="GPL-2"
 
 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 @@ RDEPEND="
 
 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
 }
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild
deleted file mode 100644
index 4bcccc061a1b..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-3.4.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-3.4.3.ebuild,v 1.1 2012/06/24 08:45:00 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-IUSE="debug doc static"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=mail-client/evolution-${PV}:2.0
-	>=gnome-extra/evolution-data-server-${PV}[ldap,kerberos]
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.0:3
-	>=gnome-base/gconf-2:2
-	>=dev-libs/libical-0.43
-	dev-libs/libxml2:2
-	net-libs/libsoup:2.4
-	>=net-nds/openldap-2.1.30-r2
-	virtual/krb5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-krb5=${EPREFIX}/usr
-		--with-openldap
-		--disable-static
-		$(use_enable debug e2k-debug)
-		$(use_with static static-ldap)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}