| 1 |
commit: 19d23249c91cbcf4b4738c3dfb1e69272ecd0b9f |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 13:46:47 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 13:46:47 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=19d23249 |
| 7 |
|
| 8 |
mail-client/evolution: Adapt to new GNOME Team policies |
| 9 |
|
| 10 |
--- |
| 11 |
mail-client/evolution/evolution-3.7.91.ebuild | 10 ++++------ |
| 12 |
mail-client/evolution/evolution-9999.ebuild | 10 ++++------ |
| 13 |
2 files changed, 8 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/mail-client/evolution/evolution-3.7.91.ebuild b/mail-client/evolution/evolution-3.7.91.ebuild |
| 16 |
index b1f7635..c341de0 100644 |
| 17 |
--- a/mail-client/evolution/evolution-3.7.91.ebuild |
| 18 |
+++ b/mail-client/evolution/evolution-3.7.91.ebuild |
| 19 |
@@ -101,10 +101,6 @@ src_prepare() { |
| 20 |
ELTCONF="--reverse-deps" |
| 21 |
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" |
| 22 |
|
| 23 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
| 24 |
- -i data/org.gnome.evolution.spamassassin.gschema.xml.in \ |
| 25 |
- -i modules/spamassassin/evolution-spamassassin.c || die "sed failed" |
| 26 |
- |
| 27 |
gnome2_src_prepare |
| 28 |
|
| 29 |
# Fix compilation flags crazyness |
| 30 |
@@ -115,7 +111,8 @@ src_prepare() { |
| 31 |
src_configure() { |
| 32 |
# Use NSS/NSPR only if 'ssl' is enabled. |
| 33 |
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet |
| 34 |
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 35 |
+ local myconf |
| 36 |
+ [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" |
| 37 |
gnome2_src_configure \ |
| 38 |
--disable-schemas-compile \ |
| 39 |
--without-glade-catalog \ |
| 40 |
@@ -137,7 +134,8 @@ src_configure() { |
| 41 |
--without-nspr-includes |
| 42 |
--without-nss-libs |
| 43 |
--without-nss-includes") \ |
| 44 |
- $(use_enable weather) |
| 45 |
+ $(use_enable weather) \ |
| 46 |
+ ${myconf} |
| 47 |
} |
| 48 |
|
| 49 |
pkg_postinst() { |
| 50 |
|
| 51 |
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild |
| 52 |
index b1f7635..c341de0 100644 |
| 53 |
--- a/mail-client/evolution/evolution-9999.ebuild |
| 54 |
+++ b/mail-client/evolution/evolution-9999.ebuild |
| 55 |
@@ -101,10 +101,6 @@ src_prepare() { |
| 56 |
ELTCONF="--reverse-deps" |
| 57 |
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" |
| 58 |
|
| 59 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
| 60 |
- -i data/org.gnome.evolution.spamassassin.gschema.xml.in \ |
| 61 |
- -i modules/spamassassin/evolution-spamassassin.c || die "sed failed" |
| 62 |
- |
| 63 |
gnome2_src_prepare |
| 64 |
|
| 65 |
# Fix compilation flags crazyness |
| 66 |
@@ -115,7 +111,8 @@ src_prepare() { |
| 67 |
src_configure() { |
| 68 |
# Use NSS/NSPR only if 'ssl' is enabled. |
| 69 |
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet |
| 70 |
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
| 71 |
+ local myconf |
| 72 |
+ [[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)" |
| 73 |
gnome2_src_configure \ |
| 74 |
--disable-schemas-compile \ |
| 75 |
--without-glade-catalog \ |
| 76 |
@@ -137,7 +134,8 @@ src_configure() { |
| 77 |
--without-nspr-includes |
| 78 |
--without-nss-libs |
| 79 |
--without-nss-includes") \ |
| 80 |
- $(use_enable weather) |
| 81 |
+ $(use_enable weather) \ |
| 82 |
+ ${myconf} |
| 83 |
} |
| 84 |
|
| 85 |
pkg_postinst() { |
Archives