Revision: 1982
Author: gavlee
Date: 2011-05-21 02:38:16 +0200 (Sat, 21 May 2011)
Log Message:
-----------
media-sound/psychosynth 0.1.6/0.2.0 bump and cleanup
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/psychosynth/ChangeLog
trunk/overlays/proaudio/media-sound/psychosynth/Manifest
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.6.ebuild
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.2.0.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/psychosynth/files/psychosynth-0.1.1-gcc43.patch
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.1.ebuild
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.5.ebuild
Modified: trunk/overlays/proaudio/media-sound/psychosynth/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/ChangeLog 2011-05-15
20:49:16 UTC (rev 1981)
+++ trunk/overlays/proaudio/media-sound/psychosynth/ChangeLog 2011-05-21
00:38:16 UTC (rev 1982)
@@ -1,7 +1,17 @@
# ChangeLog for media-sound/psychosynth
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*psychosynth-0.2.0 (21 May 2011)
+*psychosynth-0.1.6 (21 May 2011)
+
+ 21 May 2011; Gavin Pryke <[email protected]>
+ -psychosynth-0.1.1.ebuild, -files/psychosynth-0.1.1-gcc43.patch,
+ -psychosynth-0.1.5.ebuild, +psychosynth-0.1.6.ebuild,
+ +psychosynth-0.2.0.ebuild, psychosynth-9999.ebuild:
+ remove ancient ebuilds repoman complains about. bump to 0.1.6 and 0.2.0,
+ update live ebuild. 0.2.0 and bzr ebuild require >=gcc-4.5
+
*psychosynth-9999 (28 Aug 2009)
*psychosynth-0.1.5 (28 Aug 2009)
Modified: trunk/overlays/proaudio/media-sound/psychosynth/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/Manifest 2011-05-15
20:49:16 UTC (rev 1981)
+++ trunk/overlays/proaudio/media-sound/psychosynth/Manifest 2011-05-21
00:38:16 UTC (rev 1982)
@@ -1,8 +1,7 @@
-AUX psychosynth-0.1.1-gcc43.patch 22865 RMD160
45f5267e0ff487c77d5c4f8b4d4c42acf28f9261 SHA1
6c1423f0d6c35f9ac9d5188263bb6e0eb8708e84 SHA256
8449fab499dce0e4fa53d14b2560e338b57ba3fe748a4cfb0ff1ae1852b92369
-DIST psychosynth-0.1.1.tar.gz 11960195 RMD160
1e89f7742bbb216fa706ea55120c89f0601e9988 SHA1
7f6aff21ecbb1eb6c2ca0fd97108193c81105f42 SHA256
9734e65418cbbfb67e11ce3f19f2b3e86c230d673f54bad487d5ba165dc46aad
-DIST psychosynth-0.1.5.tar.gz 14189356 RMD160
b140bf123dc1b93d95dd0cf7d80774840fbe62ef SHA1
c90ac607704151ae9ca1b5a416ae1d48bd0c347f SHA256
e26dc7e1a3b2422f07db2411e13cf1b92db9b4d6f07f3a33949e183986804b93
-EBUILD psychosynth-0.1.1.ebuild 1743 RMD160
fa33c2a3af7022f45ee7fffd74d0eb1c18a3a7c5 SHA1
4b5f575c268abe718d2e76281bc1b53b5594d55c SHA256
491ad3e8fa814906a38a2e08395791f2c352d48a72e8cdf7a7691876dc0f1f1c
-EBUILD psychosynth-0.1.5.ebuild 1386 RMD160
0ea3a6df09ebbe406398a8b6f39945b4168bdabc SHA1
dc4a48b4608748b299793a87973076d262e2ee56 SHA256
39a3f7a47f4b6c190d006a8cdf4d9eda494e96507ad77e9148f30734e474fd3c
-EBUILD psychosynth-9999.ebuild 1844 RMD160
cd9e238a398369b2af5eb4c162c1ae91e47c931a SHA1
4d07ff9f9649bfdfb00ef558c2dd0a2cbb71b146 SHA256
ae95ee4abb0671071c238ef41e44fc98e506a5d6ffff5844a4a3858bf50e0dc6
-MISC ChangeLog 609 RMD160 2c61fb0dbc7c3034620c01d30e629bb51ec9bb6b SHA1
3df90278045b3289d375b4f4e1f27cf5d15c39fb SHA256
698af0b6a4bf57b226066b91c84b71b3772471ce24091bc77e5ab2b2eb648485
+DIST psychosynth-0.1.6.tar.gz 14202818 RMD160
bd0d1251c2c20c9ca36c2b88acc909434fcdbe04 SHA1
e7c68a9ad0178f374a5adb666a0bd57587001ed5 SHA256
a84ed45e03675e22fcaa7668ebd168b9e4fd79881c02278acd55edf3dcd57f49
+DIST psychosynth-0.2.0.tar.gz 14326785 RMD160
a1e2d44352ef595cb326b5e0080e60077c536144 SHA1
241e85174596ab2fc0b9dc75ae938c461ecc94ed SHA256
527305715fe589071f4ec93de7a42fd11bb70e622108e27c1ceceee5ac266047
+EBUILD psychosynth-0.1.6.ebuild 1507 RMD160
cca7fc5f3aefc96edf09fbb6efdae95f785db980 SHA1
b28b4a4ada8f0492eeddd4a97c60f0bef706935c SHA256
4c931a082aa39d95dab55c23cc471a0065f6347d046e8d9d3f97e4862d7d293d
+EBUILD psychosynth-0.2.0.ebuild 1507 RMD160
cca7fc5f3aefc96edf09fbb6efdae95f785db980 SHA1
b28b4a4ada8f0492eeddd4a97c60f0bef706935c SHA256
4c931a082aa39d95dab55c23cc471a0065f6347d046e8d9d3f97e4862d7d293d
+EBUILD psychosynth-9999.ebuild 1507 RMD160
cca7fc5f3aefc96edf09fbb6efdae95f785db980 SHA1
b28b4a4ada8f0492eeddd4a97c60f0bef706935c SHA256
4c931a082aa39d95dab55c23cc471a0065f6347d046e8d9d3f97e4862d7d293d
+MISC ChangeLog 1046 RMD160 606fada49558b937c9565ebd9270ab4e3d8fdef0 SHA1
e21002f84a5745b1a9e4d5db87fcfaa2e74f07fc SHA256
71667c60124516e91687cb518ecaeac7b0a16fe43e7310145bad1c6aac687214
MISC metadata.xml 334 RMD160 204f64c886d4c04a30b7fd0986fdd621875736ed SHA1
0d618c56f978230797d26a20eae8a7fc91f76e90 SHA256
8154e26fb25ef183a4073ebe6ff1a60dbf7248536e37094a09947b98c14fb77c
Deleted:
trunk/overlays/proaudio/media-sound/psychosynth/files/psychosynth-0.1.1-gcc43.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/psychosynth/files/psychosynth-0.1.1-gcc43.patch
2011-05-15 20:49:16 UTC (rev 1981)
+++
trunk/overlays/proaudio/media-sound/psychosynth/files/psychosynth-0.1.1-gcc43.patch
2011-05-21 00:38:16 UTC (rev 1982)
@@ -1,453 +0,0 @@
-diff -Naur psychosynth-0.1.1.orig/libpsynth/common/ArgParser.cpp
psychosynth-0.1.1/libpsynth/common/ArgParser.cpp
---- psychosynth-0.1.1.orig/libpsynth/common/ArgParser.cpp 2008-02-26
02:06:51.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/common/ArgParser.cpp 2008-06-04
22:32:03.957061137 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include "common/ArgParser.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/common/FileFinder.cpp
psychosynth-0.1.1/libpsynth/common/FileFinder.cpp
---- psychosynth-0.1.1.orig/libpsynth/common/FileFinder.cpp 2008-04-03
01:27:47.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/common/FileFinder.cpp 2008-06-04
22:32:03.960394242 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include "common/FileFinder.h"
- #include "common/Misc.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/common/FileManager.cpp
psychosynth-0.1.1/libpsynth/common/FileManager.cpp
---- psychosynth-0.1.1.orig/libpsynth/common/FileManager.cpp 2008-04-02
23:31:58.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/common/FileManager.cpp 2008-06-04
22:32:03.960394242 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include "common/FileManager.h"
-
- namespace psynth
-diff -Naur psychosynth-0.1.1.orig/libpsynth/common/Misc.cpp
psychosynth-0.1.1/libpsynth/common/Misc.cpp
---- psychosynth-0.1.1.orig/libpsynth/common/Misc.cpp 2008-04-02
01:45:47.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/common/Misc.cpp 2008-06-04
22:32:03.960394242 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
- #include <cmath>
- #include <cctype>
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCBroadcast.cpp
psychosynth-0.1.1/libpsynth/net/OSCBroadcast.cpp
---- psychosynth-0.1.1.orig/libpsynth/net/OSCBroadcast.cpp 2008-02-25
20:31:55.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/net/OSCBroadcast.cpp 2008-06-04
22:32:03.963728115 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
- #include <iostream>
-
- #include "net/OSCBroadcast.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCClient.cpp
psychosynth-0.1.1/libpsynth/net/OSCClient.cpp
---- psychosynth-0.1.1.orig/libpsynth/net/OSCClient.cpp 2008-04-04
19:46:40.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/net/OSCClient.cpp 2008-06-04
22:32:03.963728115 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "net/OSCClient.h"
- #include "net/OSCProtocol.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCController.cpp
psychosynth-0.1.1/libpsynth/net/OSCController.cpp
---- psychosynth-0.1.1.orig/libpsynth/net/OSCController.cpp 2008-03-17
02:00:05.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/net/OSCController.cpp 2008-06-04
22:32:03.963728115 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "net/OSCController.h"
- #include "net/OSCProtocol.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/net/OSCServer.cpp
psychosynth-0.1.1/libpsynth/net/OSCServer.cpp
---- psychosynth-0.1.1.orig/libpsynth/net/OSCServer.cpp 2008-04-04
19:46:52.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/net/OSCServer.cpp 2008-06-04
22:32:03.963728115 +0800
-@@ -20,6 +20,9 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <algorithm>
-+#include <cstdio>
- #include "net/OSCServer.h"
- #include "net/OSCProtocol.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/Object.cpp
psychosynth-0.1.1/libpsynth/object/Object.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/Object.cpp 2008-04-01
23:12:34.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/Object.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "common/Deleter.h"
- #include "object/Object.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioMixer.cpp
psychosynth-0.1.1/libpsynth/object/ObjectAudioMixer.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioMixer.cpp
2008-03-31 07:59:13.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectAudioMixer.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectAudioMixer.h"
-
- namespace psynth
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioNoise.cpp
psychosynth-0.1.1/libpsynth/object/ObjectAudioNoise.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioNoise.cpp
2008-04-05 00:40:25.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectAudioNoise.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectAudioNoise.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioOscillator.cpp
psychosynth-0.1.1/libpsynth/object/ObjectAudioOscillator.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectAudioOscillator.cpp
2008-03-28 00:35:13.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectAudioOscillator.cpp
2008-06-04 22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectAudioOscillator.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectControlMixer.cpp
psychosynth-0.1.1/libpsynth/object/ObjectControlMixer.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectControlMixer.cpp
2008-03-31 07:59:43.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectControlMixer.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectControlMixer.h"
-
- namespace psynth
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectControlNoise.cpp
psychosynth-0.1.1/libpsynth/object/ObjectControlNoise.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectControlNoise.cpp
2008-04-05 00:40:07.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectControlNoise.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectControlNoise.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectDelay.cpp
psychosynth-0.1.1/libpsynth/object/ObjectDelay.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectDelay.cpp 2008-04-06
03:23:49.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectDelay.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectDelay.h"
- #include "object/KnownObjects.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectEcho.cpp
psychosynth-0.1.1/libpsynth/object/ObjectEcho.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectEcho.cpp 2008-04-05
23:04:11.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectEcho.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectEcho.h"
- #include "object/KnownObjects.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectFactoryManager.cpp
psychosynth-0.1.1/libpsynth/object/ObjectFactoryManager.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectFactoryManager.cpp
2008-03-17 04:03:36.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectFactoryManager.cpp
2008-06-04 22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectFactoryManager.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectFilter.cpp
psychosynth-0.1.1/libpsynth/object/ObjectFilter.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectFilter.cpp 2008-03-22
08:54:05.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectFilter.cpp 2008-06-04
22:32:03.967061360 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectFilter.h"
- #include "object/KnownObjects.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectLFO.cpp
psychosynth-0.1.1/libpsynth/object/ObjectLFO.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectLFO.cpp 2008-03-28
00:35:35.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectLFO.cpp 2008-06-04
22:32:03.970394745 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/ObjectLFO.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectMixer.cpp
psychosynth-0.1.1/libpsynth/object/ObjectMixer.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectMixer.cpp 2008-04-06
23:50:23.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectMixer.cpp 2008-06-04
22:32:03.970394745 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "object/KnownObjects.h"
- #include "object/ObjectMixer.h"
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectNoise.cpp
psychosynth-0.1.1/libpsynth/object/ObjectNoise.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectNoise.cpp 2008-04-05
01:45:13.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectNoise.cpp 2008-06-04
22:32:03.970394745 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
-+#include <climits>
- #include "object/ObjectNoise.h"
-
- namespace psynth
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectOscillator.cpp
psychosynth-0.1.1/libpsynth/object/ObjectOscillator.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectOscillator.cpp
2008-04-03 16:35:12.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectOscillator.cpp 2008-06-04
22:32:03.970394745 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include <iostream>
-
- #include "object/KnownObjects.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/object/ObjectStepSeq.cpp
psychosynth-0.1.1/libpsynth/object/ObjectStepSeq.cpp
---- psychosynth-0.1.1.orig/libpsynth/object/ObjectStepSeq.cpp 2008-04-05
01:52:26.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/object/ObjectStepSeq.cpp 2008-06-04
22:32:03.970394745 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "common/Misc.h"
- #include "object/KnownObjects.h"
- #include "object/EnvelopeMulti.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/Director.cpp
psychosynth-0.1.1/libpsynth/psynth/Director.cpp
---- psychosynth-0.1.1.orig/libpsynth/psynth/Director.cpp 2008-04-05
23:06:35.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/psynth/Director.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <algorithm>
- #include "psynth/Director.h"
- #include "psynth/Defaults.h"
- #include "table/PatcherDynamic.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/FileManagerDirector.cpp
psychosynth-0.1.1/libpsynth/psynth/FileManagerDirector.cpp
---- psychosynth-0.1.1.orig/libpsynth/psynth/FileManagerDirector.cpp
2008-04-03 01:38:21.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/psynth/FileManagerDirector.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include "version.h"
- #include "common/FileManager.h"
- #include "psynth/FileManagerDirector.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/psynth/PsychosynthApp.cpp
psychosynth-0.1.1/libpsynth/psynth/PsychosynthApp.cpp
---- psychosynth-0.1.1.orig/libpsynth/psynth/PsychosynthApp.cpp 2008-04-04
07:06:35.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/psynth/PsychosynthApp.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <algorithm>
- #include <libpsynth/version.h>
- #include <sys/stat.h>
-
-diff -Naur psychosynth-0.1.1.orig/libpsynth/table/Patcher.cpp
psychosynth-0.1.1/libpsynth/table/Patcher.cpp
---- psychosynth-0.1.1.orig/libpsynth/table/Patcher.cpp 2008-02-25
07:45:32.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/table/Patcher.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "table/Patcher.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/libpsynth/table/PatcherDynamic.cpp
psychosynth-0.1.1/libpsynth/table/PatcherDynamic.cpp
---- psychosynth-0.1.1.orig/libpsynth/table/PatcherDynamic.cpp 2008-04-06
02:49:20.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/table/PatcherDynamic.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "table/PatcherDynamic.h"
-
- #include "object/Object.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/table/Table.cpp
psychosynth-0.1.1/libpsynth/table/Table.cpp
---- psychosynth-0.1.1.orig/libpsynth/table/Table.cpp 2008-04-06
23:52:23.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/table/Table.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "table/Table.h"
- #include "output/OutputAlsa.h"
- #include "output/OutputOss.h"
-diff -Naur psychosynth-0.1.1.orig/libpsynth/table/TableObjectCreator.cpp
psychosynth-0.1.1/libpsynth/table/TableObjectCreator.cpp
---- psychosynth-0.1.1.orig/libpsynth/table/TableObjectCreator.cpp
2008-03-17 03:54:29.000000000 +0800
-+++ psychosynth-0.1.1/libpsynth/table/TableObjectCreator.cpp 2008-06-04
22:32:03.973727640 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "table/TableObjectCreator.h"
- #include "table/Table.h"
-
-diff -Naur psychosynth-0.1.1.orig/src/cli/PsychosynthCli.cpp
psychosynth-0.1.1/src/cli/PsychosynthCli.cpp
---- psychosynth-0.1.1.orig/src/cli/PsychosynthCli.cpp 2008-02-28
00:51:09.000000000 +0800
-+++ psychosynth-0.1.1/src/cli/PsychosynthCli.cpp 2008-06-04
22:32:03.977060955 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include <config.h>
-
- #include <libpsynth/net/OSCClient.h>
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/ConfWindow.cpp
psychosynth-0.1.1/src/gui3d/ConfWindow.cpp
---- psychosynth-0.1.1.orig/src/gui3d/ConfWindow.cpp 2008-04-07
01:29:39.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/ConfWindow.cpp 2008-06-04 22:32:03.977060955
+0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include "gui3d/ConfWindow.h"
-
- using namespace psynth;
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/DefaultSelectorPopulator.cpp
psychosynth-0.1.1/src/gui3d/DefaultSelectorPopulator.cpp
---- psychosynth-0.1.1.orig/src/gui3d/DefaultSelectorPopulator.cpp
2008-04-07 07:00:05.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/DefaultSelectorPopulator.cpp 2008-06-04
22:32:03.980394759 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <algorithm>
- #include <list>
- #include <string>
- #include <dirent.h>
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/ElementManager.cpp
psychosynth-0.1.1/src/gui3d/ElementManager.cpp
---- psychosynth-0.1.1.orig/src/gui3d/ElementManager.cpp 2008-04-07
01:31:47.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/ElementManager.cpp 2008-06-04
22:32:03.980394759 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include <CEGUI/CEGUI.h>
-
- #include "gui3d/ElementManager.h"
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/ElementProperties.cpp
psychosynth-0.1.1/src/gui3d/ElementProperties.cpp
---- psychosynth-0.1.1.orig/src/gui3d/ElementProperties.cpp 2008-03-31
07:43:03.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/ElementProperties.cpp 2008-06-04
22:32:03.980394759 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "gui3d/ElementProperties.h"
-
- #define ELEMENT_EDITOR_WIDTH 200.0f
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/NetworkWindow.cpp
psychosynth-0.1.1/src/gui3d/NetworkWindow.cpp
---- psychosynth-0.1.1.orig/src/gui3d/NetworkWindow.cpp 2008-02-27
00:35:59.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/NetworkWindow.cpp 2008-06-04
22:32:03.980394759 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "gui3d/NetworkWindow.h"
- #include <libpsynth/common/Misc.h>
-
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/Psychosynth3D.cpp
psychosynth-0.1.1/src/gui3d/Psychosynth3D.cpp
---- psychosynth-0.1.1.orig/src/gui3d/Psychosynth3D.cpp 2008-04-07
07:00:58.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/Psychosynth3D.cpp 2008-06-04
22:32:03.983728213 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <cstdlib>
- #include <config.h>
-
- #include <libpsynth/version.h>
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/RecordWindow.cpp
psychosynth-0.1.1/src/gui3d/RecordWindow.cpp
---- psychosynth-0.1.1.orig/src/gui3d/RecordWindow.cpp 2008-03-19
21:31:53.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/RecordWindow.cpp 2008-06-04
22:32:03.983728213 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include <string>
-
- #include "gui3d/RecordWindow.h"
-diff -Naur psychosynth-0.1.1.orig/src/gui3d/SelectorWindow.cpp
psychosynth-0.1.1/src/gui3d/SelectorWindow.cpp
---- psychosynth-0.1.1.orig/src/gui3d/SelectorWindow.cpp 2008-04-05
23:18:16.000000000 +0800
-+++ psychosynth-0.1.1/src/gui3d/SelectorWindow.cpp 2008-06-04
22:32:03.983728213 +0800
-@@ -20,6 +20,7 @@
- * *
- ***************************************************************************/
-
-+#include <algorithm>
- #include "gui3d/SelectorWindow.h"
-
- using namespace std;
-diff -Naur psychosynth-0.1.1.orig/src/psynth.cpp
psychosynth-0.1.1/src/psynth.cpp
---- psychosynth-0.1.1.orig/src/psynth.cpp 2008-02-27 01:19:19.000000000
+0800
-+++ psychosynth-0.1.1/src/psynth.cpp 2008-06-04 22:32:03.983728213 +0800
-@@ -20,6 +20,8 @@
- * *
- ***************************************************************************/
-
-+#include <cstring>
-+#include <algorithm>
- #include "cli/PsychosynthCli.h"
-
- int main(int argc, const char *argv[])
Deleted:
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.1.ebuild
2011-05-15 20:49:16 UTC (rev 1981)
+++ trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.1.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools
-
-RESTRICT="mirror"
-DESCRIPTION="Free software synthesizer inspired by the ideas of the Reactable"
-HOMEPAGE="http://www.psychosynth.com/";
-SRC_URI="http://forja.rediris.es/frs/download.php/707/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa jack psynth3d oss sndfile vorbis xml osc"
-
-DEPEND="osc? ( >=media-libs/liblo-0.24 )
- >=media-libs/libsoundtouch-1.3.1-r1
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
- psynth3d? ( >=dev-games/cegui-0.5.0b-r3
- >=dev-games/ois-1.2.0
- >=dev-games/ogre-1.4.7 )
- sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
- vorbis? ( >=media-libs/libvorbis-1.2.0 )
- xml? ( >=dev-libs/libxml2-2.6.31 )"
-
-
-pkg_setup() {
- if use psynth3d; then
- if ! built_with_use dev-games/ogre cegui devil; then
- eerror "You need to compile dev-games/ogre with"
- eerror "USE=\"cegui devil\"!"
- die "Deps missing"
- fi
- fi
-}
-
-src_unpack() {
- unpack ${A}
- # fix up soundtouch checks in configure.ac
- sed -i -e "s/\[\ libSoundTouch\ \]/\[\ soundtouch-1.0\ \]/" \
- "${S}/configure.ac" || die "sed of configure.ac failed"
- cd "${S}"
-
- # gcc-4.3
- epatch "${FILESDIR}/${P}-gcc43.patch"
-
- # AT_M4DIR="." fails too, so...
- sed -i -e 's:-I m4:-I .:' Makefile.in Makefile.am || die
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable alsa) \
- $(use_enable jack) \
- $(use_enable psynth3d) \
- $(use_enable sndfile) \
- $(use_enable vorbis) \
- $(use_enable xml) \
- $(use_enable oss) || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
-}
-
Deleted:
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.5.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.5.ebuild
2011-05-15 20:49:16 UTC (rev 1981)
+++ trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.5.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-RESTRICT="mirror"
-DESCRIPTION="Free software synthesizer inspired by the ideas of the Reactable"
-HOMEPAGE="http://www.psychosynth.com/";
-SRC_URI="ftp://ftp.gnu.org/gnu/psychosynth/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa jack +psynth3d oss sndfile vorbis xml osc"
-
-DEPEND="osc? ( >=media-libs/liblo-0.24 )
- >=media-libs/libsoundtouch-1.3.1-r1
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
- jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
- psynth3d? ( >=dev-games/cegui-0.5.0b-r3
- >=dev-games/ois-1.2.0
- >=dev-games/ogre-1.4.7 )
- sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
- vorbis? ( >=media-libs/libvorbis-1.2.0 )
- xml? ( >=dev-libs/libxml2-2.6.31 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if use psynth3d; then
- if ! built_with_use dev-games/ogre cegui devil; then
- eerror "You need to compile dev-games/ogre with"
- eerror "USE=\"cegui devil\"!"
- die "Deps missing"
- fi
- fi
-}
-
-src_compile() {
- econf $(use_enable alsa) \
- $(use_enable jack) \
- $(use_enable psynth3d) \
- $(use_enable sndfile) \
- $(use_enable vorbis) \
- $(use_enable xml libxml) \
- $(use_enable oss) || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
-}
-
Added: trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.6.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.6.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.1.6.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit autotools-utils
+
+if [ "${PV}" == "9999" ]; then
+ inherit bzr
+ EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/psychosynth/trunk"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://ftp.gnu.org/gnu/psychosynth/${P}.tar.gz";
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="mirror"
+fi
+
+DESCRIPTION="Free software synthesizer inspired by the ideas of the Reactable"
+HOMEPAGE="http://www.psychosynth.com/";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa jack osc oss +psynth3d sndfile static-libs test vorbis xml"
+
+RDEPEND=">=dev-libs/boost-1.39
+ >=dev-libs/libsigc++-2.0:2
+ >=media-libs/libsoundtouch-1.3.1-r1
+ >=x11-libs/gtk+-2:2
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+ osc? ( >=media-libs/liblo-0.24 )
+ psynth3d? ( >=dev-games/cegui-0.5.0b-r3
+ >=dev-games/ois-1.2.0
+ >=dev-games/ogre-1.4.7[cegui,devil] )
+ sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+ vorbis? ( >=media-libs/libvorbis-1.2.0 )
+ xml? ( >=dev-libs/libxml2-2.6.31 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(AUTHORS ChangeLog)
+
+src_configure() {
+ local myeconfargs=(
+ --disable-dependency-tracking
+ $(use_enable alsa)
+ $(use_enable jack)
+ $(use_enable oss)
+ $(use_enable psynth3d)
+ $(use_enable sndfile)
+ $(use_enable vorbis)
+ $(use_enable xml libxml)
+ $(use_with test boost-unit-test-framework)
+ )
+ autotools-utils_src_configure
+}
Added: trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.2.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.2.0.ebuild
(rev 0)
+++ trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-0.2.0.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit autotools-utils
+
+if [ "${PV}" == "9999" ]; then
+ inherit bzr
+ EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/psychosynth/trunk"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://ftp.gnu.org/gnu/psychosynth/${P}.tar.gz";
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="mirror"
+fi
+
+DESCRIPTION="Free software synthesizer inspired by the ideas of the Reactable"
+HOMEPAGE="http://www.psychosynth.com/";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="alsa jack osc oss +psynth3d sndfile static-libs test vorbis xml"
+
+RDEPEND=">=dev-libs/boost-1.39
+ >=dev-libs/libsigc++-2.0:2
+ >=media-libs/libsoundtouch-1.3.1-r1
+ >=x11-libs/gtk+-2:2
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+ osc? ( >=media-libs/liblo-0.24 )
+ psynth3d? ( >=dev-games/cegui-0.5.0b-r3
+ >=dev-games/ois-1.2.0
+ >=dev-games/ogre-1.4.7[cegui,devil] )
+ sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+ vorbis? ( >=media-libs/libvorbis-1.2.0 )
+ xml? ( >=dev-libs/libxml2-2.6.31 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(AUTHORS ChangeLog)
+
+src_configure() {
+ local myeconfargs=(
+ --disable-dependency-tracking
+ $(use_enable alsa)
+ $(use_enable jack)
+ $(use_enable oss)
+ $(use_enable psynth3d)
+ $(use_enable sndfile)
+ $(use_enable vorbis)
+ $(use_enable xml libxml)
+ $(use_with test boost-unit-test-framework)
+ )
+ autotools-utils_src_configure
+}
Modified:
trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-9999.ebuild
2011-05-15 20:49:16 UTC (rev 1981)
+++ trunk/overlays/proaudio/media-sound/psychosynth/psychosynth-9999.ebuild
2011-05-21 00:38:16 UTC (rev 1982)
@@ -1,73 +1,58 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=1
+EAPI=2
+inherit autotools-utils
-inherit autotools bzr
+if [ "${PV}" == "9999" ]; then
+ inherit bzr
+ EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/psychosynth/trunk"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://ftp.gnu.org/gnu/psychosynth/${P}.tar.gz";
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="mirror"
+fi
DESCRIPTION="Free software synthesizer inspired by the ideas of the Reactable"
HOMEPAGE="http://www.psychosynth.com/";
-EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/psychosynth/trunk";
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa jack +psynth3d oss sndfile vorbis xml osc"
+IUSE="alsa jack osc oss +psynth3d sndfile static-libs test vorbis xml"
-DEPEND="osc? ( >=media-libs/liblo-0.24 )
+RDEPEND=">=dev-libs/boost-1.39
+ >=dev-libs/libsigc++-2.0:2
>=media-libs/libsoundtouch-1.3.1-r1
- >=dev-libs/boost-1.35.0-r2
- >=dev-libs/libsigc++-2.2.3
+ >=x11-libs/gtk+-2:2
alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+ osc? ( >=media-libs/liblo-0.24 )
psynth3d? ( >=dev-games/cegui-0.5.0b-r3
>=dev-games/ois-1.2.0
- >=dev-games/ogre-1.4.9 )
+ >=dev-games/ogre-1.4.7[cegui,devil] )
sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
vorbis? ( >=media-libs/libvorbis-1.2.0 )
xml? ( >=dev-libs/libxml2-2.6.31 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
-RDEPEND="${DEPEND}"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(AUTHORS ChangeLog)
-pkg_setup() {
- if use psynth3d; then
- if ! built_with_use dev-games/ogre cegui devil; then
- eerror "You need to compile dev-games/ogre with"
- eerror "USE=\"cegui devil\"!"
- die "Deps missing"
- fi
- fi
- if ! use alsa && ! use jack && ! use oss; then
- eerror "You need to enable either alsa, jack or oss USE flag,
or"
- eerror "psychosynth will not compile"
- die "No audio system enabled"
- fi
+src_configure() {
+ local myeconfargs=(
+ --disable-dependency-tracking
+ $(use_enable alsa)
+ $(use_enable jack)
+ $(use_enable oss)
+ $(use_enable psynth3d)
+ $(use_enable sndfile)
+ $(use_enable vorbis)
+ $(use_enable xml libxml)
+ $(use_with test boost-unit-test-framework)
+ )
+ autotools-utils_src_configure
}
-
-src_unpack() {
- bzr_src_unpack
- cd "${S}"
-
- # stop install failing on ChangeLog?!
- sed -i -e '/noinst_DATA = ChangeLog/d' \
- "${S}/Makefile.am" || die "sed of Makefile.am failed"
-
- eautoreconf
-}
-
-src_compile() {
- econf $(use_enable alsa) \
- $(use_enable jack) \
- $(use_enable psynth3d) \
- $(use_enable sndfile) \
- $(use_enable vorbis) \
- $(use_enable xml libxml) \
- $(use_enable oss) || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "install failed"
-}
-
