Fixed issue similar to bug #195074, thanks to vapier for his binutils fix which I have ported to ghdl. Quoting fixes.

Package-Manager: portage-2.1.3.12

3 files changed, 29 insertions, 21 deletions

diff --git a/sci-electronics/ghdl/ChangeLog b/sci-electronics/ghdl/ChangeLog
index 5c95cdb6e422..4e397006a614 100644
--- a/sci-electronics/ghdl/ChangeLog
+++ b/sci-electronics/ghdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/ghdl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.1 2007/06/29 21:11:15 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.2 2007/10/11 12:44:59 calchan Exp $
+
+  11 Oct 2007; Denis Dupeyron <calchan@gentoo.org> ghdl-0.26.ebuild:
+  Fixed issue similar to bug #195074, thanks to vapier for his binutils fix
+  which I have ported to ghdl. Quoting fixes.
 
 *ghdl-0.26 (29 Jun 2007)
 
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index cd7d074eee2f..3c75e90ccb4d 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,13 +1,13 @@
 DIST gcc-core-4.1.2.tar.bz2 17485561 RMD160 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 SHA1 d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
 DIST ghdl-0.26.tar.bz2 723192 RMD160 1cfd7a17fd61c30e425835f87b4a500ce2bc89fa SHA1 affd89cbf1721ec83ef7deae536794e042dc13e7 SHA256 60987834e40c08c4830179e56f57d1ab906cc12b29ae58e3630d78da3e8ba8a0
-EBUILD ghdl-0.26.ebuild 1684 RMD160 b10e9b1a1936ee7484d9ec39508e11b919d01fd3 SHA1 8d1f98f69a844302959e87b9c3fbcd0e470a62f7 SHA256 a5ad6ada3305c88949a902641b0630f3ce319c5e962ddc9dc6a9821b43284e01
-MD5 373e6e58fc9e5e8c20431d3a0ba36323 ghdl-0.26.ebuild 1684
-RMD160 b10e9b1a1936ee7484d9ec39508e11b919d01fd3 ghdl-0.26.ebuild 1684
-SHA256 a5ad6ada3305c88949a902641b0630f3ce319c5e962ddc9dc6a9821b43284e01 ghdl-0.26.ebuild 1684
-MISC ChangeLog 444 RMD160 8c6c7809ca208bed77177c7308244a3a6d706770 SHA1 821f155185e8d978a9b80f03038b56637ebb86a8 SHA256 0d3d943e0a7fd1d05b405181d1c42c19f05533d5846eb2b057b186061b43db4a
-MD5 b7316812c1a76699c4c52d1ee07615a0 ChangeLog 444
-RMD160 8c6c7809ca208bed77177c7308244a3a6d706770 ChangeLog 444
-SHA256 0d3d943e0a7fd1d05b405181d1c42c19f05533d5846eb2b057b186061b43db4a ChangeLog 444
+EBUILD ghdl-0.26.ebuild 1932 RMD160 23ada622f021401b4b8397b9c35efb5362ac0842 SHA1 9ecee6736cc069e113ae6fa732c9b1af6207a404 SHA256 d515ddf2c2a69b84f3f8a332109b94ca70b40f4677f2f69a4d22b812a823c2c8
+MD5 db9467535a865f758e8d6e85da26e187 ghdl-0.26.ebuild 1932
+RMD160 23ada622f021401b4b8397b9c35efb5362ac0842 ghdl-0.26.ebuild 1932
+SHA256 d515ddf2c2a69b84f3f8a332109b94ca70b40f4677f2f69a4d22b812a823c2c8 ghdl-0.26.ebuild 1932
+MISC ChangeLog 636 RMD160 cd02124199ebe68a4ac56cbbcc4b150fe9aacaae SHA1 c94a2718e434b66532e62bc1263adeee75fe5e30 SHA256 1c155d09145db0ab635f4d24002fad5687d5eb042d9095236ac831f46fcd92c6
+MD5 9fb6967a11b6daa1580c8a20838083d0 ChangeLog 636
+RMD160 cd02124199ebe68a4ac56cbbcc4b150fe9aacaae ChangeLog 636
+SHA256 1c155d09145db0ab635f4d24002fad5687d5eb042d9095236ac831f46fcd92c6 ChangeLog 636
 MISC metadata.xml 457 RMD160 1109ba523b49de11adbc2aab294b7dcf359c1871 SHA1 24b4eb79fe450ac62a80bab8ca0c7cf315afb231 SHA256 e7ff050c97cb69f7062abe8bde70d94f53c865bddeadfbfa2200f7dcb987f4f8
 MD5 03a5a2586e85ba518a96768ab01e1b25 metadata.xml 457
 RMD160 1109ba523b49de11adbc2aab294b7dcf359c1871 metadata.xml 457
diff --git a/sci-electronics/ghdl/ghdl-0.26.ebuild b/sci-electronics/ghdl/ghdl-0.26.ebuild
index ed551bb37981..de728728af34 100644
--- a/sci-electronics/ghdl/ghdl-0.26.ebuild
+++ b/sci-electronics/ghdl/ghdl-0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.26.ebuild,v 1.1 2007/06/29 21:11:15 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.26.ebuild,v 1.2 2007/10/11 12:44:59 calchan Exp $
 
 inherit multilib
 
@@ -22,14 +22,18 @@ MAKEOPTS="-j1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	mv ${WORKDIR}/${P}/vhdl gcc
+	cd "${S}"
+	mv "${WORKDIR}/${P}"/vhdl gcc
 	sed -i \
 		-e 's/ADAC = \$(CC)/ADAC = gnatgcc/' \
 		-e '/^CFLAGS = -g/d' \
 		gcc/vhdl/Makefile.in || die "sed failed"
 	sed -i -e 's/"-O -g"/"$(CFLAGS)"/' gcc/vhdl/Make-lang.in || die "sed failed"
 
+	# Fix issue similar to bug #195074, ported from vapier's fix for binutils
+	sed -i -e "s:egrep.*texinfo.*dev/null:egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null:" \
+		configure* || die "sed failed"
+
 	# Fix atan2 bug in math_complex-body.vhdl
 	sed -i -e 's/atan2(z.re,z.im)/atan2(z.im,z.re)/' \
 		gcc/vhdl/libraries/ieee/math_complex-body.vhdl || die "sed failed"
@@ -43,13 +47,13 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "Installation failed"
 
-	cd ${D}/usr/bin ; rm `ls --ignore=ghdl`
-	rm -rf ${D}/usr/include
-	rm ${D}/usr/$(get_libdir)/lib*
-	cd ${D}/usr/$(get_libdir)/gcc/${CHOST}/${GCC_VERSION} ; rm -rf `ls --ignore=vhdl*`
-	cd ${D}/usr/libexec/gcc/${CHOST}/${GCC_VERSION} ; rm -rf `ls --ignore=ghdl*`
-	cd ${D}/usr/share/info ; rm `ls --ignore=ghdl*`
-	cd ${D}/usr/share/man/man1 ; rm `ls --ignore=ghdl*`
-	rm -Rf ${D}/usr/share/locale
-	rm -Rf ${D}/usr/share/man/man7
+	cd "${D}"/usr/bin ; rm `ls --ignore=ghdl`
+	rm -rf "${D}"/usr/include
+	rm "${D}"/usr/$(get_libdir)/lib*
+	cd "${D}"/usr/$(get_libdir)/gcc/${CHOST}/${GCC_VERSION} ; rm -rf `ls --ignore=vhdl*`
+	cd "${D}"/usr/libexec/gcc/${CHOST}/${GCC_VERSION} ; rm -rf `ls --ignore=ghdl*`
+	cd "${D}"/usr/share/info ; rm `ls --ignore=ghdl*`
+	cd "${D}"/usr/share/man/man1 ; rm `ls --ignore=ghdl*`
+	rm -Rf "${D}"/usr/share/locale
+	rm -Rf "${D}"/usr/share/man/man7
 }