Fixed bugs #248352, #273142 and #273252.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 20 insertions, 9 deletions

diff --git a/sci-electronics/ghdl/ChangeLog b/sci-electronics/ghdl/ChangeLog
index 4479d7298363..f308c4b3f559 100644
--- a/sci-electronics/ghdl/ChangeLog
+++ b/sci-electronics/ghdl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-electronics/ghdl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.7 2009/06/06 17:07:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.8 2009/06/20 03:36:43 calchan Exp $
+
+  20 Jun 2009; Denis Dupeyron <calchan@gentoo.org> ghdl-0.27.ebuild:
+  Fixed bugs #248352, #273142 and #273252.
 
 *ghdl-0.27 (06 Jun 2009)
 
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 5a44b2045ddc..48c77e67800d 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -3,6 +3,6 @@ DIST gcc-core-4.2.4.tar.bz2 18927613 RMD160 d54581d0a2ecc22718e6be101c6dc524a4a8
 DIST ghdl-0.26.tar.bz2 723192 RMD160 1cfd7a17fd61c30e425835f87b4a500ce2bc89fa SHA1 affd89cbf1721ec83ef7deae536794e042dc13e7 SHA256 60987834e40c08c4830179e56f57d1ab906cc12b29ae58e3630d78da3e8ba8a0
 DIST ghdl-0.27.tar.bz2 727691 RMD160 414b0af69eb64f3ddedec941dc961b3464aab4fa SHA1 21a7244d03228c022d838ce3ac685eaa08dbb7e4 SHA256 58aef8a797a5d860b59d436c76926075ee041914a32f68923c60e4b60f6bf199
 EBUILD ghdl-0.26.ebuild 2279 RMD160 44f818d3a48a3b7bd752f2352b0a942c04de9271 SHA1 eb2dae1c1c3cbdcb6f919f3249a2b74eddd61c8c SHA256 8c2783e7f5780f7e58bd17820dc4ef2955c7e11988ae01d98fcea0a363815529
-EBUILD ghdl-0.27.ebuild 2106 RMD160 a82481dc387269a3362c63f4f9d6f4b9cc9f1ff5 SHA1 194d01f3204820b17a42a8af8b702bee79937b91 SHA256 efef4ddb61e99673df61840bda04b7c7e5b2538487c63a2afdaeed114c5083bc
-MISC ChangeLog 1304 RMD160 b81f07c3c6acb822ace3e96e493d779fc1c54764 SHA1 1b8895b98b68e1a991f482bb6c9d359216170328 SHA256 e8c1b8a8b08128d30c1eb8b2ccbc0592ed8818c7e4b3a6968913f42c3b6dc918
+EBUILD ghdl-0.27.ebuild 2570 RMD160 9d91cc5311b24a7dd6065c2c1858bfe75bc45642 SHA1 bf29301f75aeeea7f0ba257be8b1a05cf5e253b0 SHA256 c77f5959f1596e41b0db94e6e0669c6ec0554b1747b0fe4c59605efab4c64042
+MISC ChangeLog 1417 RMD160 efe9d20a9c1ebd8b2d19483c33f04102d5816572 SHA1 e2639805847d69582f2daef307290db6b636c582 SHA256 15cd48255ff528dc78d23c786da111e364b4376eb3edbdbba4647ec86d31dd4f
 MISC metadata.xml 457 RMD160 1109ba523b49de11adbc2aab294b7dcf359c1871 SHA1 24b4eb79fe450ac62a80bab8ca0c7cf315afb231 SHA256 e7ff050c97cb69f7062abe8bde70d94f53c865bddeadfbfa2200f7dcb987f4f8
diff --git a/sci-electronics/ghdl/ghdl-0.27.ebuild b/sci-electronics/ghdl/ghdl-0.27.ebuild
index 060d4994b7c7..c828ef75dcd2 100644
--- a/sci-electronics/ghdl/ghdl-0.27.ebuild
+++ b/sci-electronics/ghdl/ghdl-0.27.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.27.ebuild,v 1.1 2009/06/06 17:07:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.27.ebuild,v 1.2 2009/06/20 03:36:43 calchan Exp $
 
 EAPI="2"
 
 inherit multilib
 
 GCC_VERSION="4.2.4"
+GNATGCC_SLOT="4.2"
 
 DESCRIPTION="Complete VHDL simulator using the GCC technology"
 HOMEPAGE="http://ghdl.free.fr"
@@ -17,14 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=">=sys-apps/portage-2.1.2.10
-	>=dev-lang/gnat-gcc-4.2"
+	dev-lang/gnat-gcc:${GNATGCC_SLOT}"
 RDEPEND=""
 S="${WORKDIR}/gcc-${GCC_VERSION}"
 
+ADA_INCLUDE_PATH="${ROOT}/usr/lib/gnat-gcc/${CHOST}/${GNATGCC_SLOT}/adainclude"
+ADA_OBJECTS_PATH="${ROOT}/usr/lib/gnat-gcc/${CHOST}/${GNATGCC_SLOT}/adalib"
+GNATGCC_PATH="${ROOT}/usr/${CHOST}/gnat-gcc-bin/${GNATGCC_SLOT}:${ROOT}/usr/libexec/gnat-gcc/${CHOST}/${GNATGCC_SLOT}"
+
 src_prepare() {
 	mv "${WORKDIR}/${P}"/vhdl gcc
 	sed -i -e 's/ADAC = \$(CC)/ADAC = gnatgcc/' gcc/vhdl/Makefile.in || die "sed failed"
-	sed -i -e 's/AGCC_CFLAGS=-g/AGCC_CFLAGS=$(CFLAGS)/' gcc/vhdl/Make-lang.in || die "sed failed"
+	sed -i \
+		-e 's/AGCC_CFLAGS=-g/AGCC_CFLAGS=$(CFLAGS)/' \
+		-e 's/rm -rf $(infodir)/rm -rf $(DESTDIR)$(infodir)/' \
+		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:" \
@@ -44,15 +52,15 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --enable-languages=vhdl
+	PATH="${GNATGCC_PATH}:${PATH}" econf --enable-languages=vhdl
 }
 
 src_compile() {
-	emake -j1 || die "Compilation failed"
+	PATH="${GNATGCC_PATH}:${PATH}" emake -j1 || die "Compilation failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	PATH="${GNATGCC_PATH}:${PATH}" emake DESTDIR="${D}" install || die "Installation failed"
 
 	cd "${D}"/usr/bin ; rm `ls --ignore=ghdl`
 	rm -rf "${D}"/usr/include