| 1 |
commit: 182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 10:44:07 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 11:08:27 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182bf1f7 |
| 7 |
|
| 8 |
media-libs/harfbuzz: Fix build issues with XDG vars also in stable |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
media-libs/harfbuzz/harfbuzz-1.1.3.ebuild | 4 +++- |
| 13 |
media-libs/harfbuzz/harfbuzz-1.2.3.ebuild | 3 ++- |
| 14 |
media-libs/harfbuzz/harfbuzz-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 7 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild |
| 18 |
index 3ac3b49..c4ee879 100644 |
| 19 |
--- a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild |
| 20 |
+++ b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild |
| 21 |
@@ -9,7 +9,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz" |
| 22 |
|
| 23 |
PYTHON_COMPAT=( python2_7 ) |
| 24 |
|
| 25 |
-inherit eutils libtool multilib-minimal python-any-r1 |
| 26 |
+inherit eutils libtool multilib-minimal python-any-r1 xdg-utils |
| 27 |
|
| 28 |
DESCRIPTION="An OpenType text shaping engine" |
| 29 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz" |
| 30 |
@@ -49,6 +49,8 @@ pkg_setup() { |
| 31 |
} |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
+ xdg_environment_reset |
| 35 |
+ |
| 36 |
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then |
| 37 |
# on Darwin/Solaris we need to link with g++, like automake defaults |
| 38 |
# to, but overridden by upstream because on Linux this is not |
| 39 |
|
| 40 |
diff --git a/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild |
| 41 |
index abb968a..e643e41 100644 |
| 42 |
--- a/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild |
| 43 |
+++ b/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild |
| 44 |
@@ -51,6 +51,8 @@ pkg_setup() { |
| 45 |
src_prepare() { |
| 46 |
default |
| 47 |
|
| 48 |
+ xdg_environment_reset |
| 49 |
+ |
| 50 |
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then |
| 51 |
# on Darwin/Solaris we need to link with g++, like automake defaults |
| 52 |
# to, but overridden by upstream because on Linux this is not |
| 53 |
@@ -74,7 +76,6 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
multilib_src_configure() { |
| 57 |
- xdg_environment_reset |
| 58 |
ECONF_SOURCE="${S}" \ |
| 59 |
# harfbuzz-gobject only used for instrospection, bug #535852 |
| 60 |
econf \ |
| 61 |
|
| 62 |
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 63 |
index abb968a..e643e41 100644 |
| 64 |
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 65 |
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild |
| 66 |
@@ -51,6 +51,8 @@ pkg_setup() { |
| 67 |
src_prepare() { |
| 68 |
default |
| 69 |
|
| 70 |
+ xdg_environment_reset |
| 71 |
+ |
| 72 |
if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then |
| 73 |
# on Darwin/Solaris we need to link with g++, like automake defaults |
| 74 |
# to, but overridden by upstream because on Linux this is not |
| 75 |
@@ -74,7 +76,6 @@ src_prepare() { |
| 76 |
} |
| 77 |
|
| 78 |
multilib_src_configure() { |
| 79 |
- xdg_environment_reset |
| 80 |
ECONF_SOURCE="${S}" \ |
| 81 |
# harfbuzz-gobject only used for instrospection, bug #535852 |
| 82 |
econf \ |
Archives