public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/
@ 2011-07-08  4:34 Alexandre Restovtsev
  0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-08  4:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d33e650246fca7033d3cdcc61a2f0c223566c9cf
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 03:01:34 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul  8 03:01:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d33e6502

gnome-extra/evolution-data-server: 3.0.2.1 → 3.1.3

Bump to gnome-3.1.x version, update dependencies, add a new
gnome-online-accounts USE flag (on by default, since
gnome-online-accounts is pulled in by gnome-control-center anyway, and
since most people would want to use their gmail contacts in evolution).

---
 ...1.ebuild => evolution-data-server-3.1.3.ebuild} |   12 +++++++---
 .../evolution-data-server-9999.ebuild              |   22 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.1.3.ebuild
similarity index 93%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.1.3.ebuild
index a0f7224..313d13d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.1-r1.ebuild,v 1.4 2011/01/15 19:55:02 nirbheek Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc +introspection ipv6 ldap kerberos ssl +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl +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
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0:3
 	>=gnome-base/gconf-2
 	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.7.0
+	>=dev-libs/libgdata-0.9.1
 	>=gnome-base/gnome-keyring-2.20.1
 	>=dev-libs/libical-0.43
 	>=net-libs/libsoup-2.31.2:2.4
@@ -37,6 +37,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.1.1
+		>=net-libs/liboauth-0.9.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
@@ -60,12 +63,13 @@ DEPEND="${RDEPEND}
 #	>=dev-util/gtk-doc-am-1.9
 
 # FIXME
-RESTRIC="test"
+RESTRICT="test"
 
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
+		$(use_enable gnome-online-accounts goa)
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 /usr)
 		$(use_with ldap openldap)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 0266646..313d13d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.1-r1.ebuild,v 1.4 2011/01/15 19:55:02 nirbheek Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc +introspection ipv6 ldap kerberos ssl +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl +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
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0:3
 	>=gnome-base/gconf-2
 	>=dev-db/sqlite-3.5
-	>=dev-libs/libgdata-0.7.0
+	>=dev-libs/libgdata-0.9.1
 	>=gnome-base/gnome-keyring-2.20.1
 	>=dev-libs/libical-0.43
 	>=net-libs/libsoup-2.31.2:2.4
@@ -37,6 +37,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=sys-libs/db-4
 	sys-libs/zlib
 	virtual/libiconv
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.1.1
+		>=net-libs/liboauth-0.9.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-2 )
@@ -46,6 +49,7 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	weather? ( >=dev-libs/libgweather-2.90.0:2 )
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	dev-util/gperf
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35.5
@@ -59,12 +63,13 @@ DEPEND="${RDEPEND}
 #	>=dev-util/gtk-doc-am-1.9
 
 # FIXME
-RESTRIC="test"
+RESTRICT="test"
 
 pkg_setup() {
 	DOCS="ChangeLog MAINTAINERS NEWS TODO"
 	# Uh, what to do about dbus-call-timeout ?
 	G2CONF="${G2CONF}
+		$(use_enable gnome-online-accounts goa)
 		$(use_enable ipv6)
 		$(use_with kerberos krb5 /usr)
 		$(use_with ldap openldap)
@@ -78,8 +83,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# WTF: libebook-1.2 links against system libcamel-1.2
-	#      libedata-book-1.2 links against system libebackend-1.2
 	gnome2_src_prepare
 
 	# Adjust to gentoo's /etc/service
@@ -107,6 +110,13 @@ src_prepare() {
 }
 
 src_install() {
+	# Prevent this evolution-data-server from linking to libs in the installed
+	# evolution-data-server libraries by adding -L arguments for build dirs to
+	# every .la file's relink_command field, forcing libtool to look there
+	# first during relinking. This will mangle the .la files installed by
+	# make install, but we don't care because we will be punting them anyway.
+	perl "${FILESDIR}/fix_relink_command.pl" . ||
+		die "fix_relink_command.pl failed"
 	gnome2_src_install
 
 	if use ldap; then



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/
@ 2011-08-13 21:33 Alexandre Restovtsev
  0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-13 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     b7dd1532cd1736154c640e16c72c9c234d1a8fc4
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 19:48:33 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Aug 13 19:48:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b7dd1532

gnome-extra/evolution-data-server: add support for building vala bindings

Add USE=vala for building vala bindings; needed for folks-0.6.

---
 .../evolution-data-server-3.1.4.ebuild             |   12 ++++++++++--
 .../evolution-data-server-9999.ebuild              |   12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild
index 6f57799..3654118 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl 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
@@ -57,11 +57,14 @@ DEPEND="${RDEPEND}
 	>=gnome-base/gnome-common-2
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
 #	>=dev-util/gtk-doc-am-1.9
 
+REQUIRED_USE="vala? ( introspection )"
+
 # FIXME
 RESTRICT="test"
 
@@ -75,11 +78,16 @@ pkg_setup() {
 		$(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
 		--with-libdb=/usr"
+	if use vala; then
+		G2CONF="${G2CONF}
+			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"
+	fi
 }
 
 src_prepare() {

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 6f57799..3654118 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl 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
@@ -57,11 +57,14 @@ DEPEND="${RDEPEND}
 	>=gnome-base/gnome-common-2
 	>=dev-util/gtk-doc-am-1.9
 	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2
 #	>=dev-util/gtk-doc-am-1.9
 
+REQUIRED_USE="vala? ( introspection )"
+
 # FIXME
 RESTRICT="test"
 
@@ -75,11 +78,16 @@ pkg_setup() {
 		$(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
 		--with-libdb=/usr"
+	if use vala; then
+		G2CONF="${G2CONF}
+			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"
+	fi
 }
 
 src_prepare() {



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/
@ 2011-08-15  1:07 Alexandre Restovtsev
  0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-15  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     781f3af4cdc097507efe17e47877d8c3e87259af
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 14 21:38:34 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 14 21:45:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=781f3af4

gnome-extra/evolution-data-server: 3.1.4 → 3.1.5

Version bump with numerous bugfixes. Make sure to call configure with
--disable-maintainer-mode and use ${EROOT} for specifyfing db and
kerberos systemwide library locations.

---
 ...4.ebuild => evolution-data-server-3.1.5.ebuild} |    5 +++--
 .../evolution-data-server-9999.ebuild              |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.1.5.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.1.5.ebuild
index 3654118..462d287 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.1.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.1.5.ebuild
@@ -74,7 +74,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
+		$(use_with kerberos krb5 ${EROOT}usr)
 		$(use_with ldap openldap)
 		$(use_enable ssl ssl)
 		$(use_enable ssl smime)
@@ -83,7 +83,8 @@ pkg_setup() {
 		--enable-calendar
 		--enable-nntp
 		--enable-largefile
-		--with-libdb=/usr"
+		--with-libdb=${EROOT}usr
+		--disable-maintainer-mode"
 	if use vala; then
 		G2CONF="${G2CONF}
 			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 3654118..462d287 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -74,7 +74,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable ipv6)
-		$(use_with kerberos krb5 /usr)
+		$(use_with kerberos krb5 ${EROOT}usr)
 		$(use_with ldap openldap)
 		$(use_enable ssl ssl)
 		$(use_enable ssl smime)
@@ -83,7 +83,8 @@ pkg_setup() {
 		--enable-calendar
 		--enable-nntp
 		--enable-largefile
-		--with-libdb=/usr"
+		--with-libdb=${EROOT}usr
+		--disable-maintainer-mode"
 	if use vala; then
 		G2CONF="${G2CONF}
 			VALAC=$(type -P valac-0.14) VAPIGEN=$(type -P vapigen-0.14)"



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-08-15  1:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-15  1:07 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/evolution-data-server/ Alexandre Restovtsev
  -- strict thread matches above, loose matches on Subject: below --
2011-08-13 21:33 Alexandre Restovtsev
2011-07-08  4:34 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox