media-libs/harfbuzz: Fix build issues with XDG vars also in stable

Package-Manager: portage-2.2.27

diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
index 3ac3b49a16f35b594c13c6c5ca0d53f14887c6b7..c4ee879207818c1adc834213fe96486d1573a167 100644 (file)
--- a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils libtool multilib-minimal python-any-r1
+inherit eutils libtool multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -49,6 +49,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+       xdg_environment_reset
+
        if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
                # on Darwin/Solaris we need to link with g++, like automake defaults
                # to, but overridden by upstream because on Linux this is not

diff --git a/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
index abb968aa8b77aec9ec1d45a0354f7106d87cc454..e643e411133c5649a6c0d824697e7f165d232251 100644 (file)
--- a/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.2.3.ebuild
@@ -51,6 +51,8 @@ pkg_setup() {
 src_prepare() {
        default
 
+       xdg_environment_reset
+
        if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
                # on Darwin/Solaris we need to link with g++, like automake defaults
                # to, but overridden by upstream because on Linux this is not
@@ -74,7 +76,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-       xdg_environment_reset
        ECONF_SOURCE="${S}" \
        # harfbuzz-gobject only used for instrospection, bug #535852
        econf \

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index abb968aa8b77aec9ec1d45a0354f7106d87cc454..e643e411133c5649a6c0d824697e7f165d232251 100644 (file)
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -51,6 +51,8 @@ pkg_setup() {
 src_prepare() {
        default
 
+       xdg_environment_reset
+
        if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
                # on Darwin/Solaris we need to link with g++, like automake defaults
                # to, but overridden by upstream because on Linux this is not
@@ -74,7 +76,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-       xdg_environment_reset
        ECONF_SOURCE="${S}" \
        # harfbuzz-gobject only used for instrospection, bug #535852
        econf \