Revision: 2910
Author:   lilrc
Date:     2014-12-11 15:05:05 +0100 (Thu, 11 Dec 2014)
Log Message:
-----------
media-sound/guitarix2: version bump, simplification and big update, refer to 
ChangeLog

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
    trunk/overlays/proaudio/media-sound/guitarix2/Manifest
    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/guitarix2-0.32.1.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1-r1.ebuild
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1.ebuild
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.1.ebuild
    trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.3.ebuild

Modified: trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog     2014-12-10 
16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/ChangeLog     2014-12-11 
14:05:05 UTC (rev 2910)
@@ -1,7 +1,25 @@
 # ChangeLog for media-sound/guitarix2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*guitarix2-0.32.1 (11 Dec 2014)
+
+  11 Dec 2014; Karl Linden (lilrc) <[email protected]>
+  -guitarix2-0.27.1.ebuild, -guitarix2-0.27.1-r1.ebuild,
+  -guitarix2-0.28.1.ebuild, -guitarix2-0.28.3.ebuild, +guitarix2-0.32.1.ebuild,
+  guitarix2-9999.ebuild, metadata.xml:
+  version bump
+  remove old versions
+  remove unnecessary version specifiers from deps
+  use waf-utils eclass to simplify, it works now
+  remove convolver and custom-cflags use flags
+  hard depend on zita-convolver and zita-resampler to ensure determinism
+  remove dependency on vorbis-tools
+  slot depend on fftw and gtk+
+  move jack_capture and meterbridge deps from DEPEND to RDEPEND
+  make ebuilds identical to ease maintainance
+  pass both --no-ladspa and --no-new-ladspa when USE="-ladspa"
+
   18 Mar 2014; Dominique Michel <[email protected]>
   guitarix2-9999.ebuild:
   Add dev-cpp/eigen dependency.

Modified: trunk/overlays/proaudio/media-sound/guitarix2/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/Manifest      2014-12-10 
16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/Manifest      2014-12-11 
14:05:05 UTC (rev 2910)
@@ -1,10 +1,5 @@
-DIST guitarix2-0.27.1.tar.bz2 20608874 SHA256 
9bfb26bd6615aaece69755c2a7082a4eb6ff86d503f3dbcc8ddbebc0be579139 SHA512 
50f3fd14a1b5574c78d9e9e1c28a69510bd58bc701cdf2bfdfc51baa8cff450802bce4b0410140bac71fcacdb68ad04cb771a2f10bf679448bf4db1faf07c61b
 WHIRLPOOL 
48533c76d94ad4e691f1d7b2cf2f663534ba3d93fdb662c60b663956c016e872f1c158ee3d5cb718b2045fe8fb30610578ad05ff29fc37d34fd6cd4e2018610c
-DIST guitarix2-0.28.1.tar.bz2 20152396 SHA256 
3662e4582d96297474a7d5ece6dccd2c3c6f267b5e116bf19857dc67989af5ca SHA512 
0113510a79f190e6ad9f0e9f882cf0951551e0594ae6074cf0ba66534cef96edd9ef7d99ebfd146a17edfe09d9bfbef56b7b9942548692aba0a0f078a8011f62
 WHIRLPOOL 
c7deea224f65133f503d431aefa56e13c6997b5eb8d60c1588b72e62cd3ce2c0eb000b7d70a647370a311687ac86d1d421665452facf3f906d1b841c77adc1b9
-DIST guitarix2-0.28.3.tar.bz2 20361292 SHA256 
4d761efb788b0b5a600810dc2a858ea6a2288c7cc4f140937498454ffd56454f SHA512 
d4a9d7f95f95d896033ed90ed1eed9125485e44a1813abf59f1f8b9216e354e4ac3255473acff5e0c49784c6a8ab89bb2e52cc574573d68181f8be19642843f7
 WHIRLPOOL 
da70347f3a3b6cbd64e2459b76f692533a7ae7e0a3cd66834105377aad1f8c08eaff946d5a5c15d23c3f6d4b94159df1d99ec860b983f1c603bbb01130a79951
-EBUILD guitarix2-0.27.1-r1.ebuild 2707 SHA256 
230539de4ba351b7a69a53565a07a8a4c3a2e94e8e96fea87127509d0390396f SHA512 
a7f52b8aab7f14655a995427115252a9939d3cfcba3e1e3df68765267b90dd7875ecea0a275df73cec82cfd778ddf7e7dabb554b809ce603386e32324c15d0cb
 WHIRLPOOL 
5740ff8fda6a57842a1038bc3e18e64eabca4731c1fe2027993a24bffd0bcfe3eb32cc5f3015d0b5f09da4db9fe86060f4781768a57d27c88f497708034bf82e
-EBUILD guitarix2-0.27.1.ebuild 2666 SHA256 
4ca693c0d893be2b29e6de6369dda78a7c05dc97aea828cb0a9951dbfd7220be SHA512 
3355f72d61dcc23d3032197d3a732836d6f5643a59cd43d962de85f5b3ad8b618e3fcbb2f6acf6355878e907c309c54dbe37e47a00aa2d7590b5bfa224806182
 WHIRLPOOL 
dff6cfa7c4c19eca764c9c24c2391305c22cd86a58a69ad410ef34bebffd522c23b20f180fffa98744e0e100eb6ab9db908d840836dbf0581bb5cb0a0df461bd
-EBUILD guitarix2-0.28.1.ebuild 2635 SHA256 
b12a00ece238d8c73e69e94a2242ac7cacb98f6dc8c2263e26a7d26e2eeacc54 SHA512 
5f2a74a6ce98fa8ca54383d4fe5cc6ccaf44c51579e62c021bba436f9938a2728086c8312fdee62049d6bd4ccd6c884a67238f3699b06bcff2bf619f092f56da
 WHIRLPOOL 
7af819d57169039cf0ff2bdc0adbe378eea0afc1941fd639d783df524cf9e727a3bdcfab1682178a6a7ece2914582e1937388040fd4f8019b0f0e0506625ecf5
-EBUILD guitarix2-0.28.3.ebuild 2635 SHA256 
b12a00ece238d8c73e69e94a2242ac7cacb98f6dc8c2263e26a7d26e2eeacc54 SHA512 
5f2a74a6ce98fa8ca54383d4fe5cc6ccaf44c51579e62c021bba436f9938a2728086c8312fdee62049d6bd4ccd6c884a67238f3699b06bcff2bf619f092f56da
 WHIRLPOOL 
7af819d57169039cf0ff2bdc0adbe378eea0afc1941fd639d783df524cf9e727a3bdcfab1682178a6a7ece2914582e1937388040fd4f8019b0f0e0506625ecf5
-EBUILD guitarix2-9999.ebuild 2644 SHA256 
2daa9b4d2582a6e3099911813f53b2adfe0c40640a06eefc23143f5a9a2f1efb SHA512 
6adbeb7ef2a271b8825ee7236be6992c7ae9615e00df58b110969ea5997ecf0f93f67c0767e1746dd16e38ea873a881033765ca52dbd7fd8ffa039a85e5a8bea
 WHIRLPOOL 
7a871d8b6a74621cfb18d51dd5d7a24d2b4b32c73b337f661e20690ba2d5b7f19cd94fd43bf1c39e6a5c72a115cdfacdf926782b327de074b03fe73296404852
-MISC ChangeLog 4764 SHA256 
1ce407be34945388471ba0830725f2e4c8680eecbdc5b2a36d544ba3bab733bb SHA512 
960f24ecf585eda69da63ed2499bba259cf3b4e90332cffc23a9abd5434b0ce46d24f512abec7a3cf9c0fce07f30cde029bcce23922e59ba4f3528a9fb841dcb
 WHIRLPOOL 
92de7ac6ac9601564a3bb6519b39ba9ae3663dcafa31134ef205f9bd35df16e76ccf1aab3536e3a2713ace1d0908985cabcde00244a9ea22639842cbcd3749c4
-MISC metadata.xml 642 SHA256 
fef3af7ca682c1fc74f610c6afbdb908af976102a852d8bbea3616c361f2cf1d SHA512 
783c6b25b865825ce1ded5d93202f5b0470da1255c33540f52e9b82d4c7d0f3eb76f643d5f06a35682ba7cd3f5dd6eb07798d8a3a247d9cc57cdc6acc9b96739
 WHIRLPOOL 
c83234ce05b42242d307decb6dcb866ea5b02294b5da3e4901b3da47adc210f7dc50c8100d846b9b5c8a89fcaacec4f598a765f3f952fc433818d37c9beb7e1c
+DIST guitarix2-0.32.1.tar.bz2 20654862 SHA256 
73c4d040b2fad2eb474c4b52ce5026d0fb95f11f1c1fdc07848c0349836287ea SHA512 
a59e4ee73418000e728de327fb393c3193badaa086849715592ce085d0d83d1beff490c9eb9a0638554401b70b671c33167f3581fb0ddfba3463b532c68e3a32
 WHIRLPOOL 
82eccc64fc8dadb02d18382cd2c1978ae4f93401d32efb338c58dd627e360042f53b1659700b07b4c1f858981dff15928ff7577c9712269063a592a5ab8a36cd
+EBUILD guitarix2-0.32.1.ebuild 1874 SHA256 
3ebc0e28fd435dd8d9fe1336798ec534fe34e49b97cb92568bd68633daa6254b SHA512 
827f02bd68dbf88981a4047ec6f51201452b06037d2e6851d0c2125177065f035673ef821ea7f029d7b313b35cd87d5502865c987242aab6b08edb5b3874cdba
 WHIRLPOOL 
b911b8fb53c3a8391c0d3f5773c064171c44051a6f9271b67733da03beb3c0d622a2802e5988558e99752630533d2ed454ced2e6a3ee734a1698408d0cd217e0
+EBUILD guitarix2-9999.ebuild 1874 SHA256 
3ebc0e28fd435dd8d9fe1336798ec534fe34e49b97cb92568bd68633daa6254b SHA512 
827f02bd68dbf88981a4047ec6f51201452b06037d2e6851d0c2125177065f035673ef821ea7f029d7b313b35cd87d5502865c987242aab6b08edb5b3874cdba
 WHIRLPOOL 
b911b8fb53c3a8391c0d3f5773c064171c44051a6f9271b67733da03beb3c0d622a2802e5988558e99752630533d2ed454ced2e6a3ee734a1698408d0cd217e0
+MISC ChangeLog 5535 SHA256 
cb15de507c3102bcd8e4e8b6a8107ef0d2fdbe6d34a3d5392d67e1b4b673867a SHA512 
fe41cc7a60220168039ebf6a633816f91eca439f19b8ac106371ac85811713c3ea7e9d80734a946c9dd997e0d344ed1ab333df3626b81f48265e4a5e99e77ccf
 WHIRLPOOL 
7b8b2614456440ceea97dca47b33364d31979d0c6af596c540a38c86b1ca02ac6a641fcb4e0a7fb1c944cb4bedc7aa6fda29a7a3473467616b8c36f8486402c0
+MISC metadata.xml 490 SHA256 
e552a52320b293125db155710e5eee09a245ac42b37675e99f915c647b08170d SHA512 
14166323e56d906e55739045a8e4bdfa76283f80b61bc6af6577491bf04843d6283a384b73a5152652b47920aa5ca10b1f78731850996ae7f9bcc06aa423df15
 WHIRLPOOL 
83ccb45a1601e418132d0066711dd910c42a2c1f0bc6b01d993e365ed960e88db226b2eb101523535e4e76be0a2c52c9f155415261d5a1cb7f5716e15412022b

Deleted: 
trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1-r1.ebuild    
2014-12-10 16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1-r1.ebuild    
2014-12-11 14:05:05 UTC (rev 2910)
@@ -1,94 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# We cannot use waf-utils eclass because the waf binary is old!
-# Version is 1.5.18. Written April 09 2013
-PYTHON_COMPAT=( python2_7 )
-inherit base eutils multilib multiprocessing python-any-r1
-
-DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two 
outputs"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
-HOMEPAGE="http://guitarix.sourceforge.net/";
-
-RESTRICT="mirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+capture custom-cflags +convolver debug faust ladspa lv2 +meterbridge 
nls"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.24.0
-       >=dev-cpp/gtkmm-2.20.0
-       >=dev-libs/boost-1.38
-       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
-       >=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}
-       ${PYTHON_DEPS}
-       virtual/pkgconfig
-       nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/guitarix-${PV}"
-
-DOCS=( changelog README )
-
-src_configure() {
-       # About all gentoo packages install necessary libraries and headers
-       # and so should this package, hence force enable.
-       local mywafconfargs=(
-               --nocache
-               --shared-lib
-               --lib-dev
-               --no-ldconfig
-               --no-desktop-update
-               $(use_enable nls)
-               "--libdir=${EPREFIX}/usr/$(get_libdir)"
-       )
-       use custom-cflags || mywafconfargs+=( --cxxflags-release="-DNDEBUG" )
-       use custom-cflags || mywafconfargs+=( --cxxflags="" )
-       use debug && mywafconfargs+=( --debug )
-       use debug && mywafconfargs+=( --cxxflags-debug="" )
-       use faust && mywafconfargs+=( --faust )
-       use faust || mywafconfargs+=( --no-faust )
-       use ladspa && mywafconfargs+=( 
"--ladspadir=${EPREFIX}/usr/share/ladspa" )
-       use ladspa || mywafconfargs+=( --no-ladspa )
-       use lv2 && mywafconfargs+=(
-               --build-lv2
-               "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
-       )
-
-       tc-export AR CC CPP CXX RANLIB
-       einfo "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() {
-       local jobs="--jobs=$(makeopts_jobs)"
-       einfo "./waf ${jobs}"
-       ./waf ${jobs} || die "build failed"
-}
-
-src_install() {
-       einfo "./waf --destdir=${D}"
-       ./waf "--destdir=${D}" install || die "install failed"
-
-       base_src_install_docs
-}

Deleted: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1.ebuild       
2014-12-10 16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.27.1.ebuild       
2014-12-11 14:05:05 UTC (rev 2910)
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# We cannot use waf-utils eclass because the waf binary is old!
-# Version is 1.5.18. Written April 09 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"
-HOMEPAGE="http://guitarix.sourceforge.net/";
-
-RESTRICT="mirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+capture custom-cflags +convolver debug faust ladspa lv2 +meterbridge 
nls"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.24.0
-       >=dev-cpp/gtkmm-2.20.0
-       >=dev-libs/boost-1.38
-       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
-       >=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}"
-
-DOCS=( changelog README )
-
-src_configure() {
-       # About all gentoo packages install necessary libraries and headers
-       # and so should this package, hence force enable.
-       local mywafconfargs=(
-               --nocache
-               --shared-lib
-               --lib-dev
-               --no-ldconfig
-               --no-desktop-update
-               $(use_enable nls)
-               "--libdir=${EPREFIX}/usr/$(get_libdir)"
-       )
-       use custom-cflags || mywafconfargs+=( --cxxflags-release="-DNDEBUG" )
-       use custom-cflags || mywafconfargs+=( --cxxflags="" )
-       use debug && mywafconfargs+=( --debug )
-       use debug && mywafconfargs+=( --cxxflags-debug="" )
-       use faust && mywafconfargs+=( --faust )
-       use faust || mywafconfargs+=( --no-faust )
-       use ladspa && mywafconfargs+=( 
"--ladspadir=${EPREFIX}/usr/share/ladspa" )
-       use ladspa || mywafconfargs+=( --no-ladspa )
-       use lv2 && mywafconfargs+=(
-               --build-lv2
-               "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2"
-       )
-
-       tc-export AR CC CPP CXX RANLIB
-       einfo "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() {
-       local jobs="--jobs=$(makeopts_jobs)"
-       einfo "./waf ${jobs}"
-       ./waf ${jobs} || die "build failed"
-}
-
-src_install() {
-       einfo "./waf --destdir=${D}"
-       ./waf "--destdir=${D}" install || die "install failed"
-
-       base_src_install_docs
-}

Deleted: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.1.ebuild       
2014-12-10 16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.1.ebuild       
2014-12-11 14:05:05 UTC (rev 2910)
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# We cannot use waf-utils eclass because the waf binary is old!
-# Version is 1.5.18. Written April 09 2013
-PYTHON_COMPAT=( python2_7 )
-inherit base eutils multilib multiprocessing python-any-r1
-
-DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two 
outputs"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
-HOMEPAGE="http://guitarix.sourceforge.net/";
-
-RESTRICT="mirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="avahi +capture custom-cflags +convolver debug faust ladspa lv2 
+meterbridge nls"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.24.0:2
-       >=dev-cpp/gtkmm-2.20.0:2.4
-       >=dev-libs/boost-1.38
-       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
-       >=sci-libs/fftw-3.1.2
-       >=x11-libs/gtk+-2.20.0
-       avahi? ( net-dns/avahi )
-       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}
-       ${PYTHON_DEPS}
-       virtual/pkgconfig
-       nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/guitarix-${PV}"
-
-DOCS=( changelog README )
-
-src_configure() {
-       # About all gentoo packages install necessary libraries and headers
-       # and so should this package, hence force enable.
-       local mywafconfargs=(
-               --libdir="${EPREFIX}"/usr/$(get_libdir)
-               --nocache
-               --shared-lib
-               --lib-dev
-               --no-ldconfig
-               --no-desktop-update
-               $(use_enable nls)
-               $(usex avahi "" --no-avahi)
-               $(usex debug --debug "")
-               $(usex faust --faust --no-faust)
-               $(usex ladspa --ladspadir="${EPREFIX}"/usr/share/ladspa 
--no-ladspa)
-               $(usex lv2 --lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 --no-lv2)
-       )
-       use custom-cflags || mywafconfargs+=( --cxxflags-release="-DNDEBUG" )
-       use custom-cflags || mywafconfargs+=( --cxxflags="" )
-       use debug && mywafconfargs+=( --cxxflags-debug="" )
-
-       tc-export AR CC CPP CXX RANLIB
-       einfo "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() {
-       local jobs="--jobs=$(makeopts_jobs)"
-       einfo "./waf ${jobs}"
-       ./waf ${jobs} || die "build failed"
-}
-
-src_install() {
-       einfo "./waf --destdir=${D}"
-       ./waf "--destdir=${D}" install || die "install failed"
-
-       base_src_install_docs
-}

Deleted: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.3.ebuild       
2014-12-10 16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.3.ebuild       
2014-12-11 14:05:05 UTC (rev 2910)
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# We cannot use waf-utils eclass because the waf binary is old!
-# Version is 1.5.18. Written April 09 2013
-PYTHON_COMPAT=( python2_7 )
-inherit base eutils multilib multiprocessing python-any-r1
-
-DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two 
outputs"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
-HOMEPAGE="http://guitarix.sourceforge.net/";
-
-RESTRICT="mirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="avahi +capture custom-cflags +convolver debug faust ladspa lv2 
+meterbridge nls"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.24.0:2
-       >=dev-cpp/gtkmm-2.20.0:2.4
-       >=dev-libs/boost-1.38
-       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
-       >=sci-libs/fftw-3.1.2
-       >=x11-libs/gtk+-2.20.0
-       avahi? ( net-dns/avahi )
-       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}
-       ${PYTHON_DEPS}
-       virtual/pkgconfig
-       nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/guitarix-${PV}"
-
-DOCS=( changelog README )
-
-src_configure() {
-       # About all gentoo packages install necessary libraries and headers
-       # and so should this package, hence force enable.
-       local mywafconfargs=(
-               --libdir="${EPREFIX}"/usr/$(get_libdir)
-               --nocache
-               --shared-lib
-               --lib-dev
-               --no-ldconfig
-               --no-desktop-update
-               $(use_enable nls)
-               $(usex avahi "" --no-avahi)
-               $(usex debug --debug "")
-               $(usex faust --faust --no-faust)
-               $(usex ladspa --ladspadir="${EPREFIX}"/usr/share/ladspa 
--no-ladspa)
-               $(usex lv2 --lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 --no-lv2)
-       )
-       use custom-cflags || mywafconfargs+=( --cxxflags-release="-DNDEBUG" )
-       use custom-cflags || mywafconfargs+=( --cxxflags="" )
-       use debug && mywafconfargs+=( --cxxflags-debug="" )
-
-       tc-export AR CC CPP CXX RANLIB
-       einfo "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() {
-       local jobs="--jobs=$(makeopts_jobs)"
-       einfo "./waf ${jobs}"
-       ./waf ${jobs} || die "build failed"
-}
-
-src_install() {
-       einfo "./waf --destdir=${D}"
-       ./waf "--destdir=${D}" install || die "install failed"
-
-       base_src_install_docs
-}

Copied: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.32.1.ebuild 
(from rev 2903, 
trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.28.3.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.32.1.ebuild       
                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-0.32.1.ebuild       
2014-12-11 14:05:05 UTC (rev 2910)
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit waf-utils
+
+DESCRIPTION="A simple Linux Guitar Amplifier for jack with one input and two 
outputs"
+HOMEPAGE="http://guitarix.sourceforge.net/";
+
+RESTRICT="mirror"
+if [ "${PV}" = "9999" ]; then
+       EGIT_REPO_URI="git://git.code.sf.net/p/guitarix/git/"
+       S="${S}/trunk"
+       KEYWORDS=""
+else
+       SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
+       S="${WORKDIR}/guitarix-${PV}"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="avahi +capture debug faust ladspa lv2 +meterbridge nls"
+
+RDEPEND="dev-cpp/eigen:3
+       dev-cpp/glibmm:2
+       dev-cpp/gtkmm:2.4
+       dev-libs/boost
+       dev-libs/glib
+       media-libs/liblrdf
+       media-libs/libsndfile
+       media-libs/lilv:0
+       media-libs/zita-convolver
+       media-libs/zita-resampler
+       media-sound/jack-audio-connection-kit
+       media-sound/lame
+       sci-libs/fftw:3.0
+       x11-libs/gtk+:2
+       avahi? ( net-dns/avahi )
+       faust? ( dev-lang/faust )
+       ladspa? ( media-libs/ladspa-sdk )
+       lv2? ( || ( media-libs/lv2core media-libs/lv2 ) )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       nls? ( dev-util/intltool )"
+RDEPEND="${RDEPEND}
+       capture? ( media-sound/jack_capture )
+       meterbridge? ( media-sound/meterbridge )"
+
+DOCS=( changelog README )
+
+src_unpack() {
+       [[ "${PV}" = "9999" ]] && git-r3_src_unpack || default
+}
+
+src_configure() {
+       local mywafconfargs=(
+               --cxxflags-debug=""
+               --cxxflags-release="-DNDEBUG"
+               --nocache
+               --shared-lib
+               --lib-dev
+               --no-ldconfig
+               --no-desktop-update
+               $(use_enable nls)
+               $(usex avahi "" --no-avahi)
+               $(usex debug --debug "")
+               $(usex faust --faust --no-faust)
+               $(usex ladspa --ladspadir="${EPREFIX}"/usr/share/ladspa 
"--no-ladspa --no-new-ladspa")
+               $(usex lv2 --lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 --no-lv2)
+       )
+
+       waf-utils_src_configure ${mywafconfargs[@]}
+}

Modified: trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 
2014-12-10 16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/guitarix2-9999.ebuild 
2014-12-11 14:05:05 UTC (rev 2910)
@@ -1,61 +1,66 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
-# We cannot use waf-utils eclass because the waf binary is old!
-# Version is 1.5.18. Written April 09 2013
-PYTHON_COMPAT=( python2_7 )
-inherit base eutils git-2 multilib multiprocessing python-any-r1
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit waf-utils
 
 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/"
 HOMEPAGE="http://guitarix.sourceforge.net/";
 
 RESTRICT="mirror"
+if [ "${PV}" = "9999" ]; then
+       EGIT_REPO_URI="git://git.code.sf.net/p/guitarix/git/"
+       S="${S}/trunk"
+       KEYWORDS=""
+else
+       SRC_URI="mirror://sourceforge/guitarix/guitarix/${P}.tar.bz2"
+       S="${WORKDIR}/guitarix-${PV}"
+       KEYWORDS="~amd64 ~x86"
+fi
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=""
 
-IUSE="avahi +capture custom-cflags +convolver debug faust ladspa lv2 
+meterbridge nls"
+IUSE="avahi +capture debug faust ladspa lv2 +meterbridge nls"
 
-RDEPEND="
-       >=dev-cpp/glibmm-2.24.0:2
-       >=dev-cpp/gtkmm-2.20.0:2.4
-       >=dev-libs/boost-1.38
+RDEPEND="dev-cpp/eigen:3
+       dev-cpp/glibmm:2
+       dev-cpp/gtkmm:2.4
+       dev-libs/boost
        dev-libs/glib
        media-libs/liblrdf
-       >=media-libs/libsndfile-1.0.17
-       >=media-sound/jack-audio-connection-kit-0.109.1
+       media-libs/libsndfile
+       media-libs/lilv:0
+       media-libs/zita-convolver
+       media-libs/zita-resampler
+       media-sound/jack-audio-connection-kit
        media-sound/lame
-       media-sound/vorbis-tools
-       >=sci-libs/fftw-3.1.2
-       >=x11-libs/gtk+-2.20.0
-       dev-cpp/eigen
+       sci-libs/fftw:3.0
+       x11-libs/gtk+:2
        avahi? ( net-dns/avahi )
-       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 )"
+       lv2? ( || ( media-libs/lv2core media-libs/lv2 ) )"
 DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
        virtual/pkgconfig
        nls? ( dev-util/intltool )"
+RDEPEND="${RDEPEND}
+       capture? ( media-sound/jack_capture )
+       meterbridge? ( media-sound/meterbridge )"
 
-EGIT_SOURCEDIR="${S}"
-S="${S}/trunk"
-
 DOCS=( changelog README )
 
+src_unpack() {
+       [[ "${PV}" = "9999" ]] && git-r3_src_unpack || default
+}
+
 src_configure() {
-       # About all gentoo packages install necessary libraries and headers
-       # and so should this package, hence force enable.
        local mywafconfargs=(
-               --libdir="${EPREFIX}"/usr/$(get_libdir)
+               --cxxflags-debug=""
+               --cxxflags-release="-DNDEBUG"
                --nocache
                --shared-lib
                --lib-dev
@@ -65,29 +70,9 @@
                $(usex avahi "" --no-avahi)
                $(usex debug --debug "")
                $(usex faust --faust --no-faust)
-               $(usex ladspa --ladspadir="${EPREFIX}"/usr/share/ladspa 
--no-ladspa)
+               $(usex ladspa --ladspadir="${EPREFIX}"/usr/share/ladspa 
"--no-ladspa --no-new-ladspa")
                $(usex lv2 --lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 --no-lv2)
        )
-       use custom-cflags || mywafconfargs+=( --cxxflags-release="-DNDEBUG" )
-       use custom-cflags || mywafconfargs+=( --cxxflags="" )
-       use debug && mywafconfargs+=( --cxxflags-debug="" )
 
-       tc-export AR CC CPP CXX RANLIB
-       einfo "CCFLAGS=\"${CFLAGS}\" LINKFLAGS=\"${LDFLAGS}\" ./waf 
--prefix=${EPREFIX}/usr ${mywafconfargs[@]} $@ configure"
-       CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
-               "--prefix=${EPREFIX}/usr" ${mywafconfargs[@]} \
-               configure || die "configure failed"
+       waf-utils_src_configure ${mywafconfargs[@]}
 }
-
-src_compile() {
-       local jobs="--jobs=$(makeopts_jobs)"
-       einfo "./waf ${jobs}"
-       ./waf ${jobs} || die "build failed"
-}
-
-src_install() {
-       einfo "./waf --destdir=${D}"
-       ./waf "--destdir=${D}" install || die "install failed"
-
-       base_src_install_docs
-}

Modified: trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml  2014-12-10 
16:42:21 UTC (rev 2909)
+++ trunk/overlays/proaudio/media-sound/guitarix2/metadata.xml  2014-12-11 
14:05:05 UTC (rev 2910)
@@ -7,8 +7,6 @@
        </maintainer>
        <use>
                <flag name="capture">enable media-sound/jack_capture</flag>
-               <flag name="convolver">enable media-libs/zita-convolver</flag>
-               <flag name="custom-cflags">Build with upstream specified CFLAGS 
(unsupported)</flag>
                <flag name="faust">enable dev-lang/faust</flag>
                <flag name="lv2">Add support for Ladspa V2</flag>
                <flag name="meterbridge">enable media-sound/meterbridge</flag>

Reply via email to