Fix bug #477552, use <texinfo-5.1. Thanks qnikst for providing the patch

Package-Manager: portage-2.1.13.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 159 insertions, 19 deletions

diff --git a/sci-electronics/ghdl/ChangeLog b/sci-electronics/ghdl/ChangeLog
index 0989ecb117f6..adee51e24848 100644
--- a/sci-electronics/ghdl/ChangeLog
+++ b/sci-electronics/ghdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/ghdl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.14 2011/05/14 14:34:21 tomjbe Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.15 2013/08/04 09:10:43 tomjbe Exp $
+
+  04 Aug 2013; Thomas Beierlein <tomjbe@gentoo.org> ghdl-0.29.ebuild,
+  +files/ghdl-0.29-gcc.patch:
+  Fix bug #477552, use <texinfo-5.1. Thanks qnikst for providing the patch
 
   14 May 2011; Thomas Beierlein <tomjbe@gentoo.org> ghdl-0.29.ebuild:
   Switch to EAPI=3 to fix bug #192761
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 9d5a04a48f92..cb74a711db0a 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST gcc-core-4.2.4.tar.bz2 18927613 RMD160 d54581d0a2ecc22718e6be101c6dc524a4a88463 SHA1 540fa6949415ded321a7cbe80bbf8befe85e3566 SHA256 cfc9e7e14966097d24d510cfd905515e8f7464ab5379a50698ae3d88e1f7a532
-DIST gcc-core-4.3.4.tar.bz2 24329359 RMD160 0ed558bd465fcfa6ad123daa4b85aa7c498dc80f SHA1 5aae071fc542ee17dadfd8f22eaf79611fd175ba SHA256 3189838f5047be4ff54711c84db17c76ecfcc79bf4f4d110bf7323eeb90568fa
-DIST ghdl-0.27.tar.bz2 727691 RMD160 414b0af69eb64f3ddedec941dc961b3464aab4fa SHA1 21a7244d03228c022d838ce3ac685eaa08dbb7e4 SHA256 58aef8a797a5d860b59d436c76926075ee041914a32f68923c60e4b60f6bf199
-DIST ghdl-0.29.tar.bz2 784389 RMD160 c4bd5cff6dd928c6008f062cd033e215bb4b0535 SHA1 f207ab6425027176fd61b4ef440c5620e7ab6572 SHA256 6a4b01e14fae83b336ed33e8d92e0673a5999963ff569528e592721ab28db496
-EBUILD ghdl-0.27.ebuild 2579 RMD160 a4f73058bc4c96ee069cdaa8152e639d0a7dfbce SHA1 838db91ab4d3c4fbe49d02d70433b1fcf0b28d42 SHA256 7a5ab74f4329c03b90710beef967bbe3b416ab8be95eef55bb3c3ab33d5e252b
-EBUILD ghdl-0.29.ebuild 2588 RMD160 3812a08369887c74296565f322747067c905614a SHA1 967db300cd97928de591f82f6c988ca93d0ee829 SHA256 b91a0bb9c4d565960abc48beb1c2ad1e2532eba2ad893818486c188bfce5a8a3
-MISC ChangeLog 2091 RMD160 21cd9b868ce89645ebff1cf0aa4993458090b5e8 SHA1 b04ab4c3fe2c8c394b7fe83c6331d6a448ac4497 SHA256 0efeb1e7867bb73d5b10304af94466d47ac9d92789264903fb4aaf13c54858f1
-MISC metadata.xml 457 RMD160 1109ba523b49de11adbc2aab294b7dcf359c1871 SHA1 24b4eb79fe450ac62a80bab8ca0c7cf315afb231 SHA256 e7ff050c97cb69f7062abe8bde70d94f53c865bddeadfbfa2200f7dcb987f4f8
+AUX ghdl-0.29-gcc.patch 4508 SHA256 90c29b2a1e4724584eb456c96b92d4342a9500d5f7eb77f86732322123e6278c SHA512 7ca17a9f037e04f73153a129e12f1958de92a6ba15305e7838d900deb418d24468c835a88ec25f6a395a4792b46de9afdcf91e34450e7b69f9e8f4b893bf79a9 WHIRLPOOL ea8a4f044ae7ef2ca9649bc39670b3b3631e2b01e6af95887e9b8dcb8a63accfcafb111f499d5e997d6129513d94be4ad40c3121c0e8bfe134741b06bafcef59
+DIST gcc-core-4.2.4.tar.bz2 18927613 SHA256 cfc9e7e14966097d24d510cfd905515e8f7464ab5379a50698ae3d88e1f7a532
+DIST gcc-core-4.3.4.tar.bz2 24329359 SHA256 3189838f5047be4ff54711c84db17c76ecfcc79bf4f4d110bf7323eeb90568fa SHA512 03282633d5dcfee2b474b6d0ed2bfc708611a2049f4f4abf85c371ae04c2060a97a01380c77ef2e88b4e6f7eff5c368d1031737f4eab9f537dc1ed61430f0cf1 WHIRLPOOL 18b7202c67b6c10696c2f399741683f3b6a5805a55fd8a20240e309e0bb2e4311bb00cd4a7b72dcb3e1e38a192ae70399b92e66b97486bb2584a5f0595270dc5
+DIST ghdl-0.27.tar.bz2 727691 SHA256 58aef8a797a5d860b59d436c76926075ee041914a32f68923c60e4b60f6bf199 SHA512 77b476b3ee3741a64b2073924af526bd68792e1c1166b3dc3e3f5c684c49bd6a8aa55c0c87743eba2db756841ac64a336bd3a73832f0a629bfb22c41d6b8cbae WHIRLPOOL 641dc6d6ec34e4f4b9882b1124b61861ea939b5014160fe201ac85107c2f559660be8fc0f8617c17768f7fef9160b454f2b027b8dcc29a25cb8fd7682b0ae184
+DIST ghdl-0.29.tar.bz2 784389 SHA256 6a4b01e14fae83b336ed33e8d92e0673a5999963ff569528e592721ab28db496 SHA512 6e86013d3798c875b8fbb67b64c9b0cdda89c878985b64a1ea2d0e04e0c3ae714799a4ffe050f3651f7df8078b791d8613733065c799261f28884103c1597210 WHIRLPOOL 381ca0e2a32bba2595f7a4317c847f9b09f4129bd72b5d265da33acf458e52aefc6d9a9ba9532940a15f587d2adc8c294b302ac4d45e92e3b56575e164bbe668
+EBUILD ghdl-0.27.ebuild 2579 SHA256 7a5ab74f4329c03b90710beef967bbe3b416ab8be95eef55bb3c3ab33d5e252b SHA512 df113156206e20438a3240b69217db123b0fc8ec6636efccb009054d1d34f8e1cf52e0f7ff95b74ccec14aa6787fbc783d25121b3b75d6bbe1ab81ccc52b7e08 WHIRLPOOL f6040104aaf2675c9aecefb68085dbb4a7e38b85bc97d059ea0dfeceb2de4bc7e439dc0d4012a280723d1749df9678aa8f9aab1cc27bcdc8ab73605e8c384aeb
+EBUILD ghdl-0.29.ebuild 2678 SHA256 e259088e78e29eb3ba84ede59c119d232be9b8b25235f918ce575736713ac3c5 SHA512 09e206a30951e525e2c81f82294143fb45a03bd9a1039661ec466a58f190b083026354d359e6dfeae80131a91b37cbe713db970e8a8a4b5b4ca5bdbfef595d71 WHIRLPOOL 3e46a654bf78d7b738d87996d5a9eaa6c137b281672a51aa416994162aec73c936d110b2708ef43ab8175f75bdea1b6ba3c18f8d1de73738a6820e581ae55b2d
+MISC ChangeLog 2267 SHA256 413d345a7ec2d047e7e1b802c3b28a64262021372376139a4e26d01d1ee30e11 SHA512 e789eb743bfb24df0c2e8ec85842fa0045fc629626c91478ae93da526986f47d27a527e1cd2e327dc58c9ffefba28dd11092966cde544632f58e7ddbedeab51f WHIRLPOOL 04b46a223096a04488941647d200d55f5d148dac7d107625b1b49e0670c612bdfc5980d904726181b0f6ea06d92e4ad66abd0a647b1512c00dfccec28e0500ca
+MISC metadata.xml 457 SHA256 e7ff050c97cb69f7062abe8bde70d94f53c865bddeadfbfa2200f7dcb987f4f8 SHA512 5fdf1e8abd5addc6f8e797b2e5a76b603ebd8d046544f77102be1915a3968f803795dd6cf0137b5fb27d42d90031df9815315e67ce4c590a6e6913cd4f1ca159 WHIRLPOOL 3b47683a1c9462307b8d8cd5265aa7c642d6fe8d09b40f3fd6d61429e083e70cb955f8d099972eec8209e38f609549b1b87be90a4e8cae6f6ff6c250045f886d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAk3OkvkACgkQQe4uqXYgU9VdJgCgtGCaf338tf8NQoLbrnn/aNRg
-6cIAn1y1jEh52OSwL+SJXbAcaZHtwaUd
-=JieR
+iEYEAREIAAYFAlH+GqMACgkQQe4uqXYgU9VNGACbBgbXeMnmeizkL5DxcfbuRId5
+mcQAniYhMK2NRMz9jGR5mVNJ+gs+pPNb
+=xRsr
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/ghdl/files/ghdl-0.29-gcc.patch b/sci-electronics/ghdl/files/ghdl-0.29-gcc.patch
new file mode 100644
index 000000000000..b819371ca510
--- /dev/null
+++ b/sci-electronics/ghdl/files/ghdl-0.29-gcc.patch
@@ -0,0 +1,132 @@
+diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h
+index 23151ad..1b2d9d0 100644
+--- a/gcc/config/alpha/linux-unwind.h
++++ b/gcc/config/alpha/linux-unwind.h
+@@ -52,7 +52,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+   else if (pc[1] == 0x201f015f)	/* lda $0,NR_rt_sigreturn */
+     {
+       struct rt_sigframe {
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h
+index c369711..90c91a3 100644
+--- a/gcc/config/bfin/linux-unwind.h
++++ b/gcc/config/bfin/linux-unwind.h
+@@ -52,10 +52,10 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	int sig;
+-	struct siginfo *pinfo;
++	siginfo_t *pinfo;
+ 	void *puc;
+ 	char retcode[8];
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+ 
+diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h
+index 58eb733..9808925 100644
+--- a/gcc/config/i386/linux-unwind.h
++++ b/gcc/config/i386/linux-unwind.h
+@@ -137,9 +137,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	int sig;
+-	struct siginfo *pinfo;
++	siginfo_t *pinfo;
+ 	void *puc;
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h
+index 8b2878e..bbc77e6 100644
+--- a/gcc/config/ia64/linux-unwind.h
++++ b/gcc/config/ia64/linux-unwind.h
+@@ -51,7 +51,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context,
+       struct sigframe {
+ 	char scratch[16];
+ 	unsigned long sig_number;
+-	struct siginfo *info;
++	siginfo_t *info;
+ 	struct sigcontext *sc;
+       } *frame_ = (struct sigframe *)context->psp;
+       struct sigcontext *sc = frame_->sc;
+@@ -130,7 +130,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs)
+       struct sigframe {
+ 	char scratch[16];
+ 	unsigned long sig_number;
+-	struct siginfo *info;
++	siginfo_t *info;
+ 	struct sigcontext *sc;
+       } *frame = (struct sigframe *)context->psp;
+       struct sigcontext *sc = frame->sc;
+diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h
+index 4e71182..86d4711 100644
+--- a/gcc/config/mips/linux-unwind.h
++++ b/gcc/config/mips/linux-unwind.h
+@@ -79,7 +79,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context,
+       struct rt_sigframe {
+ 	u_int32_t ass[4];  /* Argument save space for o32.  */
+ 	u_int32_t trampoline[2];
+-	struct siginfo info;
++	siginfo_t info;
+ 	_sig_ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h
+index 812561e..84ab137 100644
+--- a/gcc/config/pa/linux-unwind.h
++++ b/gcc/config/pa/linux-unwind.h
+@@ -66,7 +66,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   int i;
+   struct sigcontext *sc;
+   struct rt_sigframe {
+-    struct siginfo info;
++    siginfo_t info;
+     struct ucontext uc;
+   } *frame;
+ 
+diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h
+index 3a3e9aa..7699729 100644
+--- a/gcc/config/sh/linux-unwind.h
++++ b/gcc/config/sh/linux-unwind.h
+@@ -80,9 +80,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context,
+ 	   && (*(unsigned long *) (pc+11)  == 0x6ff0fff0))
+     {
+       struct rt_sigframe {
+-	struct siginfo *pinfo;
++	siginfo_t *pinfo;
+ 	void *puc;
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+@@ -179,7 +179,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+ 		&& (*(unsigned short *) (pc+14)  == 0x00ad))))
+     {
+       struct rt_sigframe {
+-	struct siginfo info;
++	siginfo_t info;
+ 	struct ucontext uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h
+index 18daff2..2a5e4f8 100644
+--- a/gcc/config/xtensa/linux-unwind.h
++++ b/gcc/config/xtensa/linux-unwind.h
+@@ -66,7 +66,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+ 
+   struct rt_sigframe {
+-    struct siginfo info;
++    siginfo_t info;
+     struct ucontext uc;
+   } *rt_;
+ 
diff --git a/sci-electronics/ghdl/ghdl-0.29.ebuild b/sci-electronics/ghdl/ghdl-0.29.ebuild
index 81638c676b64..dc3314cfd2b8 100644
--- a/sci-electronics/ghdl/ghdl-0.29.ebuild
+++ b/sci-electronics/ghdl/ghdl-0.29.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.29.ebuild,v 1.3 2011/05/14 14:34:21 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.29.ebuild,v 1.4 2013/08/04 09:10:43 tomjbe Exp $
 
 EAPI="3"
 
-inherit multilib
+inherit eutils multilib
 
 GCC_VERSION="4.3.4"
 GNATGCC_SLOT="4.3"
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND=">=sys-apps/portage-2.1.2.10
+DEPEND="<sys-apps/texinfo-5.1
 	dev-lang/gnat-gcc:${GNATGCC_SLOT}"
 RDEPEND=""
 S="${WORKDIR}/gcc-${GCC_VERSION}"
@@ -49,6 +49,9 @@ src_prepare() {
 			|| die "sed for ${T_LINUX64} failed. :("
 		done
 	fi
+
+	# fix for bug #477552 backported from bug #424970
+	epatch "${FILESDIR}"/${P}-gcc.patch
 }
 
 src_configure() {