From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S8Crd-000529-VI for garchives@archives.gentoo.org; Thu, 15 Mar 2012 15:45:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23B96E07A0; Thu, 15 Mar 2012 15:44:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D9A12E07A0 for ; Thu, 15 Mar 2012 15:44:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2017A1B404E for ; Thu, 15 Mar 2012 15:44:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D405BE542C for ; Thu, 15 Mar 2012 15:44:47 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1331826023.ab16174d51d5f3a60ef443abb3eae3bf4db9d979.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, ... X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild mail-client/evolution/evolution-3.3.91.ebuild mail-client/evolution/evolution-9999.ebuild mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch X-VCS-Directories: gnome-extra/evolution-data-server/ mail-client/evolution/ mail-client/evolution/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: ab16174d51d5f3a60ef443abb3eae3bf4db9d979 X-VCS-Branch: master Date: Thu, 15 Mar 2012 15:44:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 850c8d35-54b6-403b-98e7-c0311a7550b6 X-Archives-Hash: 9acd0515ec8307952bfb468625487eac commit: ab16174d51d5f3a60ef443abb3eae3bf4db9d979 Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Mar 9 23:50:30 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Thu Mar 15 15:40:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dab16174d evolution, e-d-s: bump to 3.3.91 --- ....ebuild =3D> evolution-data-server-3.3.91.ebuild} | 22 ++++++------ .../evolution-data-server-9999.ebuild | 22 ++++++------ ...olution-9999.ebuild =3D> evolution-3.3.91.ebuild} | 18 ++++------ mail-client/evolution/evolution-9999.ebuild | 18 ++++------ .../evolution-3.2.1-reorder-mx-clutter-gtk.patch | 34 --------------= ------ 5 files changed, 36 insertions(+), 78 deletions(-) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999= .ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.= ebuild similarity index 93% copy from gnome-extra/evolution-data-server/evolution-data-server-9999.eb= uild copy to gnome-extra/evolution-data-server/evolution-data-server-3.3.91.eb= uild index 40bea92..a7ec0be 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebui= ld @@ -21,31 +21,32 @@ if [[ ${PV} =3D 9999 ]]; then else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi -IUSE=3D"doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl= vala +weather" +IUSE=3D"doc +gnome-online-accounts +introspection ipv6 ldap kerberos val= a +weather" =20 # 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 slo= tted -RDEPEND=3D">=3Ddev-libs/glib-2.28:2 - >=3Dx11-libs/gtk+-3.0:3 +RDEPEND=3D">=3Ddev-libs/glib-2.30:2 + >=3Dx11-libs/gtk+-3.2:3 >=3Dgnome-base/gconf-2 >=3Ddev-db/sqlite-3.5 - >=3Ddev-libs/libgdata-0.9.1 + >=3Ddev-libs/libgdata-0.10 >=3Dgnome-base/gnome-keyring-2.20.1 >=3Ddev-libs/libical-0.43 >=3Dnet-libs/libsoup-2.31.2:2.4 >=3Ddev-libs/libxml2-2 >=3Dsys-libs/db-4 + >=3Ddev-libs/nspr-4.4 + >=3Ddev-libs/nss-3.9 + sys-libs/zlib virtual/libiconv + gnome-online-accounts? ( >=3Dnet-libs/gnome-online-accounts-3.1.1 >=3Dnet-libs/liboauth-0.9.4 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=3Dnet-nds/openldap-2 ) - ssl? ( - >=3Ddev-libs/nspr-4.4 - >=3Ddev-libs/nss-3.9 ) weather? ( >=3Ddev-libs/libgweather-2.90.0:2 ) " DEPEND=3D"${RDEPEND} @@ -57,7 +58,7 @@ DEPEND=3D"${RDEPEND} >=3Dgnome-base/gnome-common-2 >=3Ddev-util/gtk-doc-am-1.9 >=3Dsys-devel/gettext-0.17 - doc? ( >=3Ddev-util/gtk-doc-1.9 ) + doc? ( >=3Ddev-util/gtk-doc-1.14 ) vala? ( >=3Ddev-lang/vala-0.13.0:0.14[vapigen] )" # eautoreconf needs: # >=3Dgnome-base/gnome-common-2 @@ -72,6 +73,7 @@ pkg_setup() { DOCS=3D"ChangeLog MAINTAINERS NEWS TODO" # Uh, what to do about dbus-call-timeout ? G2CONF=3D"${G2CONF} + --disable-schemas-compile VALAC=3D$(type -P valac-0.14) VAPIGEN=3D$(type -P vapigen-0.14) $(use_enable gnome-online-accounts goa) @@ -79,13 +81,11 @@ 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-smime --with-libdb=3D${EPREFIX}/usr" } =20 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999= .ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.eb= uild index 40bea92..a7ec0be 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild @@ -21,31 +21,32 @@ if [[ ${PV} =3D 9999 ]]; then else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" fi -IUSE=3D"doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl= vala +weather" +IUSE=3D"doc +gnome-online-accounts +introspection ipv6 ldap kerberos val= a +weather" =20 # 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 slo= tted -RDEPEND=3D">=3Ddev-libs/glib-2.28:2 - >=3Dx11-libs/gtk+-3.0:3 +RDEPEND=3D">=3Ddev-libs/glib-2.30:2 + >=3Dx11-libs/gtk+-3.2:3 >=3Dgnome-base/gconf-2 >=3Ddev-db/sqlite-3.5 - >=3Ddev-libs/libgdata-0.9.1 + >=3Ddev-libs/libgdata-0.10 >=3Dgnome-base/gnome-keyring-2.20.1 >=3Ddev-libs/libical-0.43 >=3Dnet-libs/libsoup-2.31.2:2.4 >=3Ddev-libs/libxml2-2 >=3Dsys-libs/db-4 + >=3Ddev-libs/nspr-4.4 + >=3Ddev-libs/nss-3.9 + sys-libs/zlib virtual/libiconv + gnome-online-accounts? ( >=3Dnet-libs/gnome-online-accounts-3.1.1 >=3Dnet-libs/liboauth-0.9.4 ) introspection? ( >=3Ddev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=3Dnet-nds/openldap-2 ) - ssl? ( - >=3Ddev-libs/nspr-4.4 - >=3Ddev-libs/nss-3.9 ) weather? ( >=3Ddev-libs/libgweather-2.90.0:2 ) " DEPEND=3D"${RDEPEND} @@ -57,7 +58,7 @@ DEPEND=3D"${RDEPEND} >=3Dgnome-base/gnome-common-2 >=3Ddev-util/gtk-doc-am-1.9 >=3Dsys-devel/gettext-0.17 - doc? ( >=3Ddev-util/gtk-doc-1.9 ) + doc? ( >=3Ddev-util/gtk-doc-1.14 ) vala? ( >=3Ddev-lang/vala-0.13.0:0.14[vapigen] )" # eautoreconf needs: # >=3Dgnome-base/gnome-common-2 @@ -72,6 +73,7 @@ pkg_setup() { DOCS=3D"ChangeLog MAINTAINERS NEWS TODO" # Uh, what to do about dbus-call-timeout ? G2CONF=3D"${G2CONF} + --disable-schemas-compile VALAC=3D$(type -P valac-0.14) VAPIGEN=3D$(type -P vapigen-0.14) $(use_enable gnome-online-accounts goa) @@ -79,13 +81,11 @@ 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-smime --with-libdb=3D${EPREFIX}/usr" } =20 diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/ev= olution/evolution-3.3.91.ebuild similarity index 92% copy from mail-client/evolution/evolution-9999.ebuild copy to mail-client/evolution/evolution-3.3.91.ebuild index c780f83..95c29ce 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-3.3.91.ebuild @@ -28,13 +28,12 @@ IUSE=3D"clutter connman crypt doc +gnome-online-accou= nts gstreamer kerberos ldap m # password from inside evolution, bug 160302 PINENTRY_DEPEND=3D"|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt ap= p-crypt/pinentry[qt4] )" =20 -# contacts-map plugin requires libchaimplain and geoclue # glade-3 support is for maintainers only per configure.ac # mono plugin disabled as it's incompatible with 2.8 and lacks maintaina= nce (see bgo#634571) # pst is not mature enough and changes API/ABI frequently -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30:2 >=3Dx11-libs/cairo-1.9.15[glib] - >=3Dx11-libs/gtk+-3.0.2:3 + >=3Dx11-libs/gtk+-3.2.0:3 >=3Dgnome-base/gnome-desktop-2.91.3:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 >=3Ddev-libs/libgweather-2.90.0:2 @@ -48,7 +47,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 >=3Dnet-libs/libsoup-gnome-2.31.2:2.4 >=3Dx11-misc/shared-mime-info-0.22 >=3Dx11-themes/gnome-icon-theme-2.30.2.1 - >=3Ddev-libs/libgdata-0.9.1 + >=3Ddev-libs/libgdata-0.10 =20 x11-libs/libSM x11-libs/libICE @@ -68,8 +67,8 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 kerberos? ( virtual/krb5 ) ldap? ( >=3Dnet-nds/openldap-2 ) map? ( - >=3Dapp-misc/geoclue-0.11.1 - media-libs/libchamplain:0.10 ) + >=3Dapp-misc/geoclue-0.12.0 + >=3Dmedia-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.7 ) ssl? ( >=3Ddev-libs/nspr-4.6.1 @@ -84,7 +83,7 @@ DEPEND=3D"${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 >=3Dgnome-base/gnome-common-2.12 >=3Ddev-util/gtk-doc-am-1.9 - doc? ( >=3Ddev-util/gtk-doc-1.9 )" + doc? ( >=3Ddev-util/gtk-doc-1.14 )" # eautoreconf needs: # >=3Dgnome-base/gnome-common-2.12 # >=3Ddev-util/gtk-doc-am-1.9 @@ -102,6 +101,7 @@ pkg_setup() { DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" # image-inline plugin needs a gtk+:3 gtkimageview, which does not exist= yet G2CONF=3D"${G2CONF} + --disable-schemas-compile --without-glade-catalog --without-kde-applnk-path --enable-plugins=3Dexperimental @@ -143,10 +143,6 @@ pkg_setup() { } =20 src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=3D663077, requires eautore= conf - epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch" - [[ ${PV} !=3D 9999 ]] && eautoreconf - gnome2_src_prepare =20 # Fix compilation flags crazyness diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/ev= olution/evolution-9999.ebuild index c780f83..95c29ce 100644 --- a/mail-client/evolution/evolution-9999.ebuild +++ b/mail-client/evolution/evolution-9999.ebuild @@ -28,13 +28,12 @@ IUSE=3D"clutter connman crypt doc +gnome-online-accou= nts gstreamer kerberos ldap m # password from inside evolution, bug 160302 PINENTRY_DEPEND=3D"|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt ap= p-crypt/pinentry[qt4] )" =20 -# contacts-map plugin requires libchaimplain and geoclue # glade-3 support is for maintainers only per configure.ac # mono plugin disabled as it's incompatible with 2.8 and lacks maintaina= nce (see bgo#634571) # pst is not mature enough and changes API/ABI frequently -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30:2 >=3Dx11-libs/cairo-1.9.15[glib] - >=3Dx11-libs/gtk+-3.0.2:3 + >=3Dx11-libs/gtk+-3.2.0:3 >=3Dgnome-base/gnome-desktop-2.91.3:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 >=3Ddev-libs/libgweather-2.90.0:2 @@ -48,7 +47,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 >=3Dnet-libs/libsoup-gnome-2.31.2:2.4 >=3Dx11-misc/shared-mime-info-0.22 >=3Dx11-themes/gnome-icon-theme-2.30.2.1 - >=3Ddev-libs/libgdata-0.9.1 + >=3Ddev-libs/libgdata-0.10 =20 x11-libs/libSM x11-libs/libICE @@ -68,8 +67,8 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28:2 kerberos? ( virtual/krb5 ) ldap? ( >=3Dnet-nds/openldap-2 ) map? ( - >=3Dapp-misc/geoclue-0.11.1 - media-libs/libchamplain:0.10 ) + >=3Dapp-misc/geoclue-0.12.0 + >=3Dmedia-libs/libchamplain-0.12:0.12 ) networkmanager? ( >=3Dnet-misc/networkmanager-0.7 ) ssl? ( >=3Ddev-libs/nspr-4.6.1 @@ -84,7 +83,7 @@ DEPEND=3D"${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2 >=3Dgnome-base/gnome-common-2.12 >=3Ddev-util/gtk-doc-am-1.9 - doc? ( >=3Ddev-util/gtk-doc-1.9 )" + doc? ( >=3Ddev-util/gtk-doc-1.14 )" # eautoreconf needs: # >=3Dgnome-base/gnome-common-2.12 # >=3Ddev-util/gtk-doc-am-1.9 @@ -102,6 +101,7 @@ pkg_setup() { DOCS=3D"AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" # image-inline plugin needs a gtk+:3 gtkimageview, which does not exist= yet G2CONF=3D"${G2CONF} + --disable-schemas-compile --without-glade-catalog --without-kde-applnk-path --enable-plugins=3Dexperimental @@ -143,10 +143,6 @@ pkg_setup() { } =20 src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=3D663077, requires eautore= conf - epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch" - [[ ${PV} !=3D 9999 ]] && eautoreconf - gnome2_src_prepare =20 # Fix compilation flags crazyness diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutt= er-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clu= tter-gtk.patch deleted file mode 100644 index 6df8f2b..0000000 --- a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.= patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 31 Oct 2011 02:15:54 -0400 -Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES= :q - -clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter= -gtk; -clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gt= k - -To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used, --I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1= .0 -in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.= 0 -in PKG_CHECK_MODULES. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D663077 ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5c2c5ed..b5c74ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter], - AC_MSG_RESULT($with_clutter) -=20 - if test "x$with_clutter" =3D "xyes"; then -- PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >=3D clutter_gtk_= minimum_version clutter-1.0 >=3D 1.0.0]) -+ PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >=3D clutter_gtk_minimum= _version mx-1.0 clutter-1.0 >=3D 1.0.0]) -=20 - AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available]) - AM_CONDITIONAL(ENABLE_CLUTTER, true) ---=20 -1.7.7.1 -