Upstream patch to support LT_PREREQ and LT_INIT libtool syntax.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 89 insertions, 6 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/Manifest b/dev-util/xfce4-dev-tools/Manifest
index e3c32cc31bce..8151770aebcc 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX xfce4-dev-tools-4.9.0-update_libtool_syntax.patch 1704 RMD160 b1135d567728ffb3f3c4f8575fdfe004eb3dc124 SHA1 4675b0c8b75d1c0de349f56fea4a373dff2a3593 SHA256 4ad89e92b36c9b7a264efbfa340ccdbad8ad6565d9fbdcf928ea47d479585bf5
 DIST xfce4-dev-tools-4.8.0.tar.bz2 77707 RMD160 0a93a39ad132b61ce29fbbc8525ceb3baaf47496 SHA1 50b26c72444c750e4d0942b54746c0224561d4ee SHA256 7a1457e9dc839cb121a48e5c53c483ce02a3a5dbaf09376794a13bafe4194815
 DIST xfce4-dev-tools-4.9.0.tar.bz2 281838 RMD160 6f41fcfb5455544eec7ef68d9bc1544e741e4853 SHA1 44faee73303cdbbccbbda253c69520da5ab20fca SHA256 0673328e2dadcf21c086f03231897e48c6147d01421be91d9e56aa09586b266a
 EBUILD xfce4-dev-tools-4.8.0.ebuild 690 RMD160 f2f658f72a9f4b4b4190d04e1cf5d060c334a59a SHA1 e5a50fcbb018e41fdea6f0ce5de17a959cc82056 SHA256 e0600144a2e7642b9895edf113ba7b922898418ab2ab4d85a9b35b07c6aaba58
+EBUILD xfce4-dev-tools-4.9.0-r1.ebuild 762 RMD160 64b007272bfa29cecede42768b50f3f63af72480 SHA1 ee6d5dfd91d8b32dd44abd8ba21cd6cd9c51fed3 SHA256 f78a9f39fbbec46464849a873d97de3418d026384c6bcbb097e6684c99176154
 EBUILD xfce4-dev-tools-4.9.0.ebuild 697 RMD160 9bf9a1eb524beb7d0d7710b231a7e4202d299b5e SHA1 2725fbb94b85ca0761f4d51cdc8a775ec18d5d12 SHA256 8604905e43768e3bf7b0d9277852077cab72b6bdd73e7dbb466a5658bc325918
-MISC ChangeLog 7163 RMD160 f4099ae0e0aac8e2436ee14d36fd687ce2a3b554 SHA1 5553a6603a13a9e4634d77a43a30640dcf689b9a SHA256 50221cb54243603ed63bb85dcaf7aa0fa88f21687ae93eb58b28577887d716d5
+MISC ChangeLog 7423 RMD160 cccdf464c9e8489e3e11a73077b211d48e9b6c1b SHA1 fc60381f9c24655adc3725d053b1e74f9eacfce5 SHA256 5ba91f27f4ae17b81368be7c891ab37cdac6d13d407a2bd56e66e4e9eaf10f56
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6ZdEUACgkQmWq1bYTyC0PkVQEAvRAuIWF4x1JpV/oaIcLW54L1
-qe0OEZeULyRjoLVyq44A/2B1Q3V3rkD0lWbPYGqJ+j/EJzqQuMYG/vQYySR89aUi
-=szx8
+iQEcBAEBAgAGBQJOxsxwAAoJEEdUh39IaPFNoGsH/39GyyK9+MWpR34htDYf3tZQ
+T7kA/i8jzRrBHxz+MdSF1l9W1ypi6gp3CIeoZ+s2SU3DU3mpkeJhrKHTdZqnGyeU
+0wWm1P+OgZIMqK49pkCcsxLddFLmhDcjuT8E6jVdvx9qewVtSqIVhX/tZR1hCSsp
+drN5o234xDkfO6A3NlQ6WhNPo9qej7TZv2hwuA0uHScDWLj2X1i3BfO6fHRPl3hy
+shL9O7Eq2Q2ZlKsReB6KjRsp174y/hTUJ+LATP34tbAcCDA9iym7ufiUSxEZFQXY
+Kti5zwXgmiUr2WoeOt/L4ikcOMZNpzZwDT+f1YS2edvT0tAMotd1fuQlAv7CPZA=
+=n8b5
 -----END PGP SIGNATURE-----
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 )
+}