From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 808381388C0 for ; Sun, 28 Feb 2016 11:09:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BF3B21C090; Sun, 28 Feb 2016 11:09:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9CADF21C07C for ; Sun, 28 Feb 2016 11:09:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFDAC340B46 for ; Sun, 28 Feb 2016 11:09:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A6841CEB for ; Sun, 28 Feb 2016 11:09:10 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1456657707.182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/harfbuzz-1.1.3.ebuild media-libs/harfbuzz/harfbuzz-1.2.3.ebuild media-libs/harfbuzz/harfbuzz-9999.ebuild X-VCS-Directories: media-libs/harfbuzz/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e X-VCS-Branch: master Date: Sun, 28 Feb 2016 11:09:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ed7025b-9b06-4313-bb07-17c4c17c019e X-Archives-Hash: 415f34135848f8f3766b3300f79ede73 commit: 182bf1f7b8b4fe2f9f7a891ab4e5934f6fb89b4e Author: Pacho Ramos gentoo org> AuthorDate: Sun Feb 28 10:44:07 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Feb 28 11:08:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182bf1f7 media-libs/harfbuzz: Fix build issues with XDG vars also in stable Package-Manager: portage-2.2.27 media-libs/harfbuzz/harfbuzz-1.1.3.ebuild | 4 +++- media-libs/harfbuzz/harfbuzz-1.2.3.ebuild | 3 ++- media-libs/harfbuzz/harfbuzz-9999.ebuild | 3 ++- 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 3ac3b49..c4ee879 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 abb968a..e643e41 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 abb968a..e643e41 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 \