commit: 09044cf7d9a3d193eb960158c722fb7877893573
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 11:07:45 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 13:32:58 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=09044cf7
gnome-extra/evolution-data-server: multiple ebuild updates
* Sync with gentoo-x86 (pypy).
* Move cppflags changes to src_configure, where it belongs.
* Attempt at killing fix-la-relink, it looks like ELTCONF=--reverse-deps
applies patches that are appropriate to fix this issue at its root.
Please someone double check as it appears to do the job for me.
---
.../evolution-data-server-3.12.0.ebuild | 27 +++++++++++-----------
.../evolution-data-server-9999.ebuild | 23 ++++++++----------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git
a/gnome-extra/evolution-data-server/evolution-data-server-3.12.0.ebuild
b/gnome-extra/evolution-data-server/evolution-data-server-3.12.0.ebuild
index 9fa33dd..386fbbc 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
@@ -60,7 +60,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-util/fix-la-relink-command
dev-util/gperf
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.35.5
@@ -77,17 +76,21 @@ if [[ ${PV} = 9999 ]]; then
"
fi
+# Some tests fail due to missings locales.
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
pkg_setup() {
python-any-r1_pkg_setup
}
src_prepare() {
use vala && vala_src_prepare
- gnome2_src_prepare
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
+ # Fix relink issues in src_install
+ ELTCONF="--reverse-deps"
+
+ gnome2_src_prepare
# FIXME: Fix compilation flags crazyness
sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
@@ -95,6 +98,10 @@ src_prepare() {
}
src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ append-cppflags "-I$(db_includedir)"
+
# phonenumber does not exist in tree
gnome2_src_configure \
$(use_enable api-doc-extras gtk-doc) \
@@ -117,12 +124,6 @@ src_configure() {
}
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.
- fix-la-relink-command . || die "fix-la-relink-command failed"
gnome2_src_install
if use ldap; then
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 9fa33dd..ca6ce40 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="no"
# python3 not really supported, bug #478678
-PYTHON_COMPAT=( python2_7 pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
@@ -60,7 +60,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- dev-util/fix-la-relink-command
dev-util/gperf
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.35.5
@@ -83,11 +82,11 @@ pkg_setup() {
src_prepare() {
use vala && vala_src_prepare
- gnome2_src_prepare
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
+ # Fix relink issues in src_install
+ ELTCONF="--reverse-deps"
+
+ gnome2_src_prepare
# FIXME: Fix compilation flags crazyness
sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
@@ -95,6 +94,10 @@ src_prepare() {
}
src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ append-cppflags "-I$(db_includedir)"
+
# phonenumber does not exist in tree
gnome2_src_configure \
$(use_enable api-doc-extras gtk-doc) \
@@ -117,12 +120,6 @@ src_configure() {
}
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.
- fix-la-relink-command . || die "fix-la-relink-command failed"
gnome2_src_install
if use ldap; then
