| [proaudio] [2536] media-sound/chordata: update to 1.0.0-r1 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2536
Author: gavlee
Date: 2013-03-15 14:54:20 +0100 (Fri, 15 Mar 2013)
Log Message:
-----------
media-sound/chordata: update to 1.0.0-r1
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/chordata/ChangeLog
trunk/overlays/proaudio/media-sound/chordata/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0-r1.ebuild
trunk/overlays/proaudio/media-sound/chordata/files/
trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/
trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch
trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0002-honour-toolchain-environment.patch
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0.ebuild
Modified: trunk/overlays/proaudio/media-sound/chordata/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/ChangeLog 2013-03-15 13:54:17 UTC (rev 2535)
+++ trunk/overlays/proaudio/media-sound/chordata/ChangeLog 2013-03-15 13:54:20 UTC (rev 2536)
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header$
+*chordata-1.0.0-r1 (15 Mar 2013)
+
+ 15 Mar 2013; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+ -chordata-1.0.0.ebuild, +chordata-1.0.0-r1.ebuild,
+ +files/chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch,
+ +files/chordata-1.0.0/0002-honour-toolchain-environment.patch:
+ update for new EAPI and python eclasses. add patches for failure if prefix
+ dir is not created first and respecting toolchain environment.
+
08 Mar 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
Moved depend to qt-dev/* in both ebuilds
Modified: trunk/overlays/proaudio/media-sound/chordata/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/Manifest 2013-03-15 13:54:17 UTC (rev 2535)
+++ trunk/overlays/proaudio/media-sound/chordata/Manifest 2013-03-15 13:54:20 UTC (rev 2536)
@@ -1,5 +1,7 @@
-DIST chordata-1.0.0.tar.gz 43731 SHA256 047c3a4ca1e17a9b2fa858e0de531aded5c8d18c0e434190a45c60f16cda1123
-EBUILD chordata-1.0.0.ebuild 1215 SHA256 0d7241c9cdacb33868963e2fc1e6a49aa8694a4f6e61b98260a1dd83399cfbbc SHA512 1a3d5957e3407b98ca3b4a6ca49efab64d12d33285ba3d71efa232392a5e5432d988b6265bf4a9f97215d982fd505928e78306911b66e9b913cacced37313ea9 WHIRLPOOL 5b06f8b53f55d9fe5f407c4bcdb61739e7d9658bc528fe7f0b29daad552dc7071f310e753998f9cc196304fa8c4f0842719eb7e5c2dc62755d89da3d8216deec
+AUX chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch 1003 SHA256 94696ccb93397a4b43e0689ccd21d2320a84fcdbdbcb1ef0e05a38081571a8f7 SHA512 c0c84da138e392cc3b412c93e6aa7d11e639615b0baae5d8ef076de8599c8866d0f86b4c6cf0f8e44026ed8f32e5800ff77e430d279e0a18dd6d89818d23a2bd WHIRLPOOL c2c6deca8242b9cd21461aae980693bd080f55d9eb6afb29133688ad6aef897f9cff68c2b39c070ea1b334b28ad39610f509c8f6a3f97043e5a3218d60440697
+AUX chordata-1.0.0/0002-honour-toolchain-environment.patch 1458 SHA256 be55148075af41baf71c42cc90179aa233ce42a3fed06b9f52dba10230e62af9 SHA512 4979558e984c8196932b8dc1c340d4c6093cb7dbac35a2630a5dabe49ec70a386fb5f8119cd55e0656a52d5bb3e07e64142b4662cc397f2c3f32987afbc4ed8d WHIRLPOOL e013e9271d298b4d620d7094e7986e8ef688f2bcf450661faa7feca05fe20d4425a8ea8146d4dbe7a39e103eed50d6c2b2e682e2cb470ff021a037bfd5fbfbee
+DIST chordata-1.0.0.tar.gz 43731 SHA256 047c3a4ca1e17a9b2fa858e0de531aded5c8d18c0e434190a45c60f16cda1123 SHA512 460e020eb67333f8dde88f685c63a6bd7c1f6e390534a36a95107e911a57863eda1847ecd2da5aa1a19ed9c38d6cdc22c24675e8d72d3443021141aaa66376f6 WHIRLPOOL 8506fbbd60e4a72c67de2f3390232640ed532d227c17f98035d2484c9aa82f03ab6c808a5a09eb2af6d9eda7e0cdc33708b63d9faa60cb0b12d79f9f835fb7fd
+EBUILD chordata-1.0.0-r1.ebuild 1183 SHA256 b8033be33cd76f10d52b7054ae3bb59f2c80de6815138d99e8e345c282e0fdd0 SHA512 3d90d8c1d1cc7372c98b64e5b61031218354db652d65511ae9fcb5de67c3f2e94a51b001b956c57ed59194420dd86a91cfee4aa076945b2c6fc0f802f12fbede WHIRLPOOL 3e692486266e1995e2efc820a83ed311f86f3f7ff001614543fe815db7f9b8385cc0b364d9c0454ba05614c7bdd50b760e8182bfb2fd96613544c04b09076595
EBUILD chordata-9999.ebuild 1190 SHA256 8c74e9d401ef0ef1d476a966a4921df81ec9a306bbc318af33ea9d4289da503d SHA512 b5611b2e2625293d0324cbd1ba9a7b1c7f9293d9307efd30c9228d84acd443884d8b741e2424655b3547116d6d0d3b8139c1533298462652d2555d97f7ffb3b9 WHIRLPOOL 51736a13f4356f38b679c12b2989a109dcbfc570ffc0c9eb24f4caba57791fe4e2143c7b1185cf6ba76ba22b553e2a08b2973222bce08999e8a89dbd59a26314
-MISC ChangeLog 670 SHA256 0d9028a019cfbdf53edaeff4dc9076ebe3f5184e0b22a3a70a61529a33bab9d9 SHA512 70303006cfb65cc71b852cfc255ad21becee3472249eab06dc69630d4f6520fe8911063245da9b00138edfad17bfa38e3c309f298e3b982af81c1a53d08e813d WHIRLPOOL e4a54c015167a4fc61f9e97a8be951950205c409f91b1ccd5b95f383afd57cb6e21324e0a7adfd98ffbad76e861c522558782f32ff58ef48f1965b054915f4b5
+MISC ChangeLog 1104 SHA256 bce868707362cf30961a5e8189f855c124c797405b5d44c6b307c6a216958988 SHA512 a67edf3073191e927a9f726514ef605096f1e5a8354861c4a1aaab0b0cfbb87dc15ed4434a973ffe657558cfb9267694c2204a7cd976b882442a8cfa67320b69 WHIRLPOOL 228c250ab84baa961287bbf946bbade45fa4cee3af92d0dd87f51b7643e06ec787068b600fec3d18e8a4d9dd92d6e9715ed52293c8f5236b8533dbb00ae0d7e7
MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added: trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0-r1.ebuild 2013-03-15 13:54:20 UTC (rev 2536)
@@ -0,0 +1,56 @@
+# 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 eutils scons-utils toolchain-funcs multilib python-any-r1
+
+DESCRIPTION="A tool for tonal analysis of audio files from the CLAM Project"
+HOMEPAGE="http://clam-project.org/";
+SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtopengl
+ >=media-libs/libclam-1.4.0-r1
+ >=media-sound/NetworkEditor-1.4.0-r1"
+DEPEND="${RDEPEND}
+ media-gfx/imagemagick
+ virtual/pkgconfig"
+
+RESTRICT="mirror"
+
+pkg_setup() {
+ tc-export CC CXX
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}/*.patch
+}
+
+src_compile() {
+ QTDIR="${EPREFIX}/usr" escons \
+ clam_prefix="${EPREFIX}/usr" \
+ prefix="${ED}/usr" \
+ qt_plugins_install_path="/$(get_libdir)/qt4/plugins/designer" \
+ verbose=1
+
+ convert -resize 48x48 -colors 24 resources/Chordata.ico \
+ clam-chordata.xpm || die
+}
+
+src_install() {
+ QTDIR="${EPREFIX}/usr" escons install
+
+ dodoc CHANGES
+
+ insinto /usr/share/pixmaps
+ doins clam-chordata.xpm
+}
Deleted: trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0.ebuild 2013-03-15 13:54:17 UTC (rev 2535)
+++ trunk/overlays/proaudio/media-sound/chordata/chordata-1.0.0.ebuild 2013-03-15 13:54:20 UTC (rev 2536)
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit exteutils qt4-r2
-
-DESCRIPTION="Chordata is a tool for tonal analysis of audio files."
-HOMEPAGE="http://clam-project.org/";
-SRC_URI="http://clam-project.org/download/src/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/libclam-1.4.0
- <media-libs/libclam-9999
- >=media-sound/NetworkEditor-1.4.0
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qtopengl"
-
-DEPEND="${RDEPEND}
- dev-util/scons"
-
-QTDIR=""
-
-src_compile() {
-# # required for scons to "see" intermediate install location
- mkdir -p "${D}/usr"
- addpredict /usr/share/clam/sconstools
-
- escons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" release=yes \
- qt_plugins_install_path="/lib/qt4/plugins/designer" || die "Building chordata failed"
- convert -resize 48x48 -colors 24 resources/Chordata.ico clam-chordata.xpm || die "convert icon failed"
-}
-
-src_install() {
- dodir /usr
- addpredict /usr/share/clam/sconstools
-
- escons install || die "scons install failed"
-
- dodoc CHANGES || die "dodoc failed"
-
- insinto /usr/share/pixmaps
- doins clam-chordata.xpm || die "install icon failed"
-}
Added: trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0001-fix-creating-of-packaging-install-dir.patch 2013-03-15 13:54:20 UTC (rev 2536)
@@ -0,0 +1,25 @@
+From 752e505e65e31c2f149ab3ebc85309c84422dd18 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Thu, 14 Mar 2013 17:51:17 +0000
+Subject: [PATCH 1/2] fix creating of packaging install dir
+
+---
+ SConstruct | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index ab38b35..30bdf75 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -4,7 +4,7 @@ import glob
+ import sys
+
+ options = Variables('options.cache', ARGUMENTS)
+-options.Add(PathVariable('prefix', 'The prefix where the application will be installed', ''))
++options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '', PathVariable.PathIsDirCreate))
+ options.Add(PathVariable('clam_prefix', 'The prefix where CLAM was installed', ''))
+ options.Add(BoolVariable('release', 'Enabling compiler optimizations', 'no') )
+ options.Add(BoolVariable('verbose', 'Display the full command line instead a short command description', 'no') )
+--
+1.7.12.4
+
Added: trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0002-honour-toolchain-environment.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0002-honour-toolchain-environment.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/chordata/files/chordata-1.0.0/0002-honour-toolchain-environment.patch 2013-03-15 13:54:20 UTC (rev 2536)
@@ -0,0 +1,44 @@
+From 2b9281e67b226771d4b051a68ead0d33febd40d9 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Fri, 15 Mar 2013 12:56:49 +0000
+Subject: [PATCH 2/2] honour toolchain environment
+
+---
+ SConstruct | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 30bdf75..71ac98b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -2,6 +2,7 @@
+ import os
+ import glob
+ import sys
++import SCons.Util
+
+ options = Variables('options.cache', ARGUMENTS)
+ options.Add(PathVariable('prefix', 'The prefix where the application will be installed', '', PathVariable.PathIsDirCreate))
+@@ -32,6 +33,19 @@ Help(options.GenerateHelpText(env))
+
+ env.SConsignFile() # Single signature file
+
++if os.environ.has_key('CC'):
++ env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++ env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ crosscompiling = env.has_key("crossmingw") and env["crossmingw"]
+ isWindowsPlatform = sys.platform=='win32' or crosscompiling
+ isLinuxPlatform = sys.platform=='linux2' and not crosscompiling
+--
+1.7.12.4
+