From a10d95e4916d69b3013143353d5f4aa44dec9748 Mon Sep 17 00:00:00 2001
From: Palmer Dabbelt <palmer@dabbelt.com>
Date: Sat, 11 Jul 2015 20:46:18 -0700
Subject: Add a Chisel patch that doesn't copy the headers

The sane way to deal with Chisel headers is now to use
"chisel-hdrtar", as opposed to the current Chisel system which copies
headers from the build directory while running Scala.
---
 sci-electronics/chisel/Manifest                    |  2 +
 sci-electronics/chisel/chisel-2.2.27-r1.ebuild     | 77 ++++++++++++++++++++++
 .../files/chisel-2.2.27-copy_to_target.patch       | 17 +++++
 3 files changed, 96 insertions(+)
 create mode 100644 sci-electronics/chisel/chisel-2.2.27-r1.ebuild
 create mode 100644 sci-electronics/chisel/files/chisel-2.2.27-copy_to_target.patch

diff --git a/sci-electronics/chisel/Manifest b/sci-electronics/chisel/Manifest
index 272c916..43d6298 100644
--- a/sci-electronics/chisel/Manifest
+++ b/sci-electronics/chisel/Manifest
@@ -1,4 +1,5 @@
 AUX chisel-2.2.20-Wall.patch 2863 SHA256 276b28b1c19f3ee78a05760a19cc15899f30cc16226f96417ef5f6f31afe3835 SHA512 63772839438b307a683d9a48cf8e788137302d109e44d2547c2344e1313da6c1f546ac3e23125ab9c8a4a192537a77cf746a98e08d97c398f19e5d4c695d30f2 WHIRLPOOL a7f0dae24386ab3c0c84367992d87409535f4f216061d54a42c82dac9bf4c32779b51bd012425c3c050e6fb3884a4f9c08576088d3d506a1f63975f55983694f
+AUX chisel-2.2.27-copy_to_target.patch 598 SHA256 0706b3d681ea8a2918dc25ddd41fafb45cca37cbcc75cf464861bab62560190d SHA512 31b8a194ee923cac74d16354d0f94f476c0ba3e9e38a7a97eea0d6110e4e217b4db0187ad9af19b3f702f94585afe76a090c08b1c6947a9199aa94357664e732 WHIRLPOOL 63ac76837e09f11dcebaec774109196e1eb029100cd5a5ad00a00e0985259b4abe673ae42fb04284fd9415ec6c517b07cdada2b3d02ecdd9bdf61d27d116f8c7
 DIST chisel-2.2.17.tar.gz 17048024 SHA256 4f7f429003125789a3d7b2315a49b51b67ad8978704a88c40d12ee0130f608f3 SHA512 02e22ef423b9ca11e696082ade7ba09273d63c7a37daa25909199b7ac06e31a1a2dea3be16161fbd9a4a5667743e970c26879dbd8205d1eff167e03fb5fa72b5 WHIRLPOOL 274bb8bc44994812971e746297362e294021214af30f734cf50bc96b9229056703ad1949032aee75569ca0eeab1d3efd31611c2da74ae515cdf04aab9acdcf65
 DIST chisel-2.2.19.tar.gz 17599586 SHA256 9ce566e17391d4750d7c4475764f4c2b52312bd110f05da6e9800b631915add6 SHA512 7338ce9c2fc0558bd8441f5a82f3be6302a4600cda4adbf1e2d78fe47a68a53cfbdbd1c8f7e86430b0c542b69a525f2286e703f866b3c1bb803f574842a1350b WHIRLPOOL 7fed27f48ab52be38fd4bf7f47b857fb0cfdef555af320546898264cac9f87136de1ac333b94fd2b60c54991657abf7396d9e9acb84af317f0e95e74477210ac
 DIST chisel-2.2.20.tar.gz 17608710 SHA256 c1d13af4f68f25882c01ce8a46444ebe6e18365e9c535eeb53279f7920906cbd SHA512 a893d94244dac713d16cce8e7b369af5e6018836a988a177b009ef6783096d7c5c5e396bc4de0684bfc233b405b9b28f76a8dcb15cd7d9bb8a6460fda6de6314 WHIRLPOOL 6fff7744a82562eb5d52bb550807f268bce85104a569609d7f519e5de3fddd9344032f855d63865a3773515f1561a0d2e9f6420fee2f5374a7bc5e0c9870b1a5
@@ -9,4 +10,5 @@ EBUILD chisel-2.2.19-r1.ebuild 1419 SHA256 20cf7960a3a11c27d7106d1114241b9ede8ef
 EBUILD chisel-2.2.20-r1.ebuild 1483 SHA256 e13237af740e698ca76cbdeb766dce03b1715543163149fbc266dac1244a756d SHA512 b7fb298008837999a25e5ae9305b257210c42d0f0c78cc44cd85ce80b942725e877c30139cbf37535e67537d6da8bcbea94edb7c5255a744acc6bc2ee0046b1e WHIRLPOOL d34a88fab518c5675132634c51ab273ef57a657ec1c9d4958b4af1ca1cb9bb122b19944fb24f6894e27d802932b1689914d52605d1e05d00f3a30484d07bb2fb
 EBUILD chisel-2.2.20.ebuild 1419 SHA256 20cf7960a3a11c27d7106d1114241b9ede8efc690585db59ca901cf57639229c SHA512 6e72b45320c104c69d0950756401ca42c531495bc928e1eb12b29e06f57cf63bfcba857c79c9fcd2cba0c70fe6a93e5a08dc66728797276ef31a5df7c85cbafd WHIRLPOOL cefdac2a073227ebefa774d5a520c19bb46310f72c3becf7044234f473f0c65c2d21b2aa1e91e41daf890cba4548066c40ed8902dee5a55c104d686046d21e23
 EBUILD chisel-2.2.22.ebuild 1419 SHA256 20cf7960a3a11c27d7106d1114241b9ede8efc690585db59ca901cf57639229c SHA512 6e72b45320c104c69d0950756401ca42c531495bc928e1eb12b29e06f57cf63bfcba857c79c9fcd2cba0c70fe6a93e5a08dc66728797276ef31a5df7c85cbafd WHIRLPOOL cefdac2a073227ebefa774d5a520c19bb46310f72c3becf7044234f473f0c65c2d21b2aa1e91e41daf890cba4548066c40ed8902dee5a55c104d686046d21e23
+EBUILD chisel-2.2.27-r1.ebuild 1501 SHA256 0224c26f01b533ec8a5df2129467450aa29c3da98f60bb5da8115c38af2ab0e2 SHA512 321689cbbe394eda16ae7c92751afafa1b9bf0c7b6ee8577a53223d972426d4e4811261c9ec12556161d451ab4763f96be52cf3b25e81ad45b54b0d1cdc78bf9 WHIRLPOOL 29c47e2ef5516c2c6bbf43191e6ff5262e73904e34020c01dc75e0eb32f45ab2b4e8dd3bd81afcac401e6c6578fbc4b3b2c056cd8aa8bb801f9bf33a292b1f70
 EBUILD chisel-2.2.27.ebuild 1419 SHA256 20cf7960a3a11c27d7106d1114241b9ede8efc690585db59ca901cf57639229c SHA512 6e72b45320c104c69d0950756401ca42c531495bc928e1eb12b29e06f57cf63bfcba857c79c9fcd2cba0c70fe6a93e5a08dc66728797276ef31a5df7c85cbafd WHIRLPOOL cefdac2a073227ebefa774d5a520c19bb46310f72c3becf7044234f473f0c65c2d21b2aa1e91e41daf890cba4548066c40ed8902dee5a55c104d686046d21e23
diff --git a/sci-electronics/chisel/chisel-2.2.27-r1.ebuild b/sci-electronics/chisel/chisel-2.2.27-r1.ebuild
new file mode 100644
index 0000000..2b06070
--- /dev/null
+++ b/sci-electronics/chisel/chisel-2.2.27-r1.ebuild
@@ -0,0 +1,77 @@
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A HDL"
+HOMEPAGE="http://github.com/ucb-bar/${PN}/"
+SRC_URI="https://github.com/ucb-bar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/$PV"
+KEYWORDS="amd64 amd64-linux"
+IUSE=""
+
+RDEPEND="dev-java/sbt-bin
+         dev-lang/scala"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+        epatch "${FILESDIR}/${PN}-2.2.27-copy_to_target.patch"
+}
+
+src_configure() {
+        cat >Configfile <<EOF
+PREFIX = ${EPREFIX}/usr
+
+LANGUAGES += scala
+LANGUAGES += pkgconfig
+LANGUAGES += h
+LANGUAGES += bash
+
+LIBRARIES += libchisel.jar
+SOURCES += main/scala/Driver.scala
+
+LIBRARIES += pkgconfig/chisel.pc
+SOURCES += chisel.pc
+
+HEADERS += chisel/emulator.h
+SOURCES += main/resources/emulator.h
+
+HEADERS += chisel/emulator_mod.h
+SOURCES += main/resources/emulator_mod.h
+
+HEADERS += chisel/emulator_api.h
+SOURCES += main/resources/emulator_api.h
+
+BINARIES += chisel-hdrtar
+SOURCES  += chisel-hdrtar.bash
+
+BINARIES += chisel-jargen
+SOURCES  += chisel-jargen.bash
+EOF
+
+        cat > src/chisel.pc <<EOF
+prefix=@@pconfigure_prefix@@
+exec_prefix=@@pconfigure_prefix@@
+libdir=\${prefix}/@@pconfigure_libdir@@
+includedir=\${prefix}/@@pconfigure_hdrdir@@
+
+Name: chisel
+Description: A HDL
+Version: $PV
+Libs: -lchisel
+Cflags: -I\${includedir}/chisel
+URL: http://github.com/ucb-bar/chisel
+EOF
+
+        cat >src/chisel-jargen.bash <<EOF
+cat ${EPREFIX}/usr/lib/libchisel.jar
+EOF
+
+        cat >src/chisel-hdrtar.bash <<EOF
+tar -C ${EPREFIX}/usr/include/chisel -c .
+EOF
+
+	pconfigure
+}
diff --git a/sci-electronics/chisel/files/chisel-2.2.27-copy_to_target.patch b/sci-electronics/chisel/files/chisel-2.2.27-copy_to_target.patch
new file mode 100644
index 0000000..557ae69
--- /dev/null
+++ b/sci-electronics/chisel/files/chisel-2.2.27-copy_to_target.patch
@@ -0,0 +1,17 @@
+diff --git a/src/main/scala/Cpp.scala b/src/main/scala/Cpp.scala
+index 575b1d875eb8..27520c23491d 100644
+--- a/src/main/scala/Cpp.scala
++++ b/src/main/scala/Cpp.scala
+@@ -1843,9 +1843,9 @@ class CppBackend extends Backend {
+       }
+     }
+     /* Copy the emulator headers into the targetDirectory. */
+-    copyToTarget("emulator_mod.h")
+-    copyToTarget("emulator_api.h")
+-    copyToTarget("emulator.h")
++    //copyToTarget("emulator_mod.h")
++    //copyToTarget("emulator_api.h")
++    //copyToTarget("emulator.h")
+   }
+ 
+   // Return true if we want this node to be included in the main object.
-- 
cgit v1.2.3-18-g5258