[gentoo-commits] gentoo-x86 commit in gnome-extra/evolution-data-server: ChangeLog evolution-data-server-3.2.2.ebuild evolution-data-server-3.2.1.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    11/12/02 17:58:17

  Modified:             ChangeLog evolution-data-server-3.2.2.ebuild
                        evolution-data-server-3.2.1.ebuild
  Log:
  Remove ssl USE flag since evolution-data-server-3.x fails to build with --disable-ssl (bug #392679, thanks to Alexander Kozyrev <sequoiahead@×××××.com> for reporting).
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.319                gnome-extra/evolution-data-server/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- ChangeLog	16 Nov 2011 00:32:42 -0000	1.318
+++ ChangeLog	2 Dec 2011 17:58:17 -0000	1.319
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.318 2011/11/16 00:32:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.319 2011/12/02 17:58:17 tetromino Exp $
+
+  02 Dec 2011; Alexandre Rostovtsev <tetromino@g.o>
+  evolution-data-server-3.2.1.ebuild, evolution-data-server-3.2.2.ebuild:
+  Remove ssl USE flag since evolution-data-server-3.x fails to build with
+  --disable-ssl (bug #392679, thanks to Alexander Kozyrev
+  <sequoiahead@×××××.com> for reporting).
 
 *evolution-data-server-3.2.2 (16 Nov 2011)
 



1.2                  gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild

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

Index: evolution-data-server-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-3.2.2.ebuild	16 Nov 2011 00:32:42 -0000	1.1
+++ evolution-data-server-3.2.2.ebuild	2 Dec 2011 17:58:17 -0000	1.2
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild,v 1.1 2011/11/16 00:32:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild,v 1.2 2011/12/02 17:58:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit db-use eutils flag-o-matic gnome2 versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2 BSD DB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 
 # GNOME3: How do we slot libedataserverui-3.0.so?
 # Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
@@ -27,6 +27,8 @@
 	>=dev-libs/libical-0.43
 	>=net-libs/libsoup-2.31.2:2.4
 	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
@@ -36,9 +38,6 @@
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
 	weather? ( >=dev-libs/libgweather-2.90.0:2 )
 "
 DEPEND="${RDEPEND}
@@ -64,6 +63,7 @@
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
+	# Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
 	G2CONF="${G2CONF}
 		VALAC=$(type -P valac-0.14)
 		VAPIGEN=$(type -P vapigen-0.14)
@@ -72,13 +72,13 @@
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)
 		$(use_with ldap openldap)
-		$(use_enable ssl ssl)
-		$(use_enable ssl smime)
 		$(use_enable vala vala-bindings)
 		$(use_enable weather)
 		--enable-calendar
-		--enable-nntp
 		--enable-largefile
+		--enable-nntp
+		--enable-ssl
+		--enable-smime
 		--with-libdb=${EPREFIX}/usr"
 }
 



1.3                  gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild?r1=1.2&r2=1.3

Index: evolution-data-server-3.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-data-server-3.2.1.ebuild	15 Nov 2011 08:54:46 -0000	1.2
+++ evolution-data-server-3.2.1.ebuild	2 Dec 2011 17:58:17 -0000	1.3
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild,v 1.2 2011/11/15 08:54:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild,v 1.3 2011/12/02 17:58:17 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit db-use eutils flag-o-matic gnome2 versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -14,7 +14,7 @@
 LICENSE="LGPL-2 BSD DB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 
 # GNOME3: How do we slot libedataserverui-3.0.so?
 # Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
@@ -27,6 +27,8 @@
 	>=dev-libs/libical-0.43
 	>=net-libs/libsoup-2.31.2:2.4
 	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4
+	>=dev-libs/nss-3.9
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
@@ -36,9 +38,6 @@
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
-	ssl? (
-		>=dev-libs/nspr-4.4
-		>=dev-libs/nss-3.9 )
 	weather? ( >=dev-libs/libgweather-2.90.0:2 )
 "
 DEPEND="${RDEPEND}
@@ -64,6 +63,7 @@
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
+	# Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
 	G2CONF="${G2CONF}
 		VALAC=$(type -P valac-0.14)
 		VAPIGEN=$(type -P vapigen-0.14)
@@ -72,13 +72,13 @@
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)
 		$(use_with ldap openldap)
-		$(use_enable ssl ssl)
-		$(use_enable ssl smime)
 		$(use_enable vala vala-bindings)
 		$(use_enable weather)
 		--enable-calendar
-		--enable-nntp
 		--enable-largefile
+		--enable-nntp
+		--enable-ssl
+		--enable-smime
 		--with-libdb=${EPREFIX}/usr"
 }