Revision: 2148
Author: dominique
Date: 2012-06-17 16:42:42 +0200 (Sun, 17 Jun 2012)
Log Message:
-----------
Annotator: fixed URI + python setup, libclam: fixed install doc + examples
Modified Paths:
--------------
trunk/overlays/proaudio/media-libs/libclam/Manifest
trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
trunk/overlays/proaudio/media-sound/Annotator/ChangeLog
trunk/overlays/proaudio/media-sound/Annotator/Manifest
Modified: trunk/overlays/proaudio/media-libs/libclam/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/Manifest 2012-06-17 14:19:13 UTC
(rev 2147)
+++ trunk/overlays/proaudio/media-libs/libclam/Manifest 2012-06-17 14:42:42 UTC
(rev 2148)
@@ -8,6 +8,6 @@
EBUILD libclam-1.2.0.ebuild 3888 RMD160
a321453f9fa34ea777ffba789dd02c81ad377815 SHA1
1a9184c8f0d0c7ebf75b074e36ff9f698aa4e314 SHA256
fd54af97daf9d06480db012db83c405ed7e81df9ba00451ba3e1ea6ee6a16132
EBUILD libclam-1.3.0.ebuild 3888 RMD160
a321453f9fa34ea777ffba789dd02c81ad377815 SHA1
1a9184c8f0d0c7ebf75b074e36ff9f698aa4e314 SHA256
fd54af97daf9d06480db012db83c405ed7e81df9ba00451ba3e1ea6ee6a16132
EBUILD libclam-1.4.0.ebuild 4138 RMD160
8c65f3cc561656d9ff6d6fa6bd9c9875be3297a1 SHA1
36465722419fe884f130bbc9417b3ddb99f77174 SHA256
b21300fa867d39d1e8e2627aa9d2673ca2723d4fdeff8b65c91ee368944a5452
-EBUILD libclam-9999-r1.ebuild 4644 RMD160
9d711689f78bb54c40b835eb2780ee2bf565e407 SHA1
2a4dc5af305e7de0a2de37c0a61c330295f73907 SHA256
20211f6c1567b0cdbabea8abe1567b59f65b2a5202a2d9e5543db79b483dc9eb
+EBUILD libclam-9999-r1.ebuild 4689 RMD160
778962a885f96ac4ad3cf813b2d05e6bf48a7f31 SHA1
5b352023890d4910787ea6d2b8765acc57b8f6e1 SHA256
ab7e5834e812cc1282fcb308018db87a3dc7a055c652da1e9f5bb4bb1d31a3bb
MISC ChangeLog 2102 RMD160 03c200e7655142385e8031d60de70c6d5a67c9cc SHA1
6750c37ecb3c29bbaabf850e6389151aa8db2f73 SHA256
1d7286ecc1ab6fdeb95691625b7b621d1dfefe0f30b58168a0940489c5f64309
MISC metadata.xml 775 RMD160 0531993e7eef40e7ab38bed70785d7e877e83135 SHA1
0e77e51cba4a8c75f6fd11bb398a5ecc3d2e6044 SHA256
a277660c48b7b9f113dfc648ef20d35b0adb1f7bc3d1891a9d9071cefec72b6d
Modified: trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
2012-06-17 14:19:13 UTC (rev 2147)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
2012-06-17 14:42:42 UTC (rev 2148)
@@ -142,39 +142,39 @@
dodir /usr
scons install || die "scons install failed"
- cd "${S}"
+ cd "${MY_S}"
dodoc CHANGES
if use doc; then
docinto examples/CLAMRemoteController
- dodoc "${S}"/examples/CLAMRemoteController/*
+ dodoc "${MY_S}"/examples/CLAMRemoteController/*
docinto examples/CLT
- dodoc "${S}"/examples/CLT/*
+ dodoc "${MY_S}"/examples/CLT/*
docinto examples/ControlArrayExamples
- dodoc "${S}"/examples/ControlArrayExamples/*
+ dodoc "${MY_S}"/examples/ControlArrayExamples/*
docinto examples/MIDI_Synthesizer_example
- dodoc "${S}"/examples/MIDI_Synthesizer_example/*
+ dodoc "${MY_S}"/examples/MIDI_Synthesizer_example/*
docinto examples/NetworkLADSPAPlugin
- dodoc "${S}"/examples/NetworkLADSPAPlugin/*
+ dodoc "${MY_S}"/examples/NetworkLADSPAPlugin/*
docinto examples/PortsAndControlsUsageExample
- dodoc "${S}"/examples/PortsAndControlsUsageExample/*
+ dodoc "${MY_S}"/examples/PortsAndControlsUsageExample/*
docinto examples/PortsExamples
- dodoc "${S}"/examples/PortsExamples/*
+ dodoc "${MY_S}"/examples/PortsExamples/*
# docinto examples/QtDesignerPlugins
# dodoc "${S}"/examples/QtDesignerPlugins/*
docinto examples/QtPlots/BPFEditorExample
- dodoc "${S}"/examples/QtPlots/BPFEditorExample/*
+ dodoc "${MY_S}"/examples/QtPlots/BPFEditorExample/*
docinto examples/QtPlots/DirectPlotsExamples
- dodoc "${S}"/examples/QtPlots/DirectPlotsExamples/*
+ dodoc "${MY_S}"/examples/QtPlots/DirectPlotsExamples/*
docinto examples/QtPlots/ListPlotExample
- dodoc "${S}"/examples/QtPlots/ListPlotExample/*
+ dodoc "${MY_S}"/examples/QtPlots/ListPlotExample/*
docinto examples/QtPlots/QtPlotsExamples
- dodoc "${S}"/examples/QtPlots/QtPlotsExamples/*
+ dodoc "${MY_S}"/examples/QtPlots/QtPlotsExamples/*
docinto examples/QtPlots/SegmentEditorExample
- dodoc "${S}"/examples/QtPlots/SegmentEditorExample/*
+ dodoc "${MY_S}"/examples/QtPlots/SegmentEditorExample/*
docinto examples/QtPlots/utils
- dodoc "${S}"/examples/QtPlots/utils/*
+ dodoc "${MY_S}"/examples/QtPlots/utils/*
docinto examples/Tutorial
- dodoc "${S}"/examples/Tutorial/*
+ dodoc "${MY_S}"/examples/Tutorial/*
fi
}
Modified: trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
2012-06-17 14:19:13 UTC (rev 2147)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
2012-06-17 14:42:42 UTC (rev 2148)
@@ -4,7 +4,7 @@
EAPI=1
-inherit exteutils
+inherit exteutils python
DESCRIPTION="CLAM Music Annotator can visualize, check and modify music
information extracted from audio"
HOMEPAGE="http://clam-project.org/index.html";
@@ -17,6 +17,8 @@
IUSE="doc"
RESTRICT="mirror"
+PYTHON_DEPEND="2:7"
+
DEPEND="dev-util/scons
>=media-libs/libclam-1.4.0
<media-libs/libclam-9999
@@ -28,6 +30,10 @@
QTDIR=""
+pkg_setup() {
+ python_set_active_version 2
+}
+
src_compile() {
# required for scons to "see" intermediate install location
mkdir -p ${D}/usr/vmqt
Modified: trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
2012-06-17 14:19:13 UTC (rev 2147)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
2012-06-17 14:42:42 UTC (rev 2148)
@@ -4,13 +4,14 @@
EAPI=1
-inherit subversion exteutils
+inherit subversion exteutils python
DESCRIPTION="CLAM Music Annotator can visualize, check and modify music
information extracted from audio"
HOMEPAGE="http://clam-project.org/index.html";
SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/${PN}";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk";
+ESVN_PROJECT="clam"
LICENSE="GPL-2"
SLOT="0"
@@ -18,6 +19,8 @@
IUSE="doc"
RESTRICT="mirror"
+PYTHON_DEPEND="2:7"
+
DEPEND="dev-util/scons
>=media-libs/libclam-9999
|| ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
@@ -27,22 +30,27 @@
media-gfx/imagemagick"
S="${WORKDIR}/${PN}"
+MY_S="${S}/${PN}"
QTDIR=""
+pkg_setup() {
+ python_set_active_version 2
+}
+
src_compile() {
# required for scons to "see" intermediate install location
mkdir -p ${D}/usr/vmqt
addpredict /usr/share/clam/sconstools
- cd ${S}/vmqt
+ cd ${MY_S}/vmqt
escons clam_prefix=/usr DESTDIR="${D}/usr" release=yes || die "Building
vmqt failed"
- cd ${S}
- escons clam_prefix=/usr DESTDIR="${D}/usr" install_prefix="${D}/usr"
release=yes || die "Building Annotator failed"
+ cd ${MY_S}
+ escons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr"
release=yes || die "Building Annotator failed"
convert -resize 48x48 -colors 24 src/images/annotator-icon1.png
src/images/clam-annotator.xpm || die "convert icon failed"
}
src_install() {
- cd ${S}
+ cd ${MY_S}
dodir /usr
addpredict /usr/share/clam/sconstools
@@ -52,14 +60,14 @@
if use doc; then
docinto examples/data
- dodoc ${S}/vmqt/examples/data/*
+ dodoc ${MY_S}/vmqt/examples/data/*
docinto examples/src
- dodoc ${S}/vmqt/examples/src/*
+ dodoc ${MY_S}/vmqt/examples/src/*
docinto examples/utils
- dodoc ${S}/vmqt/examples/utils/*
+ dodoc ${MY_S}/vmqt/examples/utils/*
docinto examples
- dodoc ${S}/vmqt/examples/README
+ dodoc ${MY_S}/vmqt/examples/README
fi
insinto /usr/share/pixmaps
- doins ${S}/src/images/clam-annotator.xpm || die "install icon failed"
+ doins ${MY_S}/src/images/clam-annotator.xpm || die "install icon failed"
}
Modified: trunk/overlays/proaudio/media-sound/Annotator/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/ChangeLog 2012-06-17
14:19:13 UTC (rev 2147)
+++ trunk/overlays/proaudio/media-sound/Annotator/ChangeLog 2012-06-17
14:42:42 UTC (rev 2148)
@@ -2,8 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 17 Jun 2012; Dominique Michel <[email protected]>
- Annotator-9999.ebuild: Removed non needed and wrong subversion DEPEND
+ 17+18 Jun 2012; Dominique Michel <[email protected]>
+ Annotator-9999.ebuild: Removed non needed and wrong subversion DEPEND,
+ Changed URI.
+ 9999 + 0.5.0: Fixed python setup
20 Jan 2012; Gavin Pryke <[email protected]>
Annotator-0.3.8-r1.ebuild, Annotator-0.3.9.ebuild, Annotator-0.3.10.ebuild,
Modified: trunk/overlays/proaudio/media-sound/Annotator/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Manifest 2012-06-17
14:19:13 UTC (rev 2147)
+++ trunk/overlays/proaudio/media-sound/Annotator/Manifest 2012-06-17
14:42:42 UTC (rev 2148)
@@ -5,7 +5,7 @@
EBUILD Annotator-0.3.10.ebuild 1688 RMD160
b1ffebd206cbb51ba2749c74de39fc114e3f05e6 SHA1
fa7a7bebd1bc59550ca37a0e54379419a8266a45 SHA256
57ad72c0b1be02a268063891b18730038f6d30c4ec9e2a801fc1a8c1203ae64d
EBUILD Annotator-0.3.8-r1.ebuild 1687 RMD160
c9d452132039bb398a107b8e3df77d89a2c0a5de SHA1
7199de96eb7432a07f365c8903be09033e6b7ecb SHA256
c9b17ad89f5704995583f0bc595d173288d63e970562438b5f60703ea6674382
EBUILD Annotator-0.3.9.ebuild 1679 RMD160
a9e9f2fb10731d1a1eb6b56a7cd71c3f2f584a14 SHA1
2ae871071a985e66c08835d98c16d75603a8f73b SHA256
a67fc65989931967408f1dfe3a8f9cc4ee551f9aff2f5c11b535f2819d2cad17
-EBUILD Annotator-0.5.0.ebuild 1690 RMD160
d1b0947a7eb4bd890132b2fcab3464803a71cba2 SHA1
92fde871e759a1b4b69456604ff598cd7ffb85cd SHA256
e40ad938ae4f08116be3ba286578999813ac4b2ca8941b6dc19fbb3a5dc5908d
-EBUILD Annotator-9999.ebuild 1694 RMD160
93e65794de9eb112f9ef4654e3db86e007f5f7b9 SHA1
cee6a13a05cfe25748ab6b464e2ae344fb2d4623 SHA256
37cacbc45a15c5b11166ce5afaa732ee917995c78c433bc1dede1cfe4274c55f
-MISC ChangeLog 1167 RMD160 aba7b938dde2306d7b42e6f4f9a22f958f1cfa7f SHA1
d0a071ff1cd5fc501ddf6f7247ea7e3a148d4c84 SHA256
2a09135902c74856759ffded987a64883a1353013f50ffd4ac967f152a61de78
+EBUILD Annotator-0.5.0.ebuild 1764 RMD160
d5f27dcf94722dd863fa840b469049f07b8bd3fc SHA1
7b8775fc753e98136f0dbbe90d627636233b2139 SHA256
2c9de2ba1bfce9e700662ae5559d14977a85cad7dc6b21e02f7acfa7ec634854
+EBUILD Annotator-9999.ebuild 1811 RMD160
883bb167308dbabbe8e8f8185b0e51080664c295 SHA1
44d6af88afa7d9546349bbec6114801bc55a74a3 SHA256
c2c6050fa73cc9dc841d70dad5c426f8f481dee25433117eb1f8e259a92ee5aa
+MISC ChangeLog 1221 RMD160 a9fe9578eb4fd166cdaf387a8fe3811846aa54ea SHA1
67117f715653afedbc26467b866e086b3946c703 SHA256
74000505e75a78722dbfdf150239c581bd84284e843538211c2fe11380a2c998
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
