summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-22 10:57:17 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-22 10:57:17 +0000
commite970e0f2c4e5322fb9051f403cc1d90776c6265b (patch)
tree66626c76a04ea3247d9adc083cc5516089e8ce7e /eclass/xfconf.eclass
parentRemove call to intltoolize within xfconf.eclass because autotools.eclass has ... (diff)
downloadgentoo-2-e970e0f2c4e5322fb9051f403cc1d90776c6265b.tar.gz
gentoo-2-e970e0f2c4e5322fb9051f403cc1d90776c6265b.tar.bz2
gentoo-2-e970e0f2c4e5322fb9051f403cc1d90776c6265b.zip
Punt support for running intltoolize --force --copy --automake, because autotools.eclass will do this now for us.
Diffstat (limited to 'eclass/xfconf.eclass')
-rw-r--r--eclass/xfconf.eclass14
1 files changed, 1 insertions, 13 deletions
diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
index 9cf0b5bf0ac5..acc7cb1e66b1 100644
--- a/eclass/xfconf.eclass
+++ b/eclass/xfconf.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.40 2012/01/16 21:14:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.41 2012/05/22 10:57:17 ssuominen Exp $
# @ECLASS: xfconf.eclass
# @MAINTAINER:
@@ -13,10 +13,6 @@
# @DESCRIPTION:
# Run eautoreconf instead of elibtoolize if the variable is set
-# @ECLASS-VARIABLE: EINTLTOOLIZE
-# @DESCRIPTION:
-# Run intltoolize --force --copy --automake if the variable is set
-
# @ECLASS-VARIABLE: XFCONF
# @DESCRIPTION:
# This should be an array defining arguments for econf
@@ -35,7 +31,6 @@ _xfconf_deps=""
_xfconf_m4=">=dev-util/xfce4-dev-tools-4.9.1 ${AUTOTOOLS_DEPEND}"
[[ -n $_xfconf_live ]] && _xfconf_deps+=" dev-util/gtk-doc ${_xfconf_m4}"
-[[ -n $EINTLTOOLIZE ]] && _xfconf_deps+=" dev-util/intltool"
[[ -n $EAUTORECONF ]] && _xfconf_deps+=" ${_xfconf_m4}"
RDEPEND=""
@@ -88,13 +83,6 @@ xfconf_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
base_src_prepare
- if [[ -n $EINTLTOOLIZE ]]; then
- local _intltoolize="intltoolize --force --copy --automake"
- ebegin "Running ${_intltoolize}"
- ${_intltoolize} || die
- eend $?
- fi
-
if [[ -n $EAUTORECONF ]]; then
AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eautoreconf
else