projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5781f8c)
Remove ssl USE flag since evolution-data-server-3.x fails to build with --disable...
authorAlexandre Rostovtsev <tetromino@gentoo.org>
Fri, 2 Dec 2011 17:58:17 +0000 (17:58 +0000)
committerAlexandre Rostovtsev <tetromino@gentoo.org>
Fri, 2 Dec 2011 17:58:17 +0000 (17:58 +0000)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

gnome-extra/evolution-data-server/ChangeLog patch | blob | history
gnome-extra/evolution-data-server/Manifest patch | blob | history
gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild patch | blob | history
gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild patch | blob | history

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index e4bdd71142db8dfb781d8669842524c0df4b8344..aad189843fbe58695635e087531a0ef2f4c945e9 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -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@gentoo.org>
+  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@gmail.com> for reporting).
 
 *evolution-data-server-3.2.2 (16 Nov 2011)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 8f1d063fb9db6088e191cf5a7ccbc089279a19aa..a21508e555372fc6d1ebd8730f8680f8f4a5cb4b 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -15,14 +15,14 @@ DIST evolution-data-server-3.2.2.tar.xz 3730352 RMD160 72a5a0e1f697bd6ef0a6a0896
 EBUILD evolution-data-server-2.32.2-r1.ebuild 4150 RMD160 e6f9ece5ae709a5902438f8406466d1115816d9d SHA1 78482f64e9b3ea9c01f9140fdb24fec817614ac1 SHA256 20d91562ef3f87d947576e82e6405942fc64828e37898993032a1c98a05fad2e
 EBUILD evolution-data-server-2.32.2.ebuild 3927 RMD160 3d8501d49cdd7c23eb1cd833eed64ba038c3d9ba SHA1 dedd11c5f0eca2600cff1212ca82c269ad7988b1 SHA256 d779c226a740f32fc493e10f4f144471055cb612126aeb1d525107bdc2fd7c70
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4646 RMD160 49ed0e5b6af98eb652e2ba4186a387eed3f1afd0 SHA1 da8cd64acdf024bf7b5fa2e266593383c9125bea SHA256 291fa98185af328e835c65a7ee02aeafba980b76a7eb47765c6caa5bcc96a7f4
-EBUILD evolution-data-server-3.2.1.ebuild 4154 RMD160 996ac9984c51336f63a6aa0429363704468392a2 SHA1 3237f89f401fb618b197802eb6f98e2a6e9aef51 SHA256 0836a4d6c3f45a77ef81ab0888c599aaebf21367fb132fd248442da967ff90d4
-EBUILD evolution-data-server-3.2.2.ebuild 4155 RMD160 ee0d06de73619640321d7d57d8d8250ac579d653 SHA1 aebe764703b860eaa1e87f0c75a9fcf03a7aa0a5 SHA256 8f86f5c789e7478b850b1dd50aef36f594252d941080de03ba1bab7c4d00835c
-MISC ChangeLog 61363 RMD160 97c615ac6c75f70af05903097902e181f21e8098 SHA1 1778b8fd80714fe4dc761c565e1a53e625056291 SHA256 3bd54091107a4f47a6334256685e83dcd39f0cade700b570bf18ec8ab70ca79b
+EBUILD evolution-data-server-3.2.1.ebuild 4212 RMD160 fa1bcbe4389685a183ee5febdb8120debb5f9b20 SHA1 b90b92e5d49065ce6ea665edc9b5da38d9d8fc3b SHA256 3b7d702270a05019f1e9fc14ad7c9eef4423b1e3492c30d66a5890853612ed19
+EBUILD evolution-data-server-3.2.2.ebuild 4212 RMD160 e12e568a4240a10171620545d44a07e42d96c708 SHA1 1fa0de4e6b3bcc7c6c3a1c1a47caedc9277400dc SHA256 bb3c5e0f44e3199b817e5c4e96040f083763b36eddfd2c3c4d6b3f2d3a1b7630
+MISC ChangeLog 61671 RMD160 6b6127ac927a33fe82eb3f5cd958c92378f049bb SHA1 f1c919435888ffb394989c4382272b0ffc924c8b SHA256 e5c654fad58bb6487cbb36a58e27ce8beb1da6bf39618d16ddecb48d2fd20d35
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7DBLEACgkQdjK8w9WeBnAICwEAt1Xd5ozTEjJBQ1/P58r2/pPV
-SDgtmh6+AwNOaRVz7/QBAJ8HZZRZXLVBs7mGZvpM7KhJAN6jYmFuWIhIAv+em1S2
-=cK2x
+iF4EAREIAAYFAk7ZEccACgkQdjK8w9WeBnBufQD9ExQ0q/Xu3YsZN3e7DL28KG8O
+W4eRK7WQRXeXDC6xYw4A/iBiTUx7joAxkDwpc7/6iSnpWJApnk9d2e0bh5k+fSJj
+=G9HU
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
index 80bfbed427288182cc380bdfd444d13ef6b4494e..7ddb442d80f38668b3ebd80331e1942dfa7aef8d 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
@@ -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 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 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 @@ RDEPEND=">=dev-libs/glib-2.28:2
        >=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 @@ RDEPEND=">=dev-libs/glib-2.28:2
        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 @@ RESTRICT="test"
 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 @@ pkg_setup() {
                $(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"
 }
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
index 3cc708da9e0fc2749b07ad7923c30db01d51f647..ffabf5f82ac5032f4dfe9f0343639d9e110a0617 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
@@ -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 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 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 @@ RDEPEND=">=dev-libs/glib-2.28:2
        >=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 @@ RDEPEND=">=dev-libs/glib-2.28:2
        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 @@ RESTRICT="test"
 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 @@ pkg_setup() {
                $(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"
 }
 
Unnamed repository; edit this file 'description' to name the repository.