summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-02-28 11:44:07 +0100
committerPacho Ramos <pacho@gentoo.org>2016-02-28 12:08:27 +0100
commit182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e (patch)
treeab6e407b4cb5a8f67c7540468084b959e5a02997
parentx11-libs/gdk-pixbuf: Drop old (diff)
downloadgentoo-182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e.tar.gz
gentoo-182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e.tar.bz2
gentoo-182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e.zip
media-libs/harfbuzz: Fix build issues with XDG vars also in stable
Package-Manager: portage-2.2.27
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.1.3.ebuild4
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.2.3.ebuild3
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild3
3 files changed, 7 insertions, 3 deletions
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
index 3ac3b49a16f3..c4ee87920781 100644
--- 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 abb968aa8b77..e643e411133c 100644
--- 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 abb968aa8b77..e643e411133c 100644
--- 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 \