summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-07-02 17:42:17 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-07-02 17:42:17 +0000
commitc507e068b44ff0aa0eec63ff0188ff9d8fa88b26 (patch)
tree1045971eb2794625431b372cc78887f90f6744d0 /xfce-extra
parentReally fix encoding issue (missing 'inherit base' led to unpatched sources). ... (diff)
downloadgentoo-2-c507e068b44ff0aa0eec63ff0188ff9d8fa88b26.tar.gz
gentoo-2-c507e068b44ff0aa0eec63ff0188ff9d8fa88b26.tar.bz2
gentoo-2-c507e068b44ff0aa0eec63ff0188ff9d8fa88b26.zip
Stop using eautoreconf to avoid glib-gettextize and call intltoolize, _elibtoolize, eaclocal, eautoconf, eautoheader and eautomake by hand wrt #424531
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'xfce-extra')
-rw-r--r--xfce-extra/xfce4-quicklauncher-plugin/ChangeLog8
-rw-r--r--xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild16
2 files changed, 20 insertions, 4 deletions
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog b/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
index b64f7278dd20..8d5eebbbc012 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
+++ b/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for xfce-extra/xfce4-quicklauncher-plugin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog,v 1.12 2012/05/22 10:52:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/ChangeLog,v 1.13 2012/07/02 17:42:17 ssuominen Exp $
+
+ 02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-quicklauncher-plugin-1.9.4-r1.ebuild:
+ Stop using eautoreconf to avoid glib-gettextize and call intltoolize,
+ _elibtoolize, eaclocal, eautoconf, eautoheader and eautomake by hand wrt
+ #424531
22 May 2012; Samuli Suominen <ssuominen@gentoo.org>
xfce4-quicklauncher-plugin-1.9.4-r1.ebuild:
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
index ce22d1541c12..0decff4ec6d1 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild,v 1.12 2012/05/22 10:52:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild,v 1.13 2012/07/02 17:42:17 ssuominen Exp $
EAPI=4
-EAUTORECONF=yes
-inherit xfconf
+#EAUTORECONF=yes
+inherit autotools xfconf
DESCRIPTION="A quicklauncher plug-in for the Xfce panel"
HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-quicklauncher-plugin"
@@ -19,6 +19,7 @@ RDEPEND=">=xfce-base/xfce4-panel-4.8
>=xfce-base/libxfcegui4-4.8"
DEPEND="${RDEPEND}
dev-util/intltool
+ >=dev-util/xfce4-dev-tools-4.8
virtual/pkgconfig"
pkg_setup() {
@@ -36,5 +37,14 @@ src_prepare() {
-e "/^AC_INIT/s/quicklauncher_version()/quicklauncher_version/" \
configure.ac || die
+ # Prevent glib-gettextize from running wrt #423115
+ intltoolize --automake --copy --force
+ _elibtoolize --copy --force --install
+ AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
+ eaclocal
+ eautoconf
+ eautoheader
+ eautomake
+
xfconf_src_prepare
}