Upstream patch to support LT_PREREQ and LT_INIT libtool syntax.

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

3 files changed, 78 insertions, 1 deletions

diff --git a/dev-util/xfce4-dev-tools/ChangeLog b/dev-util/xfce4-dev-tools/ChangeLog
index 3513ba038ebe..d1262a39af5a 100644
--- a/dev-util/xfce4-dev-tools/ChangeLog
+++ b/dev-util/xfce4-dev-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/xfce4-dev-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xfce4-dev-tools/ChangeLog,v 1.45 2011/10/15 11:53:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xfce4-dev-tools/ChangeLog,v 1.46 2011/11/18 21:23:27 ssuominen Exp $
+
+*xfce4-dev-tools-4.9.0-r1 (18 Nov 2011)
+
+  18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-dev-tools-4.9.0-r1.ebuild,
+  +files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch:
+  Upstream patch to support LT_PREREQ and LT_INIT libtool syntax.
 
 *xfce4-dev-tools-4.9.0 (15 Oct 2011)
 
diff --git a/dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch b/dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch
new file mode 100644
index 000000000000..763515533c26
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch
@@ -0,0 +1,50 @@
+From 56cde58238898e5659c39f5e713ee0362ba772d9 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Thu, 03 Nov 2011 18:27:32 +0000
+Subject: Add support for LT_PREREQ (bug #6920).
+
+Support LT_PREREQ as the new alternative of AC_PROG_LIBTOOL. If
+the latter is used, show a message with information how to switch
+to LT_PREREQ.
+---
+diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in
+index a7dbd3f..0ba203f 100644
+--- a/scripts/xdt-autogen.in.in
++++ b/scripts/xdt-autogen.in.in
+@@ -415,7 +415,25 @@ if test -z "${XDT_PROG_LIBTOOLIZE}"; then
+   fi
+ fi
+ for configure_ac_file in $CONFIGURE_AC_FILES; do
++  runlibtoolize=0
+   if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
++  cat >&2 <<EOF
++xdt-autogen: It is recommended to use LT_PREREQ([2.2.6]) and
++             LT_INIT([disable-static]) in your configure.ac
++             file and remove AC_PROG_LIBTOOL and AC_DISABLE_STATIC.
++
++             See http://bugzilla.xfce.org/show_bug.cgi?id=6920 for
++             more information.
++
++EOF
++    runlibtoolize=1
++  fi;
++
++  if grep -q "^LT_PREREQ" "${configure_ac_file}"; then
++    runlibtoolize=1
++  fi;
++
++  if test $runlibtoolize -eq 1; then
+     (${XDT_PROG_LIBTOOLIZE} --version) </dev/null >/dev/null 2>&0 || {
+       cat >&2 <<EOF
+ xdt-autogen: You must have "libtool" installed on your system.
+@@ -608,7 +626,7 @@ XGETTEXT_ARGS = @XGETTEXT_ARGS@
+     fi
+   fi
+ 
+-  if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then
++  if grep -q -e "^AC_PROG_LIBTOOL" -e "^LT_PREREQ" "${configure_ac_file}"; then
+     (echo "Running ${XDT_PROG_LIBTOOLIZE} --force --copy..." &&
+      cd "${source_dir}" &&
+      ${XDT_PROG_LIBTOOLIZE} --force --copy) || exit 1
+--
+cgit 
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.9.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.9.0-r1.ebuild
new file mode 100644
index 000000000000..cf84d76de772
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.9.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.9.0-r1.ebuild,v 1.1 2011/11/18 21:23:27 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="Xfce's build scripts and aclocal macros"
+HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/4.9/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-update_libtool_syntax.patch )
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+}