summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-06-24 17:26:10 +0000
committerJustin Lecher <jlec@gentoo.org>2010-06-24 17:26:10 +0000
commit089cbf93b68ca337921157b7be45dd4880fda93d (patch)
tree4a676f790ec04a7222493aabc52270f8a09c5a92 /sci-electronics
parentRemoving masked entry for octave-forge, now gone (diff)
downloadhistorical-089cbf93b68ca337921157b7be45dd4880fda93d.tar.gz
historical-089cbf93b68ca337921157b7be45dd4880fda93d.tar.bz2
historical-089cbf93b68ca337921157b7be45dd4880fda93d.zip
Version Bump and restricting gtk+ version #273237
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/balsa/ChangeLog10
-rw-r--r--sci-electronics/balsa/Manifest21
-rw-r--r--sci-electronics/balsa/balsa-3.5.ebuild44
-rw-r--r--sci-electronics/balsa/balsa-4.0.ebuild139
-rw-r--r--sci-electronics/balsa/files/4.0-datadir.patch73
-rw-r--r--sci-electronics/balsa/files/4.0-libdir.patch36
6 files changed, 298 insertions, 25 deletions
diff --git a/sci-electronics/balsa/ChangeLog b/sci-electronics/balsa/ChangeLog
index e79c10c8aabf..e6d9ea02417f 100644
--- a/sci-electronics/balsa/ChangeLog
+++ b/sci-electronics/balsa/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-electronics/balsa
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/ChangeLog,v 1.13 2009/09/23 19:59:23 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/ChangeLog,v 1.14 2010/06/24 17:26:10 jlec Exp $
+
+*balsa-4.0 (24 Jun 2010)
+
+ 24 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/4.0-datadir.patch,
+ balsa-3.5.ebuild, +files/4.0-libdir.patch, +balsa-4.0.ebuild:
+ Version Bump and restricting gtk+ version, #273237
23 Sep 2009; Patrick Lauer <patrick@gentoo.org> balsa-3.5.ebuild:
Remove virtual/libc
diff --git a/sci-electronics/balsa/Manifest b/sci-electronics/balsa/Manifest
index d7646076e8d8..df2645e8ed78 100644
--- a/sci-electronics/balsa/Manifest
+++ b/sci-electronics/balsa/Manifest
@@ -1,9 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.0-datadir.patch 2318 RMD160 be7cf78893871eb218f5b346bcba8d6b3da8980e SHA1 38cc40e9898e7115eac829d8cc78e612cc645c16 SHA256 3c77aa00d2a5e50ca736842f5540de9e276df752e02e0498837fe0da2ed8a0ff
+AUX 4.0-libdir.patch 1383 RMD160 a8c42ab1d62282c6b252e498e58b474d84ccd65a SHA1 9f7036ff697e7ecd2ad536c5ef60ace186f609b9 SHA256 35cadc286414b4ce10f2b4c8dcf153dab1eaf08243b999b5ac09bf6ddf429b1e
DIST BalsaExamples3.5.tar.gz 3129103 RMD160 3de009c2e4eb01f85783aaa9ecf059b875a628d5 SHA1 5aa10d41d90a204eb5989156cad5098c3a4b3725 SHA256 314bc91b756a61fd2661c94419ae8a3b2c2a34d34d3f75fc38a7fb37745572aa
DIST BalsaManual3.5.pdf 1270733 RMD160 48382fefcb2b38d92635dfd0377eed438934bf2b SHA1 41a40bd1dff051b310733f3030aedd18a3ff2554 SHA256 847bc11d046d462a7c5b568792aa4d29db7291906acc9c206a40e7565c7de026
DIST balsa-3.5.tar.gz 2548896 RMD160 92521a798504f96573309af1cc156a87b43900e4 SHA1 43e859fea9f6d2f510c4d382ca388a05fa5bd059 SHA256 14dbe33521b007db5833cf6110363f9016cbdc085dcd54afe8657ddbe5a8920c
+DIST balsa-4.0.tar.gz 2828800 RMD160 eca3b04389ace407d7a04ef696851b7668c3de5d SHA1 d40374380f7aa9ad14b91db39ee587421cac2d12 SHA256 ae69842dd698e4b97fe3d78c125c40ebda8ba1879a086b5beb135103d3ee3d34
DIST balsa-sim-verilog-3.5.tar.gz 317550 RMD160 1c68e85b112e0d2457b855f4ca9a38c3b64b9f00 SHA1 30e6015f50adbb470fd2e39efc12490d7b169ed3 SHA256 b3cebcf482ac749e0d982b532b5fe1c5f0ec4316cab7e3eff7a8d3928768c529
+DIST balsa-sim-verilog-4.0.tar.gz 301397 RMD160 8c4db80fcfcf8f91be8c21570550904ae74091ca SHA1 73e622307fb34896f175cb059fa71c757364f752 SHA256 972f3151b2e37e56bd4c5210de263d006dcf8913e3e757ad0623cedc0c821fef
DIST balsa-tech-example-3.5.tar.gz 133932 RMD160 ba4db1c73acedca937b1f13cd75203e38d447952 SHA1 b96b6739144d73fba6917ff54192d22145c68df6 SHA256 b8d8020ffb91e9224e386adec825a9a3681a24932548257c0ad305f29f626d6c
+DIST balsa-tech-example-4.0.tar.gz 137704 RMD160 8b335070c02a17888cdb4a227d03da62f346f045 SHA1 61ca66e48e135711183c9e7f2f75f1820162377a SHA256 495cb6adb6759e8c5eb2b87ac4ea530f3b5598d19985ed673e4ba180fb18f78a
DIST balsa-tech-xilinx-3.5.tar.gz 169267 RMD160 5e7ce5e7fe276686d2b46f301dadfe894eca1448 SHA1 90394a91ab1ff3a3e34c895591c85cbbcb165850 SHA256 75009f7d8c6a3bfd4b9e393d34a6e571f7f80d5d4d2bef6e2f8ea0a3a5bd17bc
-EBUILD balsa-3.5.ebuild 4095 RMD160 5ce49e9218f9d467acf358f85b93464a7bff0152 SHA1 065e58c4ffd159a409011369e91abbd27aa0b77c SHA256 8f8e1c99851c907575369f0f6c5c6c96f709ef3fcef7a63a82a739a10fa243dd
-MISC ChangeLog 4241 RMD160 9264ac11d22d7f8eed2e178b8fd40da9b6fff918 SHA1 0fd3a77aa8045ab935dfb3c1e1d03302e2b87cbc SHA256 a197800681b4ab589304f60f8b7c6154f41699b49f9e31e0880d8007c6076913
+DIST balsa-tech-xilinx-4.0.tar.gz 159683 RMD160 a5b7fc24590df1b692d89abc9da5f6cb08eab35f SHA1 c3dcdd68570277a623fe05a87931f00c04e73eb9 SHA256 2ca6cc877bef0406a4d219e2ca1c66932d3c725b23b19eef7123b124ad673e5f
+EBUILD balsa-3.5.ebuild 4140 RMD160 f2ea20c11662e57c16a3422d6d02b2f04671214c SHA1 ebd1aa311754bdc23825bd8b5505a634da367753 SHA256 c969211d7a342f7c9c9d67bee448925d8c39d03b540dabc86ba3fdadd17ed994
+EBUILD balsa-4.0.ebuild 3868 RMD160 9ebc701716d3a014ab90040c1ea3c43f58448e05 SHA1 d5506e2a4eccb9e5fc8a61c95bedfc86c7be2810 SHA256 8380a8f0fb9d584bfc990132f1073bebe3a99affaf19ceb4e97d5c811ff927bb
+MISC ChangeLog 4455 RMD160 737ebb09460ca5b4a9926a48b775b295f2657c41 SHA1 cb1b4c24bbc9c73c189b2468021acaa1cc052ef2 SHA256 807c671beb4f2ada1d043ea9fdbb6eddf639313ffe99af7cb2e2e5e67210b7ec
MISC metadata.xml 611 RMD160 4311bd55127bf7281a5f5067b44b8e3fb9b132c4 SHA1 dc0c76810989064ca47f4b4984788a14c78acb50 SHA256 92dfc360bffe6191cc618b032aeb2efb0498b1a3d0326eed80fcc9fc332ed5fd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjlUEACgkQgAnW8HDreRaf1wCghThbrmdYlVYh7rs2J3VLey2x
+M80AoKYEeRqYrDQiTTIIrgj6j3fU8jKk
+=uupv
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/balsa/balsa-3.5.ebuild b/sci-electronics/balsa/balsa-3.5.ebuild
index 96084266a902..cd61e9bb204d 100644
--- a/sci-electronics/balsa/balsa-3.5.ebuild
+++ b/sci-electronics/balsa/balsa-3.5.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-3.5.ebuild,v 1.3 2009/09/23 19:59:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-3.5.ebuild,v 1.4 2010/06/24 17:26:10 jlec Exp $
+
+EAPI="1"
inherit eutils
-IUSE=""
DESCRIPTION="The Balsa asynchronous synthesis system"
HOMEPAGE="http://www.cs.manchester.ac.uk/apt/projects/tools/balsa/"
@@ -19,11 +20,12 @@ SRC_URI="ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${PV}/BalsaExamples${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~ppc"
+IUSE=""
DEPEND="sys-devel/binutils
dev-libs/gmp
dev-lang/perl
- x11-libs/gtk+
+ x11-libs/gtk+:1
sci-electronics/iverilog
sci-electronics/gplcver"
@@ -44,10 +46,10 @@ src_unpack() {
if [ $TECH_AMS ]; then
unpack ${BALSA_TECH_AMS}
fi
- sed -i -e "s:\(DEFAULT_INCLUDES = \)\(.*\):\1-I${S}/src/libs/ \2/:" ${WORKDIR}/balsa-sim-verilog-${PV}/libs/Makefile.in
- sed -i -e 's/ $(bindir)/ $(DESTDIR)$(bindir)/' ${S}/bin/Makefile.in
- sed -i -e 's/ $(balsatypesdir)/ $(DESTDIR)$(balsatypesdir)/' ${S}/share/balsa/types/Makefile.in
- sed -i -e 's/ $(balsasimdir)/ $(DESTDIR)$(balsasimdir)/' ${S}/share/balsa/sim/Makefile.in
+ sed -i -e "s:\(DEFAULT_INCLUDES = \)\(.*\):\1-I"${S}"/src/libs/ \2/:" "${WORKDIR}"/balsa-sim-verilog-${PV}/libs/Makefile.in
+ sed -i -e 's/ $(bindir)/ $(DESTDIR)$(bindir)/' "${S}"/bin/Makefile.in
+ sed -i -e 's/ $(balsatypesdir)/ $(DESTDIR)$(balsatypesdir)/' "${S}"/share/balsa/types/Makefile.in
+ sed -i -e 's/ $(balsasimdir)/ $(DESTDIR)$(balsasimdir)/' "${S}"/share/balsa/sim/Makefile.in
}
src_compile() {
@@ -55,30 +57,30 @@ src_compile() {
einfo "Compiling balsa"
./configure --prefix=/usr/ || die "econf failed"
chmod +x bin/balsa-config
- PATH=$PATH:${S}/bin
+ PATH=$PATH:"${S}"/bin
emake -j1 || die
# configure AMS035 tech
if [ $TECH_AMS ]; then
einfo "Compiling AMS035 tech"
- cd ${WORKDIR}/balsa-tech-ams-20030506
+ cd "${WORKDIR}"/balsa-tech-ams-20030506
econf || die "econf failed"
fi
# config Xilinx FPGA backend
einfo "Compiling Xilinx FPGA backend"
- cd ${WORKDIR}/balsa-tech-xilinx-${PV}
+ cd "${WORKDIR}"/balsa-tech-xilinx-${PV}
econf || die "econf failed"
# config example tech
einfo "Compiling tech example"
- cd ${WORKDIR}/balsa-tech-example-${PV}
+ cd "${WORKDIR}"/balsa-tech-example-${PV}
econf || die "econf failed"
# config verilog simulator wrappers
einfo "Compiling verilog simulator wrappers"
- cd ${WORKDIR}/balsa-sim-verilog-${PV}
- ./configure --includedir=${S}/src/libs/balsasim \
+ cd "${WORKDIR}"/balsa-sim-verilog-${PV}
+ ./configure --includedir="${S}"/src/libs/balsasim \
--with-icarus-includes=/usr/include \
--with-icarus-libs=/usr/lib \
--with-cver-includes=/usr/include/cver_pli_incs || die
@@ -86,31 +88,31 @@ src_compile() {
src_install() {
# install balsa
- cd ${S}
+ cd "${S}"
einfo "Installing balsa"
make DESTDIR=${D} install || die
# install manual and examples
dodir /usr/share/doc/${P}/
- cp -pPR ${WORKDIR}/BalsaExamples ${D}/usr/share/doc/${P}/
+ cp -pPR "${WORKDIR}"/BalsaExamples ${D}/usr/share/doc/${P}/
dodoc ${DISTDIR}/BalsaManual${PV}.pdf
if [ $TECH_AMS ]; then
einfo "Installing AMS035 tech"
- cd ${WORKDIR}/balsa-tech-ams-20030506
+ cd "${WORKDIR}"/balsa-tech-ams-20030506
make DESTDIR=${D} install || die "make install failed"
fi
einfo "Installing Xilinx FPGA tech"
- cd ${WORKDIR}/balsa-tech-xilinx-${PV}
+ cd "${WORKDIR}"/balsa-tech-xilinx-${PV}
make DESTDIR=${D} install || die "make install failed"
einfo "Installing example tech"
- cd ${WORKDIR}/balsa-tech-example-${PV}
+ cd "${WORKDIR}"/balsa-tech-example-${PV}
make DESTDIR=${D} install || die "make install failed"
einfo "Installing verilog simulator wrappers"
- cd ${WORKDIR}/balsa-sim-verilog-${PV}
+ cd "${WORKDIR}"/balsa-sim-verilog-${PV}
DESTDIR=${D} make install || die "make verilog wrappers failed"
# fix paths
@@ -120,7 +122,7 @@ src_install() {
find . -name "sed*" -exec rm -f {} \;
# add some docs
- cd ${S}
+ cd "${S}"
einfo "Installing docs"
dodoc AUTHORS COPYING NEWS README TODO
mv ${D}/usr/doc/* ${D}/usr/share/doc/${P}/
diff --git a/sci-electronics/balsa/balsa-4.0.ebuild b/sci-electronics/balsa/balsa-4.0.ebuild
new file mode 100644
index 000000000000..66f1e4cb9e3e
--- /dev/null
+++ b/sci-electronics/balsa/balsa-4.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/balsa/balsa-4.0.ebuild,v 1.1 2010/06/24 17:26:10 jlec Exp $
+
+EAPI="1"
+
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="The Balsa asynchronous synthesis system"
+HOMEPAGE="http://www.cs.manchester.ac.uk/apt/projects/tools/balsa/"
+SRC_URI="
+ ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${PV}/${P}.tar.gz
+ ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${PV}/${PN}-sim-verilog-${PV}.tar.gz
+ ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${PV}/${PN}-tech-example-${PV}.tar.gz
+ ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/${PV}/${PN}-tech-xilinx-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND="
+ dev-lang/perl
+ dev-libs/gmp
+ sci-electronics/gplcver
+ sci-electronics/iverilog
+ x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+ dev-scheme/guile
+ media-gfx/graphviz
+ sci-electronics/espresso-ab
+ sci-electronics/gtkwave "
+
+BALSA_TECH_AMS="balsa-tech-ams-20030506.tar.gz"
+
+if [ -f ${DISTDIR}/${BALSA_TECH_AMS} ]; then
+ TECH_AMS=1
+fi
+
+src_unpack() {
+ unpack ${A}
+ if [ $TECH_AMS ]; then
+ unpack ${BALSA_TECH_AMS}
+ fi
+ cd "${S}"
+ epatch "${FILESDIR}"/${PV}-libdir.patch
+ epatch "${FILESDIR}"/${PV}-datadir.patch
+ eautoreconf
+ sed -i -e "s:\(DEFAULT_INCLUDES = \)\(.*\):\1-I"${S}"/src/libs/ \2/:" "${WORKDIR}"/balsa-sim-verilog-${PV}/libs/Makefile.in
+ sed -i -e 's/ $(bindir)/ $(DESTDIR)$(bindir)/' "${S}"/bin/Makefile.in
+ sed -i -e 's/ $(balsatypesdir)/ $(DESTDIR)$(balsatypesdir)/' "${S}"/share/balsa/types/Makefile.in
+ sed -i -e 's/ $(balsasimdir)/ $(DESTDIR)$(balsasimdir)/' "${S}"/share/balsa/sim/Makefile.in
+}
+
+src_compile() {
+ tc-export CXX
+ # compile balsa
+ einfo "Compiling balsa"
+ econf
+ chmod +x bin/balsa-config
+ PATH="$PATH:"${S}"/bin"
+ emake -j1 || die
+
+ # configure AMS035 tech
+ if [ $TECH_AMS ]; then
+ einfo "Compiling AMS035 tech"
+ cd "${WORKDIR}"/balsa-tech-ams-20030506
+ econf
+ fi
+
+ # config Xilinx FPGA backend
+ einfo "Compiling Xilinx FPGA backend"
+ cd "${WORKDIR}"/balsa-tech-xilinx-${PV}
+ econf
+
+ # config example tech
+ einfo "Compiling tech example"
+ cd "${WORKDIR}"/balsa-tech-example-${PV}
+ econf
+
+ # config verilog simulator wrappers
+ einfo "Compiling verilog simulator wrappers"
+ cd "${WORKDIR}"/balsa-sim-verilog-${PV}
+# ./configure --includedir="${S}"/src/libs/balsasim \
+ econf \
+ --includedir="${S}"/src/libs/balsasim \
+ --with-icarus-includes=/usr/include \
+ --with-icarus-libs=/usr/$(get_libdir) \
+ --with-cver-includes=/usr/include/cver_pli_incs || die
+}
+
+src_install() {
+ # install balsa
+ einfo "Installing balsa"
+ emake DESTDIR=${D} install || die
+
+ if [ $TECH_AMS ]; then
+ einfo "Installing AMS035 tech"
+ cd "${WORKDIR}"/balsa-tech-ams-20030506
+ emake DESTDIR=${D} install || die "make install failed"
+ fi
+
+ einfo "Installing Xilinx FPGA tech"
+ cd "${WORKDIR}"/balsa-tech-xilinx-${PV}
+ emake DESTDIR=${D} install || die "make install failed"
+
+ einfo "Installing example tech"
+ cd "${WORKDIR}"/balsa-tech-example-${PV}
+ emake DESTDIR=${D} install || die "make install failed"
+
+ einfo "Installing verilog simulator wrappers"
+ cd "${WORKDIR}"/balsa-sim-verilog-${PV}
+ DESTDIR=${D} emake install || die "make verilog wrappers failed"
+
+ # fix paths
+ cd ${D}
+ einfo "Fixing paths"
+ find . -type f -exec sed -i -e "s:${D}::" {} \;
+ find . -name "sed*" -exec rm -f {} \;
+
+ # add some docs
+ cd "${S}"
+ einfo "Installing docs"
+ dodoc AUTHORS NEWS README TODO || die
+
+ # fix collisions
+ rm -f ${D}/usr/bin/libtool || die
+}
+
+pkg_postinst() {
+ if [ ! $TECH_AMS ]; then
+ elog "The AMS035 tech library was not installed."
+ elog "If you have the appropriate licenses request"
+ elog "the tech support files directly from balsa@cs.man.ac.uk"
+ elog "and add them to /usr/portage/distfiles before emerging."
+ else
+ elog "The AMS035 tech library was found and installed."
+ fi
+}
diff --git a/sci-electronics/balsa/files/4.0-datadir.patch b/sci-electronics/balsa/files/4.0-datadir.patch
new file mode 100644
index 000000000000..2693508d4ad3
--- /dev/null
+++ b/sci-electronics/balsa/files/4.0-datadir.patch
@@ -0,0 +1,73 @@
+diff --git a/share/scheme/Makefile.am b/share/scheme/Makefile.am
+index 37f9332..e3d81d0 100644
+--- a/share/scheme/Makefile.am
++++ b/share/scheme/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-schemedir = $(datadir)/scheme
++schemedir = $(datadir)/balsa/scheme
+
+ scheme_DATA = \
+ balsa-list-builtins.scm \
+diff --git a/share/style/dual_b/Makefile.am b/share/style/dual_b/Makefile.am
+index 478910d..d41a873 100644
+--- a/share/style/dual_b/Makefile.am
++++ b/share/style/dual_b/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-styledual_bdir = $(datadir)/style/dual_b
++styledual_bdir = $(datadir)/balsa/style/dual_b
+
+ styledual_b_DATA = \
+ startup.scm \
+diff --git a/share/style/four_b_rb/Makefile.am b/share/style/four_b_rb/Makefile.am
+index 9eeac84..b167939 100644
+--- a/share/style/four_b_rb/Makefile.am
++++ b/share/style/four_b_rb/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-stylefour_b_rbdir = $(datadir)/style/four_b_rb
++stylefour_b_rbdir = $(datadir)/balsa/style/four_b_rb
+
+ stylefour_b_rb_DATA = \
+ startup.scm \
+diff --git a/share/style/four_e_e/Makefile.am b/share/style/four_e_e/Makefile.am
+index d374125..f3d9db6 100644
+--- a/share/style/four_e_e/Makefile.am
++++ b/share/style/four_e_e/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-stylefour_e_edir = $(datadir)/style/four_e_e
++stylefour_e_edir = $(datadir)/balsa/style/four_e_e
+
+ stylefour_e_e_DATA = \
+ startup.scm \
+diff --git a/share/style/one_of_2_4/Makefile.am b/share/style/one_of_2_4/Makefile.am
+index ed02904..18d9201 100644
+--- a/share/style/one_of_2_4/Makefile.am
++++ b/share/style/one_of_2_4/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-styleone_of_2_4dir = $(datadir)/style/one_of_2_4
++styleone_of_2_4dir = $(datadir)/balsa/style/one_of_2_4
+
+ styleone_of_2_4_DATA = \
+ startup.scm \
+diff --git a/share/tech/common/Makefile.am b/share/tech/common/Makefile.am
+index 8a34646..0190b73 100644
+--- a/share/tech/common/Makefile.am
++++ b/share/tech/common/Makefile.am
+@@ -2,7 +2,7 @@
+
+ SUBDIRS =
+
+-techcommondir = $(datadir)/tech/common
++techcommondir = $(datadir)/balsa/tech/common
+
+ techcommon_DATA = \
+ components.abs \
diff --git a/sci-electronics/balsa/files/4.0-libdir.patch b/sci-electronics/balsa/files/4.0-libdir.patch
new file mode 100644
index 000000000000..9ba9739dc29f
--- /dev/null
+++ b/sci-electronics/balsa/files/4.0-libdir.patch
@@ -0,0 +1,36 @@
+diff --git a/share/balsa/parts/Makefile.am b/share/balsa/parts/Makefile.am
+index 6873e26..e168d70 100644
+--- a/share/balsa/parts/Makefile.am
++++ b/share/balsa/parts/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-balsapartsdir = $(datadir)/balsa/parts
++balsapartsdir = $(libdir)/balsa/parts
+
+ balsa_files = buffers.balsa counters.balsa
+ breeze_files = buffers.breeze counters.breeze
+diff --git a/share/balsa/sim/Makefile.am b/share/balsa/sim/Makefile.am
+index 2cd2932..233d2ec 100644
+--- a/share/balsa/sim/Makefile.am
++++ b/share/balsa/sim/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-balsasimdir = $(datadir)/balsa/sim
++balsasimdir = $(libdir)/balsa/sim
+
+ breeze_files = fileio.breeze string.breeze memory.breeze sim.breeze portio.breeze
+ balsa_files = fileio.balsa string.balsa memory.balsa sim.balsa portio.balsa
+diff --git a/share/balsa/types/Makefile.am b/share/balsa/types/Makefile.am
+index 475058a..317176f 100644
+--- a/share/balsa/types/Makefile.am
++++ b/share/balsa/types/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-balsatypesdir = $(datadir)/balsa/types
++balsatypesdir = $(libdir)/balsa/types
+
+ balsa_files = basic.balsa builtin.balsa synthesis.balsa types.balsa
+ breeze_files = basic.breeze builtin.breeze synthesis.breeze types.breeze