Revision: 2488
Author: dominique
Date: 2013-03-09 11:53:54 +0100 (Sat, 09 Mar 2013)
Log Message:
-----------
Annotator: removed old versions; moved qt deps to dev-qt
Modified Paths:
--------------
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
trunk/overlays/proaudio/media-sound/Annotator/metadata.xml
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.10.ebuild
trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.8-r1.ebuild
trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.9.ebuild
Deleted: trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.10.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.10.ebuild
2013-03-09 10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.10.ebuild
2013-03-09 10:53:54 UTC (rev 2488)
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit exteutils
-
-DESCRIPTION="CLAM Music Annotator can visualize, check and modify music
information extracted from audio"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-RESTRICT="mirror"
-
-DEPEND="dev-util/scons
- >=media-libs/libclam-1.2.0
- <media-libs/libclam-9999
- || ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
- >=x11-libs/qt-4.1:4 )"
-
-RDEPEND="${DEPEND}
- media-gfx/imagemagick"
-
-QTDIR=""
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p ${D}/usr/vmqt
- addpredict /usr/share/clam/sconstools
-
- cd ${S}/vmqt
- escons clam_prefix=/usr DESTDIR="${D}/usr" release=yes || die "Building
vmqt failed"
- cd ${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}
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- escons install || die "scons install failed"
-
- dodoc CHANGES COPYING README todos || die "dodoc failed"
-
- if use doc; then
- docinto examples/data
- dodoc ${S}/vmqt/examples/data/*
- docinto examples/src
- dodoc ${S}/vmqt/examples/src/*
- docinto examples/utils
- dodoc ${S}/vmqt/examples/utils/*
- docinto examples
- dodoc ${S}/vmqt/examples/README
- fi
- insinto /usr/share/pixmaps
- doins ${S}/src/images/clam-annotator.xpm || die "install icon failed"
-}
-
Deleted: trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.8-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.8-r1.ebuild
2013-03-09 10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.8-r1.ebuild
2013-03-09 10:53:54 UTC (rev 2488)
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit exteutils
-
-DESCRIPTION="CLAM Music Annotator can visualize, check and modify music
information extracted from audio"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-RESTRICT="mirror"
-
-DEPEND="dev-util/scons
- >=media-libs/libclam-1.0.0
- <media-libs/libclam-9999
- || ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
- >=x11-libs/qt-4.1:4 )"
-
-RDEPEND="${DEPEND}
- media-gfx/imagemagick"
-
-QTDIR=""
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p ${D}/usr/vmqt
- addpredict /usr/share/clam/sconstools
-
- cd ${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"
- convert -resize 48x48 -colors 24 src/images/annotator-icon1.png
src/images/clam-annotator.xpm || die "convert icon failed"
-}
-
-src_install() {
- cd ${S}
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- escons install || die "scons install failed"
-
- dodoc CHANGES COPYING README todos || die "dodoc failed"
-
- if use doc; then
- docinto examples/data
- dodoc ${S}/vmqt/examples/data/*
- docinto examples/src
- dodoc ${S}/vmqt/examples/src/*
- docinto examples/utils
- dodoc ${S}/vmqt/examples/utils/*
- docinto examples
- dodoc ${S}/vmqt/examples/README
- fi
- insinto /usr/share/pixmaps
- doins ${S}/src/images/clam-annotator.xpm || die "install icon failed"
-}
-
Deleted: trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.9.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.9.ebuild
2013-03-09 10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.3.9.ebuild
2013-03-09 10:53:54 UTC (rev 2488)
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit exteutils
-
-DESCRIPTION="CLAM Music Annotator can visualize, check and modify music
information extracted from audio"
-HOMEPAGE="http://clam-project.org/index.html";
-
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc"
-RESTRICT="mirror"
-
-DEPEND="dev-util/scons
- >=media-libs/libclam-1.1.0
- <media-libs/libclam-9999
- || ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
- >=x11-libs/qt-4.1:4 )"
-
-RDEPEND="${DEPEND}
- media-gfx/imagemagick"
-
-QTDIR=""
-
-src_compile() {
- # required for scons to "see" intermediate install location
- mkdir -p ${D}/usr/vmqt
- addpredict /usr/share/clam/sconstools
-
- cd ${S}/vmqt
- escons clam_prefix=/usr DESTDIR="${D}/usr" release=yes || die "Building
vmqt failed"
- cd ${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}
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- escons install || die "scons install failed"
-
- dodoc CHANGES COPYING README todos || die "dodoc failed"
-
- if use doc; then
- docinto examples/data
- dodoc ${S}/vmqt/examples/data/*
- docinto examples/src
- dodoc ${S}/vmqt/examples/src/*
- docinto examples/utils
- dodoc ${S}/vmqt/examples/utils/*
- docinto examples
- dodoc ${S}/vmqt/examples/README
- fi
- insinto /usr/share/pixmaps
- doins ${S}/src/images/clam-annotator.xpm || die "install icon failed"
-}
-
Modified: trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
2013-03-09 10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-0.5.0.ebuild
2013-03-09 10:53:54 UTC (rev 2488)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,18 +13,18 @@
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
RESTRICT="mirror"
PYTHON_DEPEND="2:7"
-DEPEND="dev-util/scons
- >=media-libs/libclam-1.4.0
+DEPEND=">=media-libs/libclam-1.4.0
<media-libs/libclam-9999
- || ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl:4 )
- >=x11-libs/qt-4.1:4 )"
-
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtopengl:4"
+
RDEPEND="${DEPEND}
media-gfx/imagemagick"
@@ -36,36 +36,34 @@
src_compile() {
# required for scons to "see" intermediate install location
- mkdir -p ${D}/usr/vmqt
+ mkdir -p "${D}"/usr/vmqt
addpredict /usr/share/clam/sconstools
-
- cd ${S}/vmqt
+
+ cd "${S}"/vmqt
escons clam_prefix=/usr DESTDIR="${D}/usr" release=yes || die "Building
vmqt failed"
- cd ${S}
+ cd "${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}
dodir /usr
addpredict /usr/share/clam/sconstools
-
+
escons install || die "scons install failed"
-
- dodoc CHANGES COPYING README todos || die "dodoc failed"
+ dodoc CHANGES README todos || die "dodoc failed"
+
if use doc; then
docinto examples/data
- dodoc ${S}/vmqt/examples/data/*
+ dodoc "${S}"/vmqt/examples/data/*
docinto examples/src
- dodoc ${S}/vmqt/examples/src/*
+ dodoc "${S}"/vmqt/examples/src/*
docinto examples/utils
- dodoc ${S}/vmqt/examples/utils/*
+ dodoc "${S}"/vmqt/examples/utils/*
docinto examples
- dodoc ${S}/vmqt/examples/README
+ dodoc "${S}"/vmqt/examples/README
fi
insinto /usr/share/pixmaps
- doins ${S}/src/images/clam-annotator.xpm || die "install icon failed"
+ doins "${S}"/src/images/clam-annotator.xpm || die "install icon failed"
}
-
Modified: trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
2013-03-09 10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Annotator-9999.ebuild
2013-03-09 10:53:54 UTC (rev 2488)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -21,10 +21,10 @@
PYTHON_DEPEND="2:7"
-DEPEND="dev-util/scons
- >=media-libs/libclam-9999
- || ( ( x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-opengl )
- >=x11-libs/qt-4.1:4 )"
+DEPEND=">=media-libs/libclam-9999
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtopengl"
RDEPEND="${DEPEND}
media-gfx/imagemagick"
@@ -39,7 +39,7 @@
src_compile() {
# required for scons to "see" intermediate install location
- mkdir -p ${D}/usr/vmqt
+ mkdir -p "${D}"/usr/vmqt
addpredict /usr/share/clam/sconstools
cd ${MY_S}/vmqt
@@ -56,7 +56,7 @@
escons install || die "scons install failed"
- dodoc CHANGES COPYING README todos || die "dodoc failed"
+ dodoc CHANGES README todos || die "dodoc failed"
if use doc; then
docinto examples/data
Modified: trunk/overlays/proaudio/media-sound/Annotator/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/ChangeLog 2013-03-09
10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/ChangeLog 2013-03-09
10:53:54 UTC (rev 2488)
@@ -1,7 +1,14 @@
# ChangeLog for media-sound/Annotator
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 09 Mar 2013; Dominique Michel <[email protected]>
+ Annotator-9999.ebuild; Annotator-0.5.0.ebuild: Moved qt depends to dev-qt/*;
+ repoman cleanup
+ -Annotator-0.3.8-r1.ebuild
+ -Annotator-0.3.9.ebuild
+ -Annotator-0.3.10.ebuild
+
17+18 Jun 2012; Dominique Michel <[email protected]>
Annotator-9999.ebuild: Removed non needed and wrong subversion DEPEND,
Changed URI.
Modified: trunk/overlays/proaudio/media-sound/Annotator/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/Manifest 2013-03-09
10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/Manifest 2013-03-09
10:53:54 UTC (rev 2488)
@@ -1,11 +1,5 @@
-DIST Annotator-0.3.10.tar.gz 22205040 RMD160
6a78a0d31083cf49441e4d544a9a530d15469622 SHA1
c252bac77de438f4ac420ecbf1f77d7534116a5a SHA256
54d87144d7e751e48f0b2a186345bbf4cf5dfdc11ebb7192d68fe69ae447914d
-DIST Annotator-0.3.8.tar.gz 20660993 RMD160
5f134e699fe12ea326f5d5f29a239607a07ca93f SHA1
d9a9d4fdec6f3177567be7527c4b6ea0c5fa296b SHA256
1b65630a94b286cdaf5442d9b6376b790731d10b8f26928b073ba947a65b0a67
-DIST Annotator-0.3.9.tar.gz 22193761 RMD160
2b23c7e3d2e5b8e7dedcf81223fdf8f14fcd0821 SHA1
522ae22c06428c34f1e0de627de954fc4d6b4736 SHA256
958da8c2f0cac11188ee6bb32b3892e89c42c7003c0cdaa79f690345ea472c70
-DIST Annotator-0.5.0.tar.gz 40026744 RMD160
7b797b1d39f94bd629b1112f06a0f01f93b7e665 SHA1
b3e44995bcdde0389970ad345cb675edea676a98 SHA256
1bc6ee9432bfe5f4b8d3468bf85fd39963db4a045cc963368d944d85b56195d6
-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 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
+DIST Annotator-0.5.0.tar.gz 40026744 SHA256
1bc6ee9432bfe5f4b8d3468bf85fd39963db4a045cc963368d944d85b56195d6 SHA512
7bf552778f31ef59cdd899d9ff96a7cb0b78c803b769fe4adcd699c52bb4d53b88f056df5224686c3b70167f452e707e377e221898f27a1a4ad532542fe88963
WHIRLPOOL
0062d1c28f788f6c74b6e0e0bfb40acbbddc0e49af6634331ef7befc0142163c010298ada23f56fb2b3a0ec81de709f23c6a624575a0ceefc52952672020efae
+EBUILD Annotator-0.5.0.ebuild 1697 SHA256
581008f3d24834c77197445095c3382e68da7e1fc05103f3b86e0a910d19cd7e SHA512
7a3f95256b2b597dd893928472190bb3b8b1e93c772eda1df087c732130d253ebef8be862e9e823ce686d2f88089c748a03144e4b64d7c98e557e26b2bd66a69
WHIRLPOOL
4b455340d937aa7a8d71fd4052a83d988cec2299b864359a221ff94742994278d9180adcf1622935dde80a16b7be288bffc10faf7da11be8848b00f85a95d957
+EBUILD Annotator-9999.ebuild 1748 SHA256
0dceb80ea10ba8fea5d271de9d6b93dc3ebad06b3f73fd650cc65121eeaf91d6 SHA512
97991bda931b59857c314de2c4513871c3e5d5dd38b210e336fa6721fc5c209836504b85355a1ed5638977008347cfa621b85406645f213bc4b1aed1eec70215
WHIRLPOOL
2a80e01e8c3dd604493b8b9d835ce2c978d448224aae5f7f87a42f412bd16e09f1b9a23214be07edaa217800ed4da2edb0b9c1076ed9160760d7d7ca8274c65e
+MISC ChangeLog 1467 SHA256
11e699ec73ffeca8ef96ad381679acc26a20c1629101a115a6deb99822e50bb5 SHA512
5e10b77fc2eee109452a8fd10679c32a513be80074dbc14ecac01d7bc57890601b97330eb96b37fcd6a4123df0f7ceafb4fe911645abf9735f5e049f893b7ffb
WHIRLPOOL
d659bc984407d811510c65dd68f6ad1541d79e5e7e7119df7015a399255d92cc37cfb9c547fcfa7a44d8e95b16c7226e1aab3e0bcddfec9c4b4e50a1c0772d1a
+MISC metadata.xml 246 SHA256
f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512
327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4
WHIRLPOOL
e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Modified: trunk/overlays/proaudio/media-sound/Annotator/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/Annotator/metadata.xml 2013-03-09
10:50:09 UTC (rev 2487)
+++ trunk/overlays/proaudio/media-sound/Annotator/metadata.xml 2013-03-09
10:53:54 UTC (rev 2488)
@@ -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>
