[proaudio] [2619] BIG update; EAPI 5 and base eclass; parallel build; more USE flags, respect toolchain and libdir, add missing deps, patch to avoid addpredicts

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2619
Author:   lilrc
Date:     2013-03-30 20:17:47 +0100 (Sat, 30 Mar 2013)
Log Message:
-----------
BIG update; EAPI 5 and base eclass; parallel build; more USE flags, respect toolchain and libdir, add missing deps, patch to avoid addpredicts

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
    trunk/overlays/proaudio/media-sound/guitarix2/Manifest
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
    trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-ldconfig.patch
    trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-update-desktop-database.patch
    trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-respect-libdir.patch
    trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.18.0-LINGUAS.patch

Modified: trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog	2013-03-30 19:17:47 UTC (rev 2619)
@@ -2,6 +2,22 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  -files/guitarix2-0.18.0-LINGUAS.patch, guitarix2-0.25.2.ebuild,
+  +files/guitarix2-0.25.2-no-ldconfig.patch,
+  +files/guitarix2-0.25.2-no-update-desktop-database.patch,
+  +files/guitarix2-0.25.2-respect-libdir.patch, guitarix2-9999.ebuild,
+  +files/guitarix2-9999-wscript.patch, metadata.xml:
+  Move to EAPI 5 and base eclass.
+  Enable parallel build.
+  Add more use flags and their descriptions when needed.
+  Add missing dependencies.
+  Import some code from waf-utils eclass to respect toolchain programs.
+  Remove old patch.
+  Add patch to respect libdir for 0.25.2.
+  Add patches to disable calling unecessary funcions from the build 
+  system; portage does so automatically.
+
 *guitarix2-9999 (30 Mar 2013)
 
   30 Mar 2013; Dominique Michel <dominique_libbre@xxxxxxxxxxxxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-sound/guitarix2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/Manifest	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/Manifest	2013-03-30 19:17:47 UTC (rev 2619)
@@ -1,6 +1,9 @@
-AUX guitarix2-0.18.0-LINGUAS.patch 876 SHA256 3bd90835f333ee14243b02601abbc189e262b80452a293f2e6c762f73c9092f4 SHA512 4d959ad37634a8bf4856348b5e17051dee0e72c1cbab356b8bdcaf9925e9eea6d7b2ea1022d516b5843ad06e43cfbf0a26d174647d87c1157a220915f7aebf20 WHIRLPOOL 6d5a387910bb64cf1a2fc00b5942eef34d4266c7c0efc0a27285ac9882b45d3deb7a0f4efe1fee419238aaa965ff22dd442246672576298e82d9562a41ca177d
+AUX guitarix2-0.25.2-no-ldconfig.patch 752 SHA256 17c407e85b1da822457a3fa30ac5f3dd084b6e4a27b485368640588e854d8fc1 SHA512 74009d6fe4571f816fa2bf8de4840eb6533d4c2d319507467335164a84cb9d319844e4388920951952a4e960270a03e5496a620a06cdeeff640ff5c0434d3ea7 WHIRLPOOL 5e173f6cef9992ee643e6e342e334b8fb9b38e8941ea454bdbb5aa29c777376897385a939eada38d7a18971dae8296e490edae05528fb66a771cbd9d8a97c86e
+AUX guitarix2-0.25.2-no-update-desktop-database.patch 575 SHA256 7215ce5cf0cd9ad4beb116af71a14adc1297a824ea93b17ab2be32c314fb8584 SHA512 6b1fcf6c1442d389a4c669c61a59c2a32d60d846fefa89424d304f59004d6dee317dd8c6b0308fb72811ce5c20f45335b812f9b2bccd796c13075abddf033b45 WHIRLPOOL 6c548ac7956a269b4cc6c42264eb98af085482a2365307a75d2be8b0d6ef883831e70747834003e75f7f31b56bcc3b4c1a94b18fbc418be47ee36688f8335cd4
+AUX guitarix2-0.25.2-respect-libdir.patch 816 SHA256 84ffa6e18cda68678373d92abeebf032fc7b227ce7a719121a92031135b01ecc SHA512 092d9faab073fe2e1cb6be4ebdec937599984c6c9323b5497b34937a917287bd173e11a24a38dd9a6b252ffd3d40dfe3f4d4a9f5d36aa3be8c486a2f06faba37 WHIRLPOOL fe5e8f0e9698072941dc3f969ed531bebaafaa88489d823a293000d25b53c26f3426baa02357586f55f513e44054ca28f61017dca237bab93b370f8fa8d72630
+AUX guitarix2-9999-wscript.patch 1231 SHA256 3db648a4812bfa51b5827fac4344e3c9ce3bbdac7e2ba35d3c0885dfcee08c57 SHA512 f82b7dcdda5fa26e3638a8cf044fe99917226f0da11fcfe85a781a2eb2fa609c57a20353cc8134f37e3a395cc5799f9071d253d32e789d3e55557992a22a30a2 WHIRLPOOL 25caa0360198760e70774f6914ced0ebec7487aa368a3d29a7a03d69923df4a5fdaec7df3da9899037004e5556f44045f9296e7cb30186077077415159ee778d
 DIST guitarix2-0.25.2.tar.bz2 7091468 SHA256 ea655b81cce4968207cb1d590879047e01e0461a08d1f48d84e2f828981f8ff1 SHA512 448bf745aa75cf621f6e4bce4f6920e44d941c17a099a8ce05987a3167cc92cbdf75850f43a8feaeadef35e69b2c7f366dbc77a2363dbf6c67b7e4e4a4d06520 WHIRLPOOL 2469f23680b03023b68431d9f511966af488b6e200dff98afa6a6f351781d41c61cdc3b92ff7915893ed969a8f8a6cb8c6524017d435f25b7d9c8f45a5fd6db6
-EBUILD guitarix2-0.25.2.ebuild 1129 SHA256 20d4e26b1185f6fe853716c248ae4b9e0e4f595d2f2dc1ba7d9397623c6cb899 SHA512 61412264a687eaf3015d0058bf8e3b7afe8e95d09969263c90b72581df831fa3cd9e1da38d236769dbd8620f102fa6aa480d8e4f5ddfd09cef04435f1946ee31 WHIRLPOOL 04019cc39dd041d589f559429ea5f798cc974ff75380274ad25ed27ec6b6a8ad1010dedf360e8eac18c42d17629ee753927c7d022224b496d657e1fbbe5097aa
-EBUILD guitarix2-9999.ebuild 1231 SHA256 d2f9438ec2128cf56044826505a7905fb9d5d71726c47697261fe8f96958d0fe SHA512 e434f16cd403cc1cfdf5ab1d6f2b4dd16920a1f84020bcd141ce35b31f12700ea429fb1e453cc037af4dca8dd12f7fc3fd6da041b955d14c7ad043e79f3df31f WHIRLPOOL bba708c110345a467c49679e6de822bc18e7642d0c15c5d4f3fccd9faeffa6c8301a37bc26d4ac5f73a39288f198a86ef53c88f1775e597ec156fe54ff533efa
-MISC ChangeLog 1035 SHA256 bfeb2a09ca20886884f5e2d31a901068ed577a9db7d06c2030cc7746a0e81ddd SHA512 5378b2150dc3d8d1dd9420e3422cd9996bf69e09037c34231f3bbad2bb0e52426b38b2b5c68a764f69fe9a8c3c19ea93493bc0ca4f65825ba409c8fa6ecfac28 WHIRLPOOL d000e579905bf1fa45599b4f52960954a01a471f22b4f1ab4bd24f3a3fa06bbfc5648a3ed0ff5de09a928fbcc995e46d29085ee58abae82ffaae24f424a09793
-MISC metadata.xml 503 SHA256 5b6f9e04282a9214168599c20b0aab3320125db208c6bad18d5fe2470c1d7bc5 SHA512 08c3a99b42cfe9b343a798177659e5343283492d9abf67293866b0a16e7c7810323b88ae9f4d38919655db8effde4f9cffaff4d0c0f3486084d8dc07592f5e95 WHIRLPOOL 3551b55bcccd52a33e7e0c3119bfdd2a411e3e5adbeaea8bc420c00e37a8071d5180ef90502824df965b3e3ac1223d50e55f7fcb7e2884778558fd7840bc6ce8
+EBUILD guitarix2-0.25.2.ebuild 2673 SHA256 19dcff347744d9da92b6952e258c048f765bf45ba8e05dd8a403d88d236187ce SHA512 7ad42a790992af1fcf1f0058aacc0071a09cd989755834ed4c642166981353f60b6125ac4657cdec2f3c41c41b4a3743355682e33d009ed8023726d22cef27ed WHIRLPOOL 8ca7ae5491902f34e1450e09ee1d282e059e1f67b3ccc1b6a4705328d12680974133ea3562efe87318ea7ffa2b87dada37c5b9c3b333eb62aad40b1b7504c154
+EBUILD guitarix2-9999.ebuild 2456 SHA256 8386963029c40794b246cbdc7317bfdaa69245b1c136d69e8f30ed08d12834d5 SHA512 5f8c5898176eabfba2b323d6805f593aef1748a9e77c79361d59754c4c16b507bcb62294655c459b176aa372e57eb8343510748dde53b6d848af964b98f08c2a WHIRLPOOL 5f5aeaf859970abed473c32821cbea12fb9e05d10d837f4a17f6451cfd46a6640a49a573067509dcb3cae8006d9c11b4f41888db684422c156e306ba03f0ed84
+MISC ChangeLog 1784 SHA256 9329be0142215b7e0bbb87fc87ec94dd135cb9399f089f5283ea4e15b6bb4ec1 SHA512 7e5eff3c70e860f0d8b112b675dcb6d74a24f34d09f4de7a42bed3718405c47cf3b7f4d285690fbe6eda464fa9c84b4e01c55d5d41919426090fa0d935f2bb69 WHIRLPOOL d451145c4492c874434e67005c72e607df701f3d01023541b31a35b642563c4fdb0eb0ea383951ca3238c72b9ba151ca18b30b867bc2fd8dff8eb14d342c2b2f
+MISC metadata.xml 607 SHA256 b4ee6cdc57a98ad8486359cf2c27ceb543b67a151e4a7aff4b3e82b64511e05d SHA512 38011a5d2f23a185e738a6bf466ba1c870a4607664ae8c45830d824b5410c1416ed96ce913a066226d7b7ee3f48a70f6de5027450ecf28d1e6150639cf361bb6 WHIRLPOOL c13871b18ead19133a16cce12d987563379953c610a9241a0e016011722993fdee77dc2d785482142c5956b33c94e978faa778f80a538aef3d239a3bcc8db905

Deleted: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.18.0-LINGUAS.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.18.0-LINGUAS.patch	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.18.0-LINGUAS.patch	2013-03-30 19:17:47 UTC (rev 2619)
@@ -1,21 +0,0 @@
-diff -u guitarix2-0.18.0-unpatched/wscript guitarix2-0.18.0-patched/wscript
---- guitarix2-0.18.0-unpatched/wscript	2011-08-09 18:10:07.000000000 +0300
-+++ guitarix2-0.18.0-patched/wscript	2011-08-10 23:52:04.714381135 +0300
-@@ -72,8 +72,6 @@
-     group = opt.add_option_group ('Localization and documentation', '')
-     add_enable_option ('nls', 'native language support', group)
- 
--    if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS']
--    
-     opt.tool_options('compiler_cxx')
-     comp = opt.get_option_group("--check-cxx-compiler")
- 
-@@ -382,6 +380,8 @@
- 
- # guitarix waf configuration
- def configure(conf):
-+    if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS']
-+
-     platform = Utils.detect_platform()
-     conf.env['IS_MACOSX'] = platform == 'darwin'
-     conf.env['IS_LINUX'] = platform == 'linux' or platform == 'posix'

Added: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-ldconfig.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-ldconfig.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-ldconfig.patch	2013-03-30 19:17:47 UTC (rev 2619)
@@ -0,0 +1,22 @@
+--- guitarix-0.25.2.a/wscript	2013-03-30 18:09:17.965348694 +0100
++++ guitarix-0.25.2.b/wscript	2013-03-30 18:15:07.814356299 +0100
+@@ -691,10 +691,6 @@
+ # Build / Install
+ ################################################################
+ 
+-def post(ctx):
+-    if os.geteuid() == 0:
+-        Utils.exec_command('/sbin/ldconfig')
+-
+ def build(bld):
+     if bld.env['INTLTOOL']:
+         obj = bld.new_task_gen ('intltool_po')
+@@ -754,8 +750,6 @@
+         return task
+     gen_desktop.create_task = gen_desktop_add_scanner
+ 
+-    if bld.env["GX_LIB_SHARED"]:
+-        bld.add_post_fun(post)
+     if bld.env["GX_LIB_DEV"]:
+         bld.install_files('${PREFIX}/include/gxw','libgxw/gxw/*.h')
+         bld.install_files('${PREFIX}/include','libgxw/gxw.h')

Added: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-update-desktop-database.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-update-desktop-database.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-no-update-desktop-database.patch	2013-03-30 19:17:47 UTC (rev 2619)
@@ -0,0 +1,14 @@
+--- guitarix-0.25.2.orig/wscript	2013-01-29 14:36:39.000000000 +0100
++++ guitarix-0.25.2.a/wscript	2013-03-30 18:09:17.965348694 +0100
+@@ -753,11 +753,6 @@
+         task.scan = po_scanner
+         return task
+     gen_desktop.create_task = gen_desktop_add_scanner
+-    if Options.commands["install"]:  ## newer waf version: bld.cmd == 'install'
+-        try:
+-            bld.exec_command(["update-desktop-database", Utils.subst_vars("${DATADIR}/applications", bld.env)])
+-        except:
+-            pass
+ 
+     if bld.env["GX_LIB_SHARED"]:
+         bld.add_post_fun(post)

Added: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-respect-libdir.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-respect-libdir.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-0.25.2-respect-libdir.patch	2013-03-30 19:17:47 UTC (rev 2619)
@@ -0,0 +1,16 @@
+--- guitarix-0.25.2.b/wscript	2013-03-30 18:15:07.814356299 +0100
++++ guitarix-0.25.2.c/wscript	2013-03-30 18:25:19.523369598 +0100
+@@ -572,7 +572,12 @@
+     # writing config.h
+     conf.write_config_header('config.h')
+ 
+-    conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib')))
++    # Because the waf binary is so old the easiest solution is to check
++    # the environment
++    if 'LIBDIR' in os.environ:
++        conf.define('LIBDIR', os.environ['LIBDIR'])
++    else:
++        conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib')))
+     conf.define('BINDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'bin')))
+     conf.define('DESKAPPS_DIR', os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')))
+     conf.define('BIN_NAME', APPNAME)

Added: trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/files/guitarix2-9999-wscript.patch	2013-03-30 19:17:47 UTC (rev 2619)
@@ -0,0 +1,35 @@
+# This is a patch made by lilrc to disable calling
+# update-desktop-database and ldconfig from the build system, which
+# generates sandbox violations.
+# Portage does it automatically.
+
+diff --git a/trunk/wscript b/trunk/wscript
+index 3d92f60..fa80ccb 100644
+--- a/trunk/wscript
++++ b/trunk/wscript
+@@ -701,10 +701,6 @@ def configure(conf):
+ # Build / Install
+ ################################################################
+ 
+-def post(ctx):
+-    if os.geteuid() == 0:
+-        Utils.exec_command('/sbin/ldconfig')
+-
+ def build(bld):
+     if bld.env['INTLTOOL']:
+         obj = bld.new_task_gen ('intltool_po')
+@@ -763,14 +759,7 @@ def build(bld):
+         task.scan = po_scanner
+         return task
+     gen_desktop.create_task = gen_desktop_add_scanner
+-    if Options.commands["install"]:  ## newer waf version: bld.cmd == 'install'
+-        try:
+-            bld.exec_command(["update-desktop-database", Utils.subst_vars("${DATADIR}/applications", bld.env)])
+-        except:
+-            pass
+ 
+-    if bld.env["GX_LIB_SHARED"]:
+-        bld.add_post_fun(post)
+     if bld.env["GX_LIB_DEV"]:
+         bld.install_files('${PREFIX}/include/gxw','libgxw/gxw/*.h')
+         bld.install_files('${PREFIX}/include','libgxw/gxw.h')

Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.25.2.ebuild	2013-03-30 19:17:47 UTC (rev 2619)
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils
+# We cannot use waf-utils eclass because the waf binary is old!
+# Version is 1.5.18. Written March 30 2013
+inherit base eutils multilib multiprocessing
 
 DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two outputs"
 SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
@@ -16,38 +18,76 @@
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="+capture +convolver faust +meterbridge"
+IUSE="+capture +convolver faust glade ladspa lv2 +meterbridge nls python"
 
 RDEPEND="
+	>=dev-cpp/glibmm-2.24.0
+	>=dev-cpp/gtkmm-2.20.0
 	>=dev-libs/boost-1.38
-	media-libs/ladspa-sdk
+	dev-libs/glib
+	media-libs/liblrdf
 	>=media-libs/libsndfile-1.0.17
 	>=media-sound/jack-audio-connection-kit-0.109.1
 	media-sound/lame
 	media-sound/vorbis-tools
-	>=x11-libs/gtk+-2.12.0
+	>=sci-libs/fftw-3.1.2
+	>=x11-libs/gtk+-2.20.0
 	capture? ( media-sound/jack_capture )
 	convolver? ( media-libs/zita-convolver )
 	faust? ( dev-lang/faust )
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? ( || ( media-libs/lv2core >=media-libs/lv2-1.2.0 ) )
 	meterbridge? ( media-sound/meterbridge )"
-
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
 S="${WORKDIR}/guitarix-${PV}"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DOCS=( changelog README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-no-update-desktop-database.patch"
+	"${FILESDIR}/${P}-no-ldconfig.patch"
+	"${FILESDIR}/${P}-respect-libdir.patch"
+)
+
 src_configure() {
-	./waf configure --prefix=/usr --ladspadir=/usr/share/ladspa \
-	|| die
+	# About all gentoo packages install necessary libraries and headers
+	# and so should this package, hence force enable.
+	local mywafconfargs=(
+		--shared-lib
+		--lib-dev
+		$(use_enable nls)
+	)
+	use faust && mywafconfargs+=( --faust )
+	use faust || mywafconfargs+=( --no-faust )
+	use glade && mywafconfargs+=( --glade-support )
+	use ladspa && mywafconfargs+=( "--ladspadir=${EPREFIX}/usr/share/ladspa" )
+	use ladspa || mywafconfargs+=( --no-ladspa )
+	use lv2 && mywafconfargs+=(
+		--build-lv2
+		"--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
+	)
+	use python && mywafconfargs+=( --python-wrapper )
+
+	# respect libdir patch makes waf look for LIBDIR in the environment
+	# instead of overriding it completely 
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	tc-export AR CC CPP CXX RANLIB
+	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
+	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
+		"--prefix=${EPREFIX}/usr" ${mywafconfargs[@]} \
+		configure || die "configure failed"
 }
 
 src_compile() {
-	./waf build || die
+	./waf "--jobs=$(makeopts_jobs)" || die "build failed"
 }
 
 src_install() {
-	# needed at first time install
-	addpredict /usr/share/applications
+	./waf "--destdir=${D}" install || die "install failed"
 
-	DESTDIR=${D} ./waf install
+	base_src_install_docs
 }

Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild	2013-03-30 19:17:47 UTC (rev 2619)
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils git-2 multilib
+# We cannot use waf-utils eclass because the waf binary is old!
+# Version is 1.5.18. Written March 30 2013
+inherit base eutils git-2 multilib multiprocessing
 
 DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two outputs"
 EGIT_REPO_URI="git://git.code.sf.net/p/guitarix/git/"
@@ -16,43 +18,73 @@
 LICENSE="GPL-2"
 KEYWORDS=""
 
-IUSE="+capture +convolver faust +meterbridge"
+IUSE="+capture +convolver faust glade ladspa lv2 +meterbridge nls python"
 
 RDEPEND="
+	>=dev-cpp/glibmm-2.24.0
+	>=dev-cpp/gtkmm-2.20.0
 	>=dev-libs/boost-1.38
-	media-libs/ladspa-sdk
+	dev-libs/glib
+	media-libs/liblrdf
 	>=media-libs/libsndfile-1.0.17
 	>=media-sound/jack-audio-connection-kit-0.109.1
 	media-sound/lame
 	media-sound/vorbis-tools
-	>=x11-libs/gtk+-2.12.0
-	>=media-libs/lv2-1.2.0
+	>=sci-libs/fftw-3.1.2
+	>=x11-libs/gtk+-2.20.0
 	capture? ( media-sound/jack_capture )
 	convolver? ( media-libs/zita-convolver )
 	faust? ( dev-lang/faust )
+	ladspa? ( media-libs/ladspa-sdk )
+	lv2? ( || ( media-libs/lv2core >=media-libs/lv2-1.2.0 ) )
 	meterbridge? ( media-sound/meterbridge )"
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
 
-S="${WORKDIR}/guitarix-${PV}/"
+EGIT_SOURCEDIR="${S}"
+S="${S}/trunk"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DOCS=( changelog README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-wscript.patch"
+)
+
 src_configure() {
-	cd "${S}/trunk"
-	./waf configure --prefix=/usr --ladspadir=/usr/share/ladspa \
-	--build-lv2 --lv2dir=/usr/$(get_libdir)/lv2 || die
+	# About all gentoo packages install necessary libraries and headers
+	# and so should this package, hence force enable.
+	local mywafconfargs=(
+		--shared-lib
+		--lib-dev
+		$(use_enable nls)
+		"--libdir=${EPREFIX}/usr/$(get_libdir)"
+	)
+	use faust && mywafconfargs+=( --faust )
+	use faust || mywafconfargs+=( --no-faust )
+	use glade && mywafconfargs+=( --glade-support )
+	use ladspa && mywafconfargs+=( "--ladspadir=${EPREFIX}/usr/share/ladspa" )
+	use ladspa || mywafconfargs+=( --no-ladspa )
+	use lv2 && mywafconfargs+=(
+		--build-lv2
+		"--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
+	)
+	use python && mywafconfargs+=( --python-wrapper )
+
+	tc-export AR CC CPP CXX RANLIB
+	echo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf --prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
+	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
+		"--prefix=${EPREFIX}/usr" ${mywafconfargs[@]} \
+		configure || die "configure failed"
 }
 
 src_compile() {
-	addpredict /etc
-
-	cd "${S}/trunk"
-	./waf build || die
+	./waf "--jobs=$(makeopts_jobs)" || die "build failed"
 }
 
 src_install() {
-	addpredict /usr/share/applications
+	./waf "--destdir=${D}" install || die "install failed"
 
-	cd "${S}/trunk"
-	DESTDIR=${D} ./waf install
+	base_src_install_docs
 }

Modified: trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml	2013-03-30 18:59:59 UTC (rev 2618)
+++ trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml	2013-03-30 19:17:47 UTC (rev 2619)
@@ -9,6 +9,8 @@
 		<flag name="capture">enable media-sound/jack_capture</flag>
 		<flag name="convolver">enable media-libs/zita-convolver</flag>
 		<flag name="faust">enable dev-lang/faust</flag>
+		<flag name="glade">build support for Glade</flag>
+		<flag name="lv2">Add support for Ladspa V2</flag>
 		<flag name="meterbridge">enable media-sound/meterbridge</flag>
 	</use>
 </pkgmetadata>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/