Add fix from upstream for type size tests #324649 by Jan Seiffert.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 115 insertions, 2 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index 488957e92cdb..f681b179ed39 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.142 2010/06/04 05:32:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.143 2010/06/20 00:35:29 vapier Exp $
+
+*autoconf-2.65-r1 (20 Jun 2010)
+
+  20 Jun 2010; Mike Frysinger <vapier@gentoo.org> +autoconf-2.65-r1.ebuild,
+  +files/autoconf-2.65-AC_TYPE_INT_T.patch:
+  Add fix from upstream for type size tests #324649 by Jan Seiffert.
 
   04 Jun 2010; Jeroen Roovers <jer@gentoo.org> autoconf-2.65.ebuild:
   Stable for HPPA (bug #311967).
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index e6248ef50d81..b6c94e198d95 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX autoconf-2.13-destdir.patch 677 RMD160 ff71fb18c1676455e267dfd8f3059e8c9384fe19 SHA1 5ef1905e271e078cecea3424560207585868e9cd SHA256 67c3eaf2f8aaf3acbcff387bc3fc6d46688b56a6b51043344e301bfaf16186a0
 AUX autoconf-2.13-gentoo.patch 898 RMD160 c39068cd8477188cde4818049c32b4142689ca0d SHA1 17bdf4d77c8a0c738f20378f0b281fd6ecf57ddd SHA256 5d6a4b9d8d789684b44addf565200a90ee92140d58bebf087373ae82c4d89ea8
 AUX autoconf-2.13-test-fixes.patch 547 RMD160 4f8713f9a046c496c813fc52f5fccbb8d616f97c SHA1 95dcffbc29c8355f11c191d6626b54f1db9403ea SHA256 43929d95e6050642385530df91084d4c073cec5cca727918d5ff84bc1e3059f5
@@ -8,6 +11,7 @@ AUX autoconf-2.62-at-keywords.patch 2857 RMD160 1574aa72cc1b8583241c43bd843e8460
 AUX autoconf-2.62-fix-multiline-string.patch 1040 RMD160 b9038df63126c43970329ea209285497ad5c6e60 SHA1 feb6dd8332d7637990a76b2446f5d2e6e508b3bb SHA256 853bf209c69610d5a9f95dc6637342651eacdfe7255198228c2995fca2c4fb36
 AUX autoconf-2.62-revert-AC_C_BIGENDIAN.patch 7040 RMD160 42ef4aa0cef1ef22335e1afdd867afe057ccf00f SHA1 db9e27d78885cb7cef238dc3121b08653b4ebac6 SHA256 5dcd1437891ad33ce81219b27429f94ff56ad7216b7b707427ae028bdc60f610
 AUX autoconf-2.63-sh.patch 1224 RMD160 47993612f0b44ad97d84ad5a481c8532c31165db SHA1 97ee64570bef2cfdb006f0ef1374c1be0426b1f9 SHA256 1b236cd09c14f5f74eddcb12b001db9c51c624e57f13fe627085d02ed67c0809
+AUX autoconf-2.65-AC_TYPE_INT_T.patch 1760 RMD160 6346c3d725560f667c286a239408f30f887ba504 SHA1 33dbdcc37849493520fb3a33c90a9140ada1d57a SHA256 b9007a68db2b791ccea64b5f9984b11a38bc7a86c41ae2961293aebf18865bfc
 DIST autoconf-2.13.tar.gz 443844 RMD160 0d1fa0992280ed71c0d72487a5a4c246d1c1b18a SHA1 e4826c8bd85325067818f19b2b2ad2b625da66fc SHA256 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 DIST autoconf-2.59.tar.bz2 925073 RMD160 792c45aade68e2ed19a0e4c6ebc0e20cb8298e1a SHA1 d366a07b2d99c95b7f24395aa8a8e023d8b93b69 SHA256 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
 DIST autoconf-2.61.tar.gz 1396855 RMD160 ec5f512aec24b3cc5a9968e96d261558e45471b5 SHA1 69f37c509a4757d747b6f4c091d209ab3984d62f SHA256 9d14f2ed0d1b6f8180498a66517f511c7c49c870d6873219a3ff4b8b3082a68b
@@ -21,7 +25,15 @@ EBUILD autoconf-2.61-r2.ebuild 1311 RMD160 01448158ef2e988e23f31001346b0b99fe9e6
 EBUILD autoconf-2.62-r1.ebuild 1447 RMD160 38c899c660b48e663b5fe6f4944c45396f039e00 SHA1 e009a1376af97cba0a605d7f3756f1a35a5b6de6 SHA256 dc37530315eac445aad0189079fa9d87e43b986fdb1fab036248218454623849
 EBUILD autoconf-2.63-r1.ebuild 1309 RMD160 9b8dc1c85f0e9997915b990bb252003095651e26 SHA1 f98ddada8815e07758c02e7c3bfc74cd8ab4909d SHA256 639f04392ee83f5b1c20831fa4e61aabd1b94282911c66665a23cacc59a3735d
 EBUILD autoconf-2.64.ebuild 1265 RMD160 198cc7c6e170c0202acf3e7403aec0e446bfebb4 SHA1 138586af69e0fd9ca6b5993492654f6b89bb4c77 SHA256 0f3cb30fbf863bc186108a71a685f62c7f59a5decd803f18e95daa038e5c2691
+EBUILD autoconf-2.65-r1.ebuild 1381 RMD160 5b86d38d4ace842c344833a047434cfc8e7535e9 SHA1 a1a10a013cdfaab22843857408b0670a901d0e32 SHA256 5743df6f5a6468bbbc65f8dfaa15ce90707245717eb42e90213381f482ef8c11
 EBUILD autoconf-2.65.ebuild 1251 RMD160 0d665090b143b535c692d07f71710e7840965bc9 SHA1 1a9745694bd8eb34f565dd1a50fe1ab18815b7ae SHA256 4235043afaf6a57ba96db8675df4ba864a0af53db21f52603049c527fb80b338
 EBUILD autoconf-9999.ebuild 1262 RMD160 46da23705fa4033b0a420507aaba52eeb3364af1 SHA1 b64c10c9fbd1cf34e2802474e021576e712d78c8 SHA256 0fc59822d4289bbd38a6f0a55374b7cc5c3ff61fafeb25301728e6cd11d68d31
-MISC ChangeLog 19711 RMD160 dac0af5fc70f8e9348de2c337a96c140f94d7bdb SHA1 9955b804ca7d9a29fac57cb8730affd9de29b005 SHA256 57c73b484f511adf1df8c958d757a392e4faa90e08ae673623873313e47db25a
+MISC ChangeLog 19937 RMD160 d19cea748b98bdcc4043c633d079f9a3f77af6ef SHA1 60246adbc87a50c3445914a29bd125d6c8d40dc2 SHA256 16bac23764f19b2c87bbdf5b0cd00dd243d3b91e2b3e70c9fcb8a636c28d0f88
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwdYlgACgkQTwhj9JtAlp7BrgD9FeZDX2oSnsvpuXq+3PtH0zKG
+dropDYlD6Ks4QCjwXmIBALXGoK69ON+3SW27Md18EhvSo4Tgtb3Wg1R9YL/j/dGu
+=WQQZ
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.65-r1.ebuild b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
new file mode 100644
index 000000000000..00126b56c2f2
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.65-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.65-r1.ebuild,v 1.1 2010/06/20 00:35:30 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="emacs"
+
+DEPEND=">=sys-apps/texinfo-4.3
+	>=sys-devel/m4-1.4.6
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	>=sys-devel/autoconf-wrapper-8"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-AC_TYPE_INT_T.patch #324649
+}
+
+src_compile() {
+	# Disable Emacs in the build system since it is in a separate package.
+	export EMACS=no
+	econf --program-suffix="-${PV}" || die
+	# econf updates config.{sub,guess} which forces the manpages
+	# to be regenerated which we dont want to do #146621
+	touch man/*.1
+	# From configure output:
+	# Parallel builds via `make -jN' do not work.
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS NEWS README TODO THANKS \
+		ChangeLog ChangeLog.0 ChangeLog.1 ChangeLog.2
+}
diff --git a/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch b/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
new file mode 100644
index 000000000000..cc81672e427e
--- /dev/null
+++ b/sys-devel/autoconf/files/autoconf-2.65-AC_TYPE_INT_T.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/324649
+http://lists.gnu.org/archive/html/bug-autoconf/2009-12/msg00016.html
+
+From 83ee5bc460a1083ab29fd9d3a3044cbaefad6ac6 Mon Sep 17 00:00:00 2001
+From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+Date: Wed, 9 Dec 2009 07:20:16 +0100
+Subject: [PATCH] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
+
+* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
+definition to prologue section, to avoid syntax error.
+* NEWS, THANKS: Update.
+Report by Pierre Ynard.
+
+Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+---
+ ChangeLog             |    8 ++++++++
+ NEWS                  |    3 +++
+ THANKS                |    1 +
+ lib/autoconf/types.m4 |   12 ++++++------
+ 4 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
+index 7a73fc2..3829c4c 100644
+--- a/lib/autoconf/types.m4
++++ b/lib/autoconf/types.m4
+@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
+ 	 'long long int' 'short int' 'signed char'; do
+        AC_COMPILE_IFELSE(
+ 	 [AC_LANG_BOOL_COMPILE_TRY(
+-	    [AC_INCLUDES_DEFAULT],
+-	    [enum { N = $[]2 / 2 - 1 };
+-	     0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
++	    [AC_INCLUDES_DEFAULT
++	     enum { N = $[]2 / 2 - 1 };],
++	    [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
+ 	 [AC_COMPILE_IFELSE(
+ 	    [AC_LANG_BOOL_COMPILE_TRY(
+-	       [AC_INCLUDES_DEFAULT],
+-	       [enum { N = $[]2 / 2 - 1 };
+-		($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
++	       [AC_INCLUDES_DEFAULT
++	        enum { N = $[]2 / 2 - 1 };],
++	       [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ 		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
+ 	    [],
+ 	    [AS_CASE([$ac_type], [int$[]2_t],
+-- 
+1.7.1
+