Revision: 1922
Author:   gavlee
Date:     2011-04-15 15:03:03 +0200 (Fri, 15 Apr 2011)
Log Message:
-----------
media-sound/boodler-2.0.4 bump and cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/boodler/ChangeLog
    trunk/overlays/proaudio/media-sound/boodler/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.2.ebuild
    trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3-r1.ebuild
    trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3.ebuild

Modified: trunk/overlays/proaudio/media-sound/boodler/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/ChangeLog       2011-04-15 
12:16:32 UTC (rev 1921)
+++ trunk/overlays/proaudio/media-sound/boodler/ChangeLog       2011-04-15 
13:03:03 UTC (rev 1922)
@@ -1,7 +1,14 @@
 # ChangeLog for media-sound/boodler
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*boodler-2.0.4 (15 Apr 2011)
+
+  15 Apr 2011; Gavin Pryke <[email protected]>
+  -boodler-2.0.2.ebuild, -boodler-2.0.3.ebuild, -boodler-2.0.3-r1.ebuild,
+  +boodler-2.0.4.ebuild:
+  bump, remove older ebuilds as payment to repoman
+
 *boodler-2.0.3-r1 (22 Oct 2010)
 
   22 Oct 2010; Gavin Pryke <[email protected]>

Modified: trunk/overlays/proaudio/media-sound/boodler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/Manifest        2011-04-15 
12:16:32 UTC (rev 1921)
+++ trunk/overlays/proaudio/media-sound/boodler/Manifest        2011-04-15 
13:03:03 UTC (rev 1922)
@@ -1,9 +1,6 @@
 AUX boodle-ui-qt.py 12114 RMD160 b233bfcd8a51b129dd0d2466f08b126a41077894 SHA1 
bf8402a5ce0480f93bdc9ac1bb6596adab8a3db7 SHA256 
b2a0ea4dc175e7e175671bfca48bafe44a0bd37801babcd7e23e492ad34130a4
 AUX boodler 2156 RMD160 3f14fe314d6d4f3dc05d566a710a9348825eb358 SHA1 
5442b4abfc45054f7395afa16e1b359704bccf5e SHA256 
b2f5fbc14dc152e78fdaca0b23020a8df03956c1987ce379df8cf082937177a1
-DIST Boodler-2.0.2.tar.gz 303617 RMD160 
2d0577027bfb6cfb295e6d1eaf54fb3dcea4a56b SHA1 
a153f58b3b39763a7876bbd28632a05134bbf522 SHA256 
94a687d4ce854fc0d7749da6953d0f17efbcd00ad30359299f4d478f6b8e5197
-DIST Boodler-2.0.3.tar.gz 306478 RMD160 
3499e5894a7fe457b3aafaaadebbc1063223e019 SHA1 
1f543d4a09930fe33e680f1d6cf986abf07fd29e SHA256 
fe432e35737aa14e3595930df05f85ecd24ba0278365c34c4028192c20a06088
-EBUILD boodler-2.0.2.ebuild 1647 RMD160 
597802fd10303055a77bf1f2cb0ed7fd48504b02 SHA1 
fbef618c802ec9323a8e72bf87487727e348bc09 SHA256 
521d5270b7bdadd73849d3e29d9e2036cd58b43d4d7b984c364bd9d148eab5d5
-EBUILD boodler-2.0.3-r1.ebuild 3507 RMD160 
44fdfbf5e6dc4303f03443d59f68c3574001cf51 SHA1 
5876d4c9ee9debdc810fa7b0c0cdeb5749723411 SHA256 
70c8cb81be0d68f4a658b5c442fe592abcdfc247bf05395ebca421082b6b2ae1
-EBUILD boodler-2.0.3.ebuild 1977 RMD160 
78d123848f328faebffd460abbf34a4839383e5c SHA1 
1ac8e96111be945a46507a7cebe5ac533440929e SHA256 
ab3ce6546a7a1e54eff9eacee8bf5dd6b182dfe8313742676e42aa3cc285ddd3
-MISC ChangeLog 895 RMD160 238c949be565723daf7d33ec156352ff60f507f0 SHA1 
f3ceac163b6a4c4610bf4a52adab369e1cc6f6ff SHA256 
453fcc1a0f4a8530d97a13b9c5748a18f314722d8aeb42a19f42c654d57705bd
+DIST Boodler-2.0.4.tar.gz 310801 RMD160 
80085b197a0f762f2c912bec16f8bf4739bb3d8a SHA1 
93936ccc8f9e5a0641d6aa2f237a8a357e05e7b8 SHA256 
430ca92103203442b1f4c5067ea7f6dc0dbced534bf02a28ed7a8e358aaa55f2
+EBUILD boodler-2.0.4.ebuild 3563 RMD160 
ba83d51b64bc3b46ac5cae4ce5a41d771cd07515 SHA1 
d11da198f0d74bc13c738067cf6138741af3dae9 SHA256 
d3373287f3f3180ba209dc8aecf19fa2193fd089ec3644eef32ff16ab9258240
+MISC ChangeLog 1132 RMD160 e7fe7afb53db77132f1a6d157cb8ea02fad7cbfa SHA1 
4798f139b0a341d4371938ab0391745d67ccad18 SHA256 
bfcd65272a7956f9d6bd73b1365da452f26c1fd9e156d9fea36de600ab5f3e2d
 MISC metadata.xml 457 RMD160 035f8f3790a1a312b132650bca012e2db915a57d SHA1 
2098a41f73f85e1b3e75e10cb494117df2cb7587 SHA256 
723b7bd3d0f84f5193ad64b625597ba2f9dc5c7d250a8b636b8cada6ad5f682b

Deleted: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.2.ebuild    
2011-04-15 12:16:32 UTC (rev 1921)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.2.ebuild    
2011-04-15 13:03:03 UTC (rev 1922)
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit distutils
-
-MY_PN="Boodler"
-
-DESCRIPTION="Tool for creating soundscapes -- continuous, infinitely varying 
streams of sound"
-HOMEPAGE="http://boodler.org/";
-SRC_URI="http://boodler.org/dl/${MY_PN}-${PV}.tar.gz";
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa esd intmath lame pulseaudio shout vorbis"
-RESTRICT="mirror"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.17a )
-               esd? ( >=media-sound/esound-0.2.41 )
-               lame? ( >=media-sound/lame-3.98.2-r1 )
-               pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-               shout? ( >=media-libs/libshout-2.1 )
-               vorbis? ( >=media-libs/libvorbis-1.2.1_rc1-r2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-       if use shout && ! use vorbis; then
-               eerror "To have shout support, you also need to build boodler 
with"
-               eerror "USE=\"vorbis\"!"
-               die
-       fi
-}
-
-src_prepare() {
-       local default_driver
-       local with
-       local without
-       use alsa && default_driver=alsa || default_driver=oss
-       use alsa && with="${with}alsa," || without="${without}alsa,"
-       use esd && with="${with}esd," || without="${without}esd,"
-       use lame && with="${with}lame," || without="${without}lame,"
-       use pulseaudio && with="${with}pulse," || without="${without}pulse,"
-       use shout && with="${with}shout," || without="${without}shout,"
-       use vorbis && with="${with}vorbis," || without="${without}vorbis,"
-       cat > "${S}/setup.cfg" <<-EOF
-               [build_scripts]
-               default_driver=${default_driver}
-               [build_ext]
-               with-drivers=${with}
-               without-drivers=${without}
-               intmath=$(use intmath && echo 1 || echo 0)
-       EOF
-}
-

Deleted: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3-r1.ebuild 
2011-04-15 12:16:32 UTC (rev 1921)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3-r1.ebuild 
2011-04-15 13:03:03 UTC (rev 1922)
@@ -1,117 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.4"
-
-inherit distutils bash-completion
-
-MY_P="Boodler-${PV}"
-
-DESCRIPTION="Tool for creating soundscapes -- continuous, infinitely varying 
streams of sound"
-HOMEPAGE="http://boodler.org/";
-SRC_URI="http://boodler.org/dl/${MY_P}.tar.gz";
-LICENSE="LGPL-2 GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa bash-completion coreaudio doc esd intmath jack lame pulseaudio qt4 
shout vorbis"
-
-RESTRICT="mirror"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.17a )
-       esd? ( >=media-sound/esound-0.2.41 )
-       jack? ( >=media-libs/bio2jack-0.9 )
-       lame? ( >=media-sound/lame-3.98.2-r1 )
-       pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-       shout? ( >=media-libs/libshout-2.1 )
-       vorbis? ( >=media-libs/libvorbis-1.2.1_rc1-r2 )"
-RDEPEND="${DEPEND}
-       qt4? ( >=dev-python/PyQt4-4.7.3[X] )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if use shout && ! use vorbis ; then
-               eerror "To have shout support, you also need to build boodler 
with"
-               eerror "USE=\"vorbis\"!"
-               die
-       fi
-}
-
-src_prepare() {
-       local defdriver
-       local with
-       local without
-
-       # set up a default audio driver (not daemon) according to USE flags.
-       # it does not appear to work in setup.cfg so there is a workaround 
below.
-       if use coreaudio ; then
-               defdriver=macosx
-       elif use alsa ; then
-               defdriver=alsa
-       else
-               defdriver=oss
-       fi
-
-       # this ugly code enables/disables the output drivers
-       # oss seems to be needed for boodler.py --list-drivers to work
-       with="${with}oss,"
-       use alsa && with="${with}alsa," || without="${without}alsa,"
-       use coreaudio && with="${with}macosx,osxaq," \
-               || without="${without}macosx,osxaq,"
-       use esd && with="${with}esd," || without="${without}esd,"
-       use jack && with="${with}jackb," || without="${without}jackb,"
-       use lame && with="${with}lame," || without="${without}lame,"
-       use pulseaudio && with="${with}pulse," || without="${without}pulse,"
-       use shout && with="${with}shout," || without="${without}shout,"
-       use vorbis && with="${with}vorbis," || without="${without}vorbis,"
-
-       # move the original setup.cfg out of the way as a backup to check syntax
-       mv "${S}/setup.cfg" "${T}/setup.cfg.original" || die "setup.cfg not 
found"
-
-       # fill the setup.cfg with the values
-       cat > "${S}/setup.cfg" <<-EOF
-               [build_scripts]
-               default_driver=${defdriver}
-               [build_ext]
-               with-drivers=${with}
-               without-drivers=${without}
-               intmath=$(use intmath && echo 1 || echo 0)
-       EOF
-
-       # workaround for default-driver in setup.cfg not functioning
-       $(PYTHON) setup.py build_scripts \
-               --default-driver ${defdriver} \
-               || die "$(PYTHON) setup.py build_scripts failed"
-
-       # fix boodle-ui-qt.py shebang
-       if use qt4 ; then
-               cp "${FILESDIR}/boodle-ui-qt.py" "${T}/boodle-ui-qt.py" \
-                       || die "cp ${FILESDIR}/boodle-ui-qt.py 
${T}/boodle-ui-qt.py failed"
-               python_convert_shebangs $(python_get_version) 
"${T}/boodle-ui-qt.py"
-       fi
-}
-
-src_install() {
-       distutils_src_install
-
-       # a bash completion addon script downloaded from the official site
-       # http://boodler.org/dl/etc/bash_completion.d/boodler
-       dobashcompletion "${FILESDIR}/boodler"
-
-       # a pyqt4 gui addon for boodler downloaded from the official site
-       # http://boodler.org/dl/etc/boodle-ui-qt.py
-       if use qt4 ; then
-               dobin "${T}/boodle-ui-qt.py" || die "boodle-ui-qt.py not found"
-       fi
-
-       # docs, better include them as boodler is not the most intuitive to use 
for
-       # new users
-       if use doc ; then
-               pushd doc || die "doc dir not found"
-               dohtml -r *
-               popd
-       fi
-}

Deleted: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3.ebuild    
2011-04-15 12:16:32 UTC (rev 1921)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3.ebuild    
2011-04-15 13:03:03 UTC (rev 1922)
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.4"
-
-inherit python distutils bash-completion
-
-MY_P="Boodler-${PV}"
-
-DESCRIPTION="Tool for creating soundscapes -- continuous, infinitely varying 
streams of sound"
-HOMEPAGE="http://boodler.org/";
-SRC_URI="http://boodler.org/dl/${MY_P}.tar.gz";
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa bash-completion esd intmath jack lame pulseaudio shout vorbis"
-RESTRICT="mirror"
-
-DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.17a )
-               esd? ( >=media-sound/esound-0.2.41 )
-               jack? ( >=media-libs/bio2jack-0.9 )
-               lame? ( >=media-sound/lame-3.98.2-r1 )
-               pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-               shout? ( >=media-libs/libshout-2.1 )
-               vorbis? ( >=media-libs/libvorbis-1.2.1_rc1-r2 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if use shout && ! use vorbis; then
-               eerror "To have shout support, you also need to build boodler 
with"
-               eerror "USE=\"vorbis\"!"
-               die
-       fi
-}
-
-src_prepare() {
-       local default_driver
-       local with
-       local without
-       use alsa && default_driver=alsa || default_driver=oss
-       use alsa && with="${with}alsa," || without="${without}alsa,"
-       use esd && with="${with}esd," || without="${without}esd,"
-       use jack && with="${with}jackb," || without="${without}jackb,"
-       use lame && with="${with}lame," || without="${without}lame,"
-       use pulseaudio && with="${with}pulse," || without="${without}pulse,"
-       use shout && with="${with}shout," || without="${without}shout,"
-       use vorbis && with="${with}vorbis," || without="${without}vorbis,"
-       cat > "${S}/setup.cfg" <<-EOF
-               [build_scripts]
-               default_driver=${default_driver}
-               [build_ext]
-               with-drivers=${with}
-               without-drivers=${without}
-               intmath=$(use intmath && echo 1 || echo 0)
-       EOF
-}
-
-src_install() {
-       distutils_src_install
-
-       # a bash completion addon script downloaded from the official site
-       dobashcompletion "${FILESDIR}/boodler"
-}

Copied: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild (from 
rev 1921, trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.3-r1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild            
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild    
2011-04-15 13:03:03 UTC (rev 1922)
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.4"
+inherit distutils bash-completion
+
+MY_P="Boodler-${PV}"
+
+DESCRIPTION="Tool for creating soundscapes -- continuous, infinitely varying 
streams of sound"
+HOMEPAGE="http://boodler.org/";
+SRC_URI="http://boodler.org/dl/${MY_P}.tar.gz";
+LICENSE="LGPL-2 GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa bash-completion coreaudio doc esd intmath jack lame pulseaudio qt4 
shout vorbis"
+
+RESTRICT="mirror"
+
+DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.17a )
+       esd? ( >=media-sound/esound-0.2.41 )
+       jack? ( >=media-libs/bio2jack-0.9 )
+       lame? ( >=media-sound/lame-3.98.2-r1 )
+       pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+       shout? ( >=media-libs/libshout-2.1 )
+       vorbis? ( >=media-libs/libvorbis-1.2.1_rc1-r2 )"
+RDEPEND="${DEPEND}
+       qt4? ( >=dev-python/PyQt4-4.7.3[X] )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       if use shout && ! use vorbis ; then
+               eerror "To have shout support, you also need to build boodler 
with"
+               eerror "USE=\"vorbis\"!"
+               die
+       fi
+}
+
+src_prepare() {
+       local defdriver
+       local with
+       local without
+
+       # set up a default audio driver (not daemon) according to USE flags.
+       # it does not appear to work in setup.cfg so there is a workaround 
below.
+       if use coreaudio ; then
+               defdriver=macosx
+       elif use alsa ; then
+               defdriver=alsa
+       else
+               defdriver=oss
+       fi
+
+       # this ugly code enables/disables the output drivers
+       # oss seems to be needed for boodler.py --list-drivers to work
+       with="${with}oss,"
+       use alsa && with="${with}alsa," || without="${without}alsa,"
+       use coreaudio && with="${with}macosx,osxaq," \
+               || without="${without}macosx,osxaq,"
+       use esd && with="${with}esd," || without="${without}esd,"
+       use jack && with="${with}jackb," || without="${without}jackb,"
+       use lame && with="${with}lame," || without="${without}lame,"
+       use pulseaudio && with="${with}pulse," || without="${without}pulse,"
+       use shout && with="${with}shout," || without="${without}shout,"
+       use vorbis && with="${with}vorbis," || without="${without}vorbis,"
+
+       # move the original setup.cfg out of the way as a backup to check syntax
+       mv "${S}/setup.cfg" "${T}/setup.cfg.original" || die "setup.cfg not 
found"
+
+       # fill the setup.cfg with the values
+       cat > "${S}/setup.cfg" <<-EOF
+               [build_scripts]
+               default_driver=${defdriver}
+               [build_ext]
+               with-drivers=${with}
+               without-drivers=${without}
+               intmath=$(use intmath && echo 1 || echo 0)
+       EOF
+
+       # workaround for default-driver in setup.cfg not functioning
+       $(PYTHON -a) setup.py build_scripts \
+               --default-driver ${defdriver} \
+               || die "$(PYTHON) setup.py build_scripts failed"
+
+       if use qt4 ; then
+               cp "${FILESDIR}/boodle-ui-qt.py" "${T}/boodle-ui-qt.py" || die
+
+               # fix up the command name for use in new boodler-2.0.4
+               sed -i -e "s/\"boodler.py\"/\"boodler\"/" 
"${T}/boodle-ui-qt.py" || die
+
+               python_convert_shebangs $(python_get_version) 
"${T}/boodle-ui-qt.py"
+       fi
+}
+
+src_install() {
+       distutils_src_install
+
+       # a bash completion addon script downloaded from the official site
+       # http://boodler.org/dl/etc/bash_completion.d/boodler
+       dobashcompletion "${FILESDIR}/boodler"
+
+       # a pyqt4 gui addon for boodler downloaded from the official site
+       # http://boodler.org/dl/etc/boodle-ui-qt.py
+       if use qt4 ; then
+               newbin "${T}/boodle-ui-qt.py" boodle-ui-qt || \
+               die "boodle-ui-qt.py not found"
+       fi
+
+       # docs, better include them as boodler is not the most intuitive to use 
for
+       # new users
+       if use doc ; then
+               pushd doc || die "doc dir not found"
+               dohtml -r *
+               popd
+       fi
+}

Reply via email to