Revision: 2530
Author: gavlee
Date: 2013-03-11 16:07:47 +0100 (Mon, 11 Mar 2013)
Log Message:
-----------
media-sound/boodler: migrate to distutils-r1 eclass, disable esd.
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/boodler/ChangeLog
trunk/overlays/proaudio/media-sound/boodler/Manifest
trunk/overlays/proaudio/media-sound/boodler/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4-r1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild
Modified: trunk/overlays/proaudio/media-sound/boodler/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/ChangeLog 2013-03-11
10:23:09 UTC (rev 2529)
+++ trunk/overlays/proaudio/media-sound/boodler/ChangeLog 2013-03-11
15:07:47 UTC (rev 2530)
@@ -1,7 +1,14 @@
# ChangeLog for media-sound/boodler
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*boodler-2.0.4-r1 (11 Mar 2013)
+
+ 11 Mar 2013; Gavin Pryke (gavlee) <[email protected]>
+ -boodler-2.0.4.ebuild, +boodler-2.0.4-r1.ebuild, metadata.xml:
+ attempt move to distutils-r1 eclass. fix rename of bash-completion-r1
+ install command. force disable esd.
+
02 Jun 2012; Hakan Demiralp <[email protected]> boodler-2.0.4.ebuild:
boodler-2.0.4: fix missing python_pkg_setup() call wrt bug #106 by 3rx9o
Modified: trunk/overlays/proaudio/media-sound/boodler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/Manifest 2013-03-11
10:23:09 UTC (rev 2529)
+++ trunk/overlays/proaudio/media-sound/boodler/Manifest 2013-03-11
15:07:47 UTC (rev 2530)
@@ -1,6 +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.4.tar.gz 310801 RMD160
80085b197a0f762f2c912bec16f8bf4739bb3d8a SHA1
93936ccc8f9e5a0641d6aa2f237a8a357e05e7b8 SHA256
430ca92103203442b1f4c5067ea7f6dc0dbced534bf02a28ed7a8e358aaa55f2
-EBUILD boodler-2.0.4.ebuild 3681 RMD160
e458bdb45afb36540773b0804d5fd75ad3a1ab22 SHA1
a87b8542c86473fd5670e4b6005ff08b897658a1 SHA256
cc60b6add50d8e684b865a31bcb300c529f1c31d6ae6a43748dbc096e13d2d4a
-MISC ChangeLog 1477 RMD160 f3584c74504402b3822bd240b4bb88c724779c99 SHA1
8c04f5300e07035a9600a858e0315f1b434a22d3 SHA256
1b9f8e10ea4f8645f0739ad75f7519b5a1df22c7a4e25cbcd75c80027993aa93
-MISC metadata.xml 457 RMD160 035f8f3790a1a312b132650bca012e2db915a57d SHA1
2098a41f73f85e1b3e75e10cb494117df2cb7587 SHA256
723b7bd3d0f84f5193ad64b625597ba2f9dc5c7d250a8b636b8cada6ad5f682b
+AUX boodle-ui-qt.py 12114 SHA256
b2a0ea4dc175e7e175671bfca48bafe44a0bd37801babcd7e23e492ad34130a4 SHA512
c2770590a888c8e6183bd173ed484bf487e678679d60e2b8de3335cdc78e04eae9e381f831c6c66be6f3b7ceb4002cd46d4f4598d55f3f76bc686a54487610cc
WHIRLPOOL
9aade76ecaccebe4146851e92015388348d0fdc0c467932e142cefb08b01706784d0d72857889a69418f90547328e184a415473a44ef894d6531c17abf8d7333
+AUX boodler 2156 SHA256
b2f5fbc14dc152e78fdaca0b23020a8df03956c1987ce379df8cf082937177a1 SHA512
88b4e9ae3f916c02ce76a1f7db9ade5b0a24558d3167e16de051f8e1e3cf734b3845b30b9ac26baa231d34b2a0e73c28ce613f11ae14f606495e6619e489f499
WHIRLPOOL
9466af082362125d5adf69143e964cba1bebe608bc3ed668d7da84d51f5e580588141126a53561d43ac0cd9f650e8c7cbbf38a738229a00a5549a830ca687c98
+DIST Boodler-2.0.4.tar.gz 310801 SHA256
430ca92103203442b1f4c5067ea7f6dc0dbced534bf02a28ed7a8e358aaa55f2 SHA512
d48eb55e552f157e5ec7c456a17f70ec81a7b30fdbe7c7097163c3ee9ae33d726011aecfaecc8c47de8c358eb3b0f46dc0d94fcbe56efa4225e8a2e94e485215
WHIRLPOOL
467dfd1ae8d4d845b5c853cdea5f892c09e7d80c3fb4a571dc5faa509e47586451fb22ed7446537c9363827c89f28343a3831a8f9f02851e4289cc292b1aca5f
+EBUILD boodler-2.0.4-r1.ebuild 3332 SHA256
17e827e46d216813af475bf7b8257386d972e14f8de96fe4767f444c8bf9d3fd SHA512
f8104d3ca91d450990b329289cd5978b3a5232b4f008ed0b0becff93772cbbf6e06dd27b6039093cdc143dad61b4a6ac39142615d70d8ad79f46ae0c242cf0c0
WHIRLPOOL
9fc8a68e9d99e82cd3304b8b92d680220995d72433af7c409531330c15d4f1bae5acdcb185b275d2ed528679416f8bea29429c85950735fa66897607ff1bdf23
+MISC ChangeLog 1751 SHA256
30e0ef65c3a8b36e6d913608a18b76bad5a41b4623ac0f306182ef9f76c47362 SHA512
0ba3d586fca85dd71b98b483ab114abb769f7bebf6bafbd5389aab3b397906d6809c17ae02ae793459801810ebffa701314442c193c92cc1815a6e126472ccd0
WHIRLPOOL
f9ddce49b7ab444c55ea5e860155b70766f5907a111cddf4e0141fad483cc3a96df19484978841e8740a29196918e34c64584ba29e5aa24bcf89ac74705998f0
+MISC metadata.xml 435 SHA256
6946624236d5e8d2d467ff9bbe946c8d738971c64437740d33368c1f00a462b1 SHA512
f97265eadb49e94658d61929475392f37d98cc34aac71edc357c204840cd95c2e7e36fdb7fd70c6f23be642584704a4b0dc0fcf8cd4436690644c373d8a4ffa8
WHIRLPOOL
70836aac2db5615bb4610f9dcea4d395061d1ea092caee3629196f7fbac7f2d018d1524c34054fdaa8b18c3048ff71e31513a37625acccdfccc9dbcb96ba9179
Copied: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4-r1.ebuild
(from rev 2529,
trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4-r1.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4-r1.ebuild
2013-03-11 15:07:47 UTC (rev 2530)
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Tool for creating soundscapes -- continuous, infinitely varying
streams of sound"
+HOMEPAGE="http://boodler.org/";
+SRC_URI="http://boodler.org/dl/Boodler-${PV}.tar.gz";
+LICENSE="LGPL-2 GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa bash-completion coreaudio doc intmath jack lame pulseaudio qt4
shout vorbis"
+REQUIRED_USE="shout? ( vorbis )"
+
+DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.17a )
+ 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}/Boodler-${PV}
+RESTRICT="mirror"
+
+HTML_DOCS=( doc/ )
+
+python_prepare_all() {
+ # fix bash completion script for new file names without extension in
2.0.4
+ cp "${FILESDIR}/boodler" "${T}"/boodler || die
+ sed -i -e s/\.py//g "${T}"/boodler || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+ if use qt4 ; then
+ # copy to tmp dir so it can be modified later
+ cp "${FILESDIR}"/boodle-ui-qt.py \
+ "${T}"/${EPYTHON}/boodle-ui-qt || die
+
+ # fix up the command name which was changed in boodler-2.0.4
+ sed -i -e "s/\"boodler.py\"/\"boodler\"/" \
+ "${T}"/${EPYTHON}/boodle-ui-qt || die
+ fi
+
+ distutils-r1_python_prepare
+}
+
+python_configure_all() {
+ 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,"
+ 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 setup.cfg setup.cfg.orig || die
+
+ # fill the setup.cfg with the values
+ cat > setup.cfg <<-EOF
+ [build_scripts]
+ default_driver=${defdriver}
+ [build_ext]
+ with-drivers=${with}
+ without-drivers=${without}
+ intmath=$(use intmath && echo 1 || echo 0)
+ EOF
+
+ mydistutilargs=( --default-driver ${defdriver} )
+}
+
+python_install() {
+ # a pyqt4 gui addon for boodler downloaded from the official site
+ # http://boodler.org/dl/etc/boodle-ui-qt.py
+ if use qt4 ; then
+ python_doscript "${T}"/${EPYTHON}/boodle-ui-qt
+ fi
+
+ distutils-r1_python_install
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ # a bash completion addon script downloaded from the official site
+ # http://boodler.org/dl/etc/bash_completion.d/boodler
+ dobashcomp "${T}/boodler"
+}
Deleted: trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild
2013-03-11 10:23:09 UTC (rev 2529)
+++ trunk/overlays/proaudio/media-sound/boodler/boodler-2.0.4.ebuild
2013-03-11 15:07:47 UTC (rev 2530)
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-inherit distutils bash-completion-r1 python
-
-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() {
-# Since boodler does not work with python3, we use python2
- python_set_active_version 2
- python_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
-}
Modified: trunk/overlays/proaudio/media-sound/boodler/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/boodler/metadata.xml 2013-03-11
10:23:09 UTC (rev 2529)
+++ trunk/overlays/proaudio/media-sound/boodler/metadata.xml 2013-03-11
15:07:47 UTC (rev 2530)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>[email protected]</email>
<name>pro-audio overlay team</name>
