Add fix for bug #240097 by running LT_OUTPUT earlier in configure(before the check for socket.h). Thanks to Ivan Ivanich for reporting and Mart Raudsepp for hints on the fix.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.25.9 x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index d22e4e6a68aa..b2c5f44b66aa 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.112 2008/08/25 13:08:29 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.113 2008/10/14 19:10:55 gentoofan23 Exp $
+
+  14 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/jabberd-1.6.1.1-libtool2.2.patch, jabberd-1.6.1.1-r1.ebuild:
+  Add fix for bug #240097 by running LT_OUTPUT earlier in configure(before the
+  check for socket.h). Thanks to Ivan Ivanich for reporting and Mart Raudsepp
+  for hints on the fix.
 
   25 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org>
   jabberd-1.4.4-r3.ebuild, jabberd-1.6.1.1-r1.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 9c97e3216dfa..22fa366ad10e 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -10,6 +10,7 @@ AUX jabberd-1.4.4-xdb_file.c-rev1107.patch 539 RMD160 dbfca4d0801291f1b1c10e12ac
 AUX jabberd-1.4.4-xdb_sql.c-rev1211.patch 882 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 SHA1 8519d7920e75c3273efe766f3336c588808e0778 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10
 AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
 AUX jabberd-1.6.1.1-gnutls2.2.patch 1698 RMD160 6b3a6a93b85baf477cd0502ec9aeb7cd96f19d23 SHA1 58512abfdb53c16dc598b3ca505da1573f8f3a35 SHA256 c678a2d0fe729ec3a7c6373fc6993b4fbc170c8516f375e3ed260492202535e3
+AUX jabberd-1.6.1.1-libtool2.2.patch 311 RMD160 be0d831c8c2990f29e88abe5cc1da9567edb2bac SHA1 0c8e9a7fa6616d50123539ac146a557e89091a32 SHA256 7199217ba9b28bab8186a5728bac55806ad199b5b1d41f3f3a97d87a4b00650b
 AUX jabberd-1.6.1.1-parallel-make.patch 483 RMD160 eeda213fec4e3861390d69e59dbb54c3cb4db3d7 SHA1 4dc316c5f36b5dc4f0d3eb09dce47038679db419 SHA256 37adc27da7cbce3c77eeb672a64697d3fd6bc51ababdc9269e20fa6e5d1a5f7c
 AUX jabberd-1.6.1.1-sandbox.patch 620 RMD160 a5aee0352d90dbe45dd4c13320813535255bd29a SHA1 6387cc19c18ff6633bdfda7fd3351c23093f6808 SHA256 f37a8271593942ef005ce333a733c72ed6eb21d9adb68a5b88cef00c5a89cc76
 AUX jabberd-1.6.1.1-undefineddebug.patch 1332 RMD160 1a9607a48f39f29544cf9b4b9c4543bd8ede7f43 SHA1 b928d25eca52352e625a819eb95f9802e0f0eaf0 SHA256 b91b6194f9220524c26cfb2ca1a9e1d733d47ec3858c9dd55620fbdfa5de37f0
@@ -17,13 +18,13 @@ AUX jabberd-1.6.1.1.init 556 RMD160 4ff905ca3bf4b13c3c1f057fe81ff86c49e994e3 SHA
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
 DIST jabberd14-1.6.1.1.tar.gz 834112 RMD160 0d3df653b6362f8e580c59ae1b4c9c6467b0bee5 SHA1 8b7ba77c9e02e9de7125e898900ff0ba5d65986e SHA256 8bba7f8e8781a088679bdcf0e46348a29da45de3eec2421f73575c5a6b8ddc31
 EBUILD jabberd-1.4.4-r3.ebuild 3075 RMD160 54e0ac3b3e94dd3557a8769168a7a2ad04d9ba12 SHA1 caabc1f97041e8021b3b53a0c1188398b2054499 SHA256 f6865b81c509c93516452378f9e5caf7584a53b2f98a6cbc9beb9e4d79d79c49
-EBUILD jabberd-1.6.1.1-r1.ebuild 3276 RMD160 9aaf2372f5c2136babb95cf2e0ce6d2e9fc7f8de SHA1 bb41cbd77ceedddc58e167ce0cc46d9919882df5 SHA256 05ec28c7770f3f9a77ae1a3fc9f8f42186d06da1e77664706089498343729aa2
-MISC ChangeLog 18504 RMD160 065b68a38574f85f6170f59b06981be83b5dc528 SHA1 39134bcfc2e81bfb4eea1a451a9e21b25ce50443 SHA256 26177a1d28a707050a0639b2645b5efd7137de2029ffd96a0f6087252aabc604
+EBUILD jabberd-1.6.1.1-r1.ebuild 3320 RMD160 fbe155a75620967f3c4c436f1301b8108552e195 SHA1 d81056b7c4c2d5f4b7a9be812aaf49675214b1d9 SHA256 66459443a2f9497bfb365b03f7b25e617e76b73aaeee3c5027fa0c676980cad0
+MISC ChangeLog 18812 RMD160 6083c80b8aa607ed40798bdc03a7735ecf77d391 SHA1 49b8eb350632255c9817f38955c2b975e0b36732 SHA256 0d6e16b1b09883da11162358d76a07121b413b712cc495b9bb3a3a8ceae7991a
 MISC metadata.xml 260 RMD160 56e68db9f1752a236762ef10c07b151a463e98fc SHA1 b36ec032a24e4a24a3b5d2ffbb03a47ada32cb6e SHA256 94d461f51fb03779ecc6f60c8bbdc7b9f53eff6a45f8c2278a5bd1bdf412ff40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiysoIACgkQF6yMcaBxwHnvKACdFNBE4fXiOHbRmli6rVPPHQ3n
-3ksAn3XXvpuzLNZxAOtUpWNzlrLZ42/E
-=DjAM
+iEYEARECAAYFAkj07s8ACgkQF6yMcaBxwHmiWACgi7HDX4ysiMxEYvOyCw+ZMvIa
+StIAn34zHcOPqJ1QwiwsDyZ9kpm+FpTo
+=c7Fn
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch b/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch
new file mode 100644
index 000000000000..d1d8c84cb152
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch
@@ -0,0 +1,10 @@
+--- jabberd14-1.6.1.1-orig/configure.ac	2007-07-18 18:18:40.000000000 -0400
++++ jabberd14-1.6.1.1/configure.ac	2008-10-14 14:30:49.000000000 -0400
+@@ -40,6 +40,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ 
+ AC_SUBST([localedir], ['${datadir}/locale'])
+ 
diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index 07c06adca53c..40c91fd4ed28 100644
--- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.6 2008/08/25 13:08:29 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.7 2008/10/14 19:10:55 gentoofan23 Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit autotools eutils
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-sandbox.patch"
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	epatch "${FILESDIR}/${P}-undefineddebug.patch"
+	epatch "${FILESDIR}/${P}-libtool2.2.patch"
 
 	eautoreconf || die "Reconfiguring autotools failed!"
 }