Remove old.

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

4 files changed, 13 insertions, 501 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index 055a8c6ba544..51c8533aa1f4 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.11 2012/03/22 01:09:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.12 2012/04/04 22:11:52 radhermit Exp $
+
+  04 Apr 2012; Tim Harder <radhermit@gentoo.org> -csound-5.16.6-r2.ebuild,
+  -files/csound-5.16.6-scons.patch:
+  Remove old.
 
   22 Mar 2012; Tim Harder <radhermit@gentoo.org> -csound-5.16.6-r1.ebuild:
   Remove old.
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index e2910c54a4a8..07ed41316541 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,31 +2,24 @@
 Hash: SHA512
 
 AUX csound-5.16.6-install.patch 7688 RMD160 1f7da4193df6e187ff0d7bc5cf7ab55d161b0fd3 SHA1 6a510c171c9133172fd543044ca66fbe395dc51a SHA256 95cb4f08c57aa6a6135f7c4038242678fff39af58d892cc38ba031dab120039e
-AUX csound-5.16.6-scons.patch 13242 RMD160 eea3573ec06bd5e95565e18a84ac12f365e633d9 SHA1 a1b3ce1a9636808b9b4195e28647afa2530fc83b SHA256 bc3fd9348c067a1fcd6694d6496f668e7ab1601182987a88194606b25656e3d4
 AUX csound-5.16.6-tests.patch 2356 RMD160 6b3d93e4e062d009b7776ece4cf9c39a7da7ac0c SHA1 11e2132a702565c7386c4b54b2e42d63820fd568 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca
 AUX csound-5.17.2-scons.patch 13382 RMD160 1d98fdbb0333dd405c44264b2cbf6b5e39f9dd3a SHA1 a68c0f862d94f1183cce3d1aa297df526e2642a9 SHA256 e9425100c7fd9bee73e7c8aeb1a6b17dffda4161769bda90cc9fc02c3567712b
-DIST Csound5.16.6.tar.gz 8735038 RMD160 49f3f7af3cfca6e129750564822698f4d2433329 SHA1 28bbf5d34ee5bb11dc1d50fb122b5a706d317c33 SHA256 0ba912850152aeddb7eb757a33c185e3d50b4807548db6d7ba6cf85de15e7ffb
-DIST Csound5.16_manual-fr_html.zip 9711044 RMD160 951a5e6872c888b49917e172f1b5a2a034656b5b SHA1 4eeb02ac504cb159aab9201b88ca204d78634909 SHA256 eeaa0bbd050b2dc44f65d64410e4affb456690635c37c67355819ec9709b9ca0
-DIST Csound5.16_manual-fr_pdf.zip 5969838 RMD160 8710496e4909ac80df2a2fb48c124d811f3cffe7 SHA1 68a7dc63bf08b04aee8635d0cf13c44214fe743d SHA256 a30f30554529d891018534dc1de06cb7c7499d80f1b618f9977cf457194e8091
-DIST Csound5.16_manual_html.zip 9451986 RMD160 262888c476044827f872764ba3a5ffab3717d42f SHA1 4dbe80c06a6573066269ce1ee0ac466a03414a65 SHA256 572b1b3825fd5203d00e3db6db7a190a17212b28de425cc0373e705d44aa2c8b
-DIST Csound5.16_manual_pdf.zip 5661273 RMD160 a63c6806366e0b7bb702096d10d956194d2c9378 SHA1 91ee66b4c4aa93757165a391a19e8039ef9a6982 SHA256 66550eb53a77b942ad073be63c12dca66b6960d5995a6a241dde255d2d0be85b
 DIST Csound5.17.2.tar.gz 8777963 RMD160 79bb854e722c049afd4a2e048b2332223c2a0f97 SHA1 717233f40fe516a955b9caf2ddad3b5c85634b36 SHA256 b46c7efc23831b2c611b0f77d2222a8d0055eee094d92ac3fb7eb1aa969003bb
 DIST Csound5.17_manual-fr_html.zip 9881142 RMD160 089a4fa7bbcd194494f9a20f10166b4f05c8af59 SHA1 a170cf2f3009ac6055bcc91e9104d33146c286c2 SHA256 9c2a6639ee733329269f1474a60e0233aded2b9f11d1f183fd9602fc38d301f5
 DIST Csound5.17_manual-fr_pdf.zip 6044660 RMD160 44a188bcaf70afba2e9e884460348aa6a6e50fad SHA1 2ef4ee6ce503d40ddc9f6afb9104fce66d28cc47 SHA256 03033ef48e570c89b6a2b4c70c1c29e379f5d09d0f5d98a24fe5bf1ee559164a
 DIST Csound5.17_manual_html.zip 9621312 RMD160 fbd6d343dbbe6787e10b3abbc35011713db27cea SHA1 20c22f73abc5b4a72956881d5cbde1587d853a31 SHA256 cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626
 DIST Csound5.17_manual_pdf.zip 5736239 RMD160 469f7a1df1ef33b17bc3de169123c4842e30994a SHA1 e27d16ed45e7a9b40d129d8b32411775faff5e29 SHA256 72d3e416b1e2fa7d60d67f803083f86ec12a09a4af427713a5a6a10472f95ee8
-EBUILD csound-5.16.6-r2.ebuild 5965 RMD160 0669a596401bee4e656a382c769877118350299b SHA1 46d05434e3e7b1f4c802f9f9de877ac038928b17 SHA256 57439f5e16382d31aa08f1567b1c3d84e18dc3f9d42b8272efee200d5e943545
 EBUILD csound-5.17.2.ebuild 5978 RMD160 0bb7d35e532306e2989f615adb71529df53071ce SHA1 770179215186e71d768638b5d4fc97e798e44a48 SHA256 2c7a2bc5d14d85dd0d62a5ae3e53a7fabb17f68fc63c5e10a7aa9ab3bda69fbe
-MISC ChangeLog 1937 RMD160 2953f87354a26a90dbcfad9fa138de7161986ce1 SHA1 c52147f1ef34a29523b4009cf2f1d5a92129ca13 SHA256 b76d5a73efa59c180647920f2b89a2025dc3672800141729c8e51063d4c96b95
+MISC ChangeLog 2063 RMD160 54ea79dcc3078f56915e7a8e55f3d8270d0227b2 SHA1 892e0f50d5d5872e602df2f14fcbebe2a4b67b52 SHA256 d1dd198d8fa5f2019136b358e60402f7262d907e2626a3c0512ac9e5ed7ef8f3
 MISC metadata.xml 1542 RMD160 66c42128d2804adaf637a42aee0c4893e6ed52a6 SHA1 42307af3bd5bfd5a994d828eb56a9a357b40fd31 SHA256 d889b4005dc6559b83b68ba6b19f9c4c34690e3d6ac8931da93ea00dd57340a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPanvhAAoJEEqz6FtPBkyjC7wH/Am2ot7dr6OWgQlX/2NQ+AtV
-7H4COXgQYvCU70kxyMP26CPpFXvBoOeE88/2/wXL+ap8nkS0Z9sY1ZOhbGGfI1Sg
-YtodnAJmzebkjsxH7WN0d5eFhImocnARRc+DIQW/BPaHz5Gpi4Rglir024ol5wJh
-Nkpo1yUhBG/i4uWiw3aqdLlNAlSI5Tygc5Cv+M7AWmk65e+Pg8/IJYQ875rglFm8
-SOToztjjqN0QLPoectjo1gWettgft4b7dBBfaVngNH2DRfBFCTPSFlqICgG0F2/v
-BP4dgNL3Xl9MITobns4Lfaziv7aFFaciZrY0PtmP1zCAgDb4FoS2ME5QEGpFtO0=
-=9YOI
+iQEcBAEBCgAGBQJPfMc1AAoJEEqz6FtPBkyjVysH/2A2ddqV0A+7PmMSctZmHMuz
+CnN8wQdE2IjllEuvhFZN5tzyFBgNpfVCCfgIFL+g9EMlcYY0gYwNt9A8Ct+eP3AS
+JT2GeNM26Jh7s9PDHAsMe+W10fknfzgLbwCM+ybe908iltN5/WAxU/saMnW4Szz2
+0wU2c7z0FW+ZTF3duy1+B8p3JGOjvlAPVGOY/PnCQsukaaJUgVX/AR+UJdS6ucIe
+JOV81TLb0CcY5JtDNq58TOGruq6lRWFb+sGFOSdT5aovNQvXFj9HuR3dupFiXAhl
+of1+NtUacpOSJxxkd2d8B9gIZcV+vh+z8VvZ1y4T1Q1a7+EdfKuHXNfrqbIXwdw=
+=NNeu
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.16.6-r2.ebuild b/media-sound/csound/csound-5.16.6-r2.ebuild
deleted file mode 100644
index 32d38bfb3450..000000000000
--- a/media-sound/csound/csound-5.16.6-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.16.6-r2.ebuild,v 1.1 2012/02/29 00:54:13 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils multilib python java-pkg-opt-2 scons-utils toolchain-funcs versionator
-
-MY_PN="${PN/c/C}"
-MY_P="${MY_PN}${PV}"
-DOCS_P="${MY_PN}$(get_version_component_range 1-2)"
-
-DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	html? (
-		linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual-fr_html.zip )
-		!linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual_html.zip )
-	)
-	doc? (
-		linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual-fr_pdf.zip )
-		!linguas_fr? ( mirror://sourceforge/${PN}/${DOCS_P}_manual_pdf.zip )
-	)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
-html +image jack java keyboard linear lua luajit nls osc openmp doc portaudio portmidi pulseaudio
-python samples static-libs stk tcl test +threads +utils vim-syntax vst"
-
-LANGS=" de en_GB en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
-
-RDEPEND=">=media-libs/libsndfile-1.0.16
-	alsa? ( media-libs/alsa-lib )
-	csoundac? ( x11-libs/fltk:1[threads?]
-		dev-libs/boost
-		=dev-lang/python-2* )
-	dssi? ( media-libs/dssi
-		media-libs/ladspa-sdk )
-	fluidsynth? ( media-sound/fluidsynth )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	image? ( media-libs/libpng )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( >=virtual/jdk-1.5 )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
-	lua? (
-		luajit? ( dev-lang/luajit:2 )
-		!luajit? ( dev-lang/lua )
-	)
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	stk? ( media-libs/stk )
-	tcl? ( >=dev-lang/tcl-8.5
-		>=dev-lang/tk-8.5 )
-	utils? ( !media-sound/snd )
-	vst? ( x11-libs/fltk:1[threads?]
-		dev-libs/boost
-		=dev-lang/python-2* )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	html? ( app-arch/unzip )
-	doc? ( app-arch/unzip )
-	nls? ( sys-devel/gettext )
-	test? ( =dev-lang/python-2* )
-	vst? ( dev-lang/swig )"
-
-REQUIRED_USE="vst? ( csoundac )
-	java? ( cxx )
-	linear? ( double-precision )
-	lua? ( cxx )
-	python? ( cxx )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-scons.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-install.patch
-
-	cat > custom.py <<-EOF
-		platform = 'linux'
-		customCPPPATH = []
-		customCCFLAGS = "${CFLAGS}".split()
-		customCXXFLAGS = "${CXXFLAGS}".split()
-		customLIBS = []
-		customLIBPATH = []
-		customLINKFLAGS = "${LDFLAGS}".split()
-		customSHLINKFLAGS = []
-		customSWIGFLAGS = []
-	EOF
-}
-
-src_compile() {
-	local myconf
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" Lib64=1"
-
-	escons \
-		prefix=/usr \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		buildNewParser=1 \
-		pythonVersion=$(python_get_version) \
-		$(use_scons alsa useALSA) \
-		$(use_scons beats buildBeats) \
-		$(use_scons chua buildChuaOpcodes) \
-		$(use_scons csoundac buildCsoundAC) \
-		$(use_scons cxx buildInterfaces) \
-		$(use_scons !debug buildRelease) \
-		$(use_scons !debug noDebug) \
-		$(use_scons debug NewParserDebug) \
-		$(use_scons double-precision useDouble) \
-		$(use_scons dssi buildDSSI) \
-		$(use_scons fluidsynth buildFluidOpcodes) \
-		$(use_scons fltk buildCsound5GUI) \
-		$(use_scons fltk useFLTK) \
-		$(use_scons image buildImageOpcodes) \
-		$(use_scons jack useJack) \
-		$(use_scons java buildJavaWrapper) \
-		$(use_scons keyboard buildVirtual) \
-		$(use_scons linear buildLinearOpcodes) \
-		$(use_scons lua buildLuaOpcodes) \
-		$(use_scons lua buildLuaWrapper) \
-		$(use_scons luajit useLuaJIT) \
-		$(use_scons nls useGettext) \
-		$(use_scons osc useOSC) \
-		$(use_scons openmp useOpenMP) \
-		$(use_scons portaudio usePortAudio) \
-		$(use_scons portmidi usePortMIDI) \
-		$(use_scons pulseaudio usePulseAudio) \
-		$(use_scons python buildPythonOpcodes) \
-		$(use_scons python buildPythonWrapper) \
-		$(use_scons !static-libs dynamicCsoundLibrary) \
-		$(use_scons stk buildStkOpcodes) \
-		$(use_scons tcl buildTclcsound) \
-		$(use_scons !threads noFLTKThreads) \
-		$(use_scons threads buildMultiCore) \
-		$(use_scons utils buildUtilities) \
-		$(use_scons vst buildCsoundVST) \
-		${myconf}
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}"
-	cd tests
-	./test.py || die "tests failed"
-}
-
-src_install() {
-	local myconf
-	[[ $(get_libdir) == "lib64" ]] && myconf+=" --word64"
-
-	use vim-syntax && myconf+=" --vimdir=/usr/share/vim/vimfiles"
-
-	./install.py --instdir="${D}" --prefix=/usr ${myconf} || die "install failed"
-	dodoc AUTHORS ChangeLog readme-csound5-complete.txt
-
-	# Generate env.d file
-	if use double-precision ; then
-		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
-	else
-		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
-	fi
-	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
-	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
-	doenvd "${T}"/62${PN}
-
-	if use nls ; then
-		insinto /usr/share/locale
-		for lang in ${LANGS} ; do
-			use linguas_${lang} && doins -r po/${lang}
-		done
-	fi
-
-	if use examples ; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use html ; then
-		dohtml -r "${WORKDIR}"/html/*
-	fi
-
-	if use doc ; then
-		if use linguas_fr ; then
-			dodoc "${WORKDIR}"/${DOCS_P}_manual-fr.pdf
-		else
-			dodoc "${WORKDIR}"/${DOCS_P}_manual.pdf
-		fi
-	fi
-
-	use samples && dodoc -r samples
-}
diff --git a/media-sound/csound/files/csound-5.16.6-scons.patch b/media-sound/csound/files/csound-5.16.6-scons.patch
deleted file mode 100644
index 362fb0e8e4a0..000000000000
--- a/media-sound/csound/files/csound-5.16.6-scons.patch
+++ /dev/null
@@ -1,275 +0,0 @@
---- Csound5.16.6/SConstruct
-+++ Csound5.16.6/SConstruct
-@@ -89,6 +89,9 @@
- commandOptions.Add('usePortMIDI',
-     'Build PortMidi plugin for real time MIDI input and output.',
-     '1')
-+commandOptions.Add('usePulseAudio',
-+    'Set to 1 to use PulseAudio for real-time audio and MIDI input and output.',
-+    '1')
- commandOptions.Add('useALSA',
-     'Set to 1 to use ALSA for real-time audio and MIDI input and output.',
-     '1')
-@@ -101,6 +104,9 @@
- commandOptions.Add('noFLTKThreads',
-     'Set to 1 to disable use of a separate thread for FLTK widgets.',
-     '1')
-+commandOptions.Add('useLuaJIT',
-+    'Set to 1 to use the Just-In-Time Compiler for Lua',
-+    '1')
- commandOptions.Add('pythonVersion',
-     'Set to the Python version to be used.',
-     '%d.%d' % (int(sys.hexversion) >> 24, (int(sys.hexversion) >> 16) & 255))
-@@ -180,6 +186,15 @@
-     commandOptions.Add('dynamicCsoundLibrary',
-         'Build dynamic Csound library instead of libcsound.a',
-         '0')
-+commandOptions.Add('buildChuaOpcodes',
-+    'Set to 1 to build chua opcodes.',
-+    '1')
-+commandOptions.Add('buildLinearOpcodes',
-+    'Set to 1 to build linear algebra opcodes.',
-+    '1')
-+commandOptions.Add('buildFluidOpcodes',
-+    'Set to 1 to build Fluidsynth opcodes.',
-+    '1')
- commandOptions.Add('buildStkOpcodes',
-     "Build opcodes encapsulating Perry Cook's Synthesis Toolkit in C++ instruments and effects",
-     '0')
-@@ -352,6 +367,7 @@
- fileOptions.Add('customCXXFLAGS')
- fileOptions.Add('customLIBS')
- fileOptions.Add('customLIBPATH')
-+fileOptions.Add('customLINKFLAGS')
- fileOptions.Add('customSHLINKFLAGS')
- fileOptions.Add('customSWIGFLAGS')
- fileOptions.Update(commonEnvironment)
-@@ -366,6 +382,8 @@
- commonEnvironment.Prepend(LIBS = customLIBS)
- customLIBPATH = commonEnvironment['customLIBPATH']
- commonEnvironment.Prepend(LIBPATH = customLIBPATH)
-+customLINKFLAGS = commonEnvironment['customLINKFLAGS']
-+commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
- customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
- commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
- customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
-@@ -469,14 +487,6 @@
- if commonEnvironment['buildRelease'] == '0':
-     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
- 
--if commonEnvironment['Lib64'] == '1':
--    if getPlatform() == 'sunos':
--        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
--    else:
--        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
--else:
--    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
--
- if commonEnvironment['Word64'] == '1':
-     if compilerSun():
-         commonEnvironment.Append(CCFLAGS = ['-xcode=pic32'])
-@@ -494,10 +504,7 @@
- if getPlatform() == 'linux':
-     commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
-     commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
--    commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
--    commonEnvironment.Append(CPPPATH = ['/usr/include'])
-     commonEnvironment.Append(CPPPATH = ['/usr/include'])
--    commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include'])
-     commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
-     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
- elif getPlatform() == 'sunos':
-@@ -559,18 +566,17 @@
- 
- if getPlatform() == 'linux':
-     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
--    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
--    pythonIncludePath = [path1, path2]
-+    pythonIncludePath = [path1]
-     path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion']
-     path2 = '/usr/include/tk%s' % commonEnvironment['tclversion']
-     tclIncludePath = [path1, path2]
-     pythonLinkFlags = []
-     if commonEnvironment['Lib64'] == '1':
-         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
--        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
-+        pythonLibraryPath = ['/usr/lib64', tmp]
-     else:
-         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
--        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
-+        pythonLibraryPath = ['/usr/lib', tmp]
-     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
- elif getPlatform() == 'sunos':
-     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-@@ -777,6 +783,7 @@
- zlibhfound = configure.CheckHeader("zlib.h", language = "C")
- midiPluginSdkFound = configure.CheckHeader("funknown.h", language = "C++")
- luaFound = configure.CheckHeader("lua.h", language = "C")
-+luajitFound = configure.CheckLibWithHeader("luajit-5.1", "luajit-2.0/lua.h", language = "C")
- #print 'LUA: %s' % (['no', 'yes'][int(luaFound)])
- swigFound = 'swig' in commonEnvironment['TOOLS']
- print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
-@@ -1452,24 +1459,30 @@
-     swigflags = csoundWrapperEnvironment['SWIGFLAGS']
-     print 'swigflags:', swigflags
-     luaWrapper = None
--    if not (luaFound and commonEnvironment['buildLuaWrapper'] != '0'):
-+    if not (luaFound or luajitFound and commonEnvironment['buildLuaWrapper'] != '0'):
-         print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.'
-     else:
-         print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.'
- 	luaWrapperEnvironment = csoundWrapperEnvironment.Clone()
-         if getPlatform() != 'win32':
--            csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
-+            if luajitFound and commonEnvironment['useLuaJIT'] == '1':
-+                csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/luajit-2.0'])
-+            else:
-+                csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
-         if getPlatform() == 'win32':
-             csoundLuaInterface = luaWrapperEnvironment.SharedObject(
- 		    'interfaces/lua_interface.i',
- 		    SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-lua51', '-outdir', '.'])
- 	    luaWrapperEnvironment.Prepend(LIBS = ['csnd','luaj51'])
--	else:
--	    csoundLuaInterface = luaWrapperEnvironment.SharedObject(
--			'interfaces/lua_interface.i',
--			SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
--            luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
--       	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
-+        else:
-+            csoundLuaInterface = luaWrapperEnvironment.SharedObject(
-+            'interfaces/lua_interface.i',
-+            SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
-+            if luajitFound and commonEnvironment['useLuaJIT'] == '1':
-+                luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
-+            else:
-+                luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua'])
-+        luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
- 	Depends(luaWrapper, csoundLuaInterface)
- 
-     if not (javaFound and commonEnvironment['buildJavaWrapper'] != '0'):
-@@ -1510,6 +1523,9 @@
-             javaWrapper = javaWrapperEnvironment.Program(
-                 'lib_jcsound.jnilib', javaWrapperSources)
-         else:
-+            soname = 'lib_jcsound.so'
-+            soflag = [ '-Wl,-soname=%s' % soname ]
-+            javaWrapperEnvironment.Prepend(LINKFLAGS = [soflag])
-             javaWrapper = javaWrapperEnvironment.SharedLibrary(
-                 '_jcsound', javaWrapperSources)
-         #Depends(javaWrapper, csoundLibrary)
-@@ -1759,9 +1775,12 @@
- 	jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp'])
-     makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c')
-     makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp')
--if boostFound:
-+if commonEnvironment['buildChuaOpcodes'] == '1' and boostFound:
-+    print 'CONFIGURATION DECISION: Building chua opcodes.'
-     makePlugin(pluginEnvironment, 'chua', 'Opcodes/chua/ChuaOscillator.cpp')
--if gmmFound and commonEnvironment['useDouble'] != '0':
-+else:
-+    print 'CONFIGURATION DECISION: Not building chua opcodes.'
-+if commonEnvironment['buildLinearOpcodes'] == '1' and gmmFound and commonEnvironment['useDouble'] != '0':
-     makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp')
-     print 'CONFIGURATION DECISION: Building linear algebra opcodes.'
- else:
-@@ -1893,11 +1912,13 @@
-     alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
-     makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
- 
--if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
-+if commonEnvironment['usePulseAudio'] == '1' and pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
-    print "CONFIGURATION DECISION: Building PulseAudio plugin"
-    pulseaudioEnv = pluginEnvironment.Clone()
-    pulseaudioEnv.Append(LIBS = ['pulse-simple'])
-    makePlugin(pulseaudioEnv, 'rtpulse', ['InOut/rtpulse.c'])
-+else:
-+   print "CONFIGURATION DECISION: Not building PulseAudio plugin."
- 
- if getPlatform() == 'win32':
-     winmmEnvironment = pluginEnvironment.Clone()
-@@ -1963,9 +1984,7 @@
- 
- # FLUIDSYNTH OPCODES
- 
--if not configure.CheckHeader("fluidsynth.h", language = "C"):
--    print "CONFIGURATION DECISION: Not building fluid opcodes."
--else:
-+if commonEnvironment['buildFluidOpcodes'] == '1' and configure.CheckHeader("fluidsynth.h", language = "C"):
- 	print "CONFIGURATION DECISION: Building fluid opcodes."
- 	fluidEnvironment = pluginEnvironment.Clone()
- 	if getPlatform() == 'win32':
-@@ -1981,6 +2000,8 @@
- 		fluidEnvironment.Append(LIBS = ['pthread'])
- 	makePlugin(fluidEnvironment, 'fluidOpcodes',
- 			   ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
-+else:
-+    print "CONFIGURATION DECISION: Not building fluid opcodes."
- 
- # VST HOST OPCODES
- 
-@@ -2174,7 +2195,7 @@
-     if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
-         Depends(pythonOpcodes, pythonImportLibrary)
- 
--# Python opcodes
-+# Lua opcodes
- 
- if not (commonEnvironment['buildLuaOpcodes'] != '0'):
-     print "CONFIGURATION DECISION: Not building Lua opcodes."
-@@ -2183,10 +2204,13 @@
-     luaEnvironment = pluginEnvironment.Clone()
-     
-     if getPlatform() == 'linux':
--       if(luaFound == 1):
-+       if(luajitFound == 1 and commonEnvironment['useLuaJIT'] == '1'):
-          luaEnvironment.Append(LIBS = ['luajit-5.1'])
-          luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
--         luaEnvironment.Append(CPPPATH = '/usr/local/include/luajit-2.0')
-+         luaEnvironment.Append(CPPPATH = '/usr/include/luajit-2.0')
-+       elif(luaFound == 1):
-+         luaEnvironment.Append(LIBS = ['lua'])
-+         luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
-     elif getPlatform() == 'win32':
-        if(luaFound == 1):
-         luaEnvironment.Append(LIBS = ['lua51'])
-@@ -2538,21 +2562,24 @@
-     Depends(csoundAcPythonModule, pythonWrapper)
-     Depends(csoundAcPythonModule, csoundac)
-     Depends(csoundAcPythonModule, csnd)
--    if luaFound and commonEnvironment['buildLuaWrapper'] != '0':
--       luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
--       if getPlatform() == 'win32':
--       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
--       else:
--       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
--       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
--       luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
--       	 'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
--       luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
--       CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
--       Depends(CsoundAclModule, luaCsoundACWrapper)
--       Depends(CsoundAclModule, luaWrapper)
--       Depends(CsoundAclModule, csoundac)
--       Depends(CsoundAclModule, csnd)
-+    if (luajitFound or luaFound) and commonEnvironment['buildLuaWrapper'] != '0':
-+        luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
-+        if getPlatform() == 'win32':
-+            luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
-+        else:
-+            luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
-+            if commonEnvironment['useLuaJIT'] == '1':
-+                luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
-+            else:
-+                luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('lua CsoundAC csnd fltk_images'))
-+        luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
-+            'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
-+        luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
-+        CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
-+        Depends(CsoundAclModule, luaCsoundACWrapper)
-+        Depends(CsoundAclModule, luaWrapper)
-+        Depends(CsoundAclModule, csoundac)
-+        Depends(CsoundAclModule, csnd)
- 
- 
- # Build CsoundVST