summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEldad Zack <eldad@gentoo.org>2006-05-13 14:36:14 +0000
committerEldad Zack <eldad@gentoo.org>2006-05-13 14:36:14 +0000
commit41496b1730413214b99deff66706f35daca316dc (patch)
tree102399904e717d21d2c95b07ceb8ed6e7ef1418c /media-sound/ardour
parentPurge old version and unneeded aux files. (diff)
downloadgentoo-2-41496b1730413214b99deff66706f35daca316dc.tar.gz
gentoo-2-41496b1730413214b99deff66706f35daca316dc.tar.bz2
gentoo-2-41496b1730413214b99deff66706f35daca316dc.zip
Purge old version and unneeded aux files.
(Portage version: 2.1_pre10-r5) (Signed Manifest commit)
Diffstat (limited to 'media-sound/ardour')
-rw-r--r--media-sound/ardour/Manifest40
-rw-r--r--media-sound/ardour/ardour-0.9_beta30.ebuild79
-rw-r--r--media-sound/ardour/files/ardour-gcc34.patch230
-rw-r--r--media-sound/ardour/files/ardour.aclocal.patch228
-rw-r--r--media-sound/ardour/files/digest-ardour-0.9_beta303
5 files changed, 12 insertions, 568 deletions
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index eb4095249c87..da61a95e9ad9 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,42 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX ardour-gcc34.patch 9562 RMD160 66ade7ab478bdbf87a235778809e385f52f5bd21 SHA1 bb65ce811c69f5a0a6f112ccca69042849a3db89 SHA256 4a4dbabe6ba42bf2e6f31e534d5c082cc085350dcf11602480f8286ad222d79d size 9562
-MD5 e016dfbfc8e85547954395c455b04e61 files/ardour-gcc34.patch 9562
-RMD160 66ade7ab478bdbf87a235778809e385f52f5bd21 files/ardour-gcc34.patch 9562
-SHA256 4a4dbabe6ba42bf2e6f31e534d5c082cc085350dcf11602480f8286ad222d79d files/ardour-gcc34.patch 9562
-AUX ardour.aclocal.patch 8594 RMD160 876b4535bc8e175e39d37b8ffb93192cab31c28e SHA1 02edef1cc71be8f17c52449fcf7e20572ade5011 SHA256 cc7f66c0286e31ac40c8b21c6e165dac67fe8275217dd0c5fa77f1d321f06a39 size 8594
-MD5 11e862600d9c027d453d23dc2bf8763d files/ardour.aclocal.patch 8594
-RMD160 876b4535bc8e175e39d37b8ffb93192cab31c28e files/ardour.aclocal.patch 8594
-SHA256 cc7f66c0286e31ac40c8b21c6e165dac67fe8275217dd0c5fa77f1d321f06a39 files/ardour.aclocal.patch 8594
-DIST ardour-0.99.2.tar.bz2 1315985 RMD160 3748feca9cc893f108228e8efb4c5486033f54cb SHA256 e74ef15098b3a1f9b17d7384fdee99729d5bec2f61ec52ae47f602a3fb7aa817 size 1315985
-DIST ardour-0.9beta30.tar.bz2 1259122 RMD160 796b8d53ed60621e21f5e61d00a81e600af17680 SHA256 fb95e24b93d4bdefca9382db1d6e64e26a52403447dd98e428d63c78a2e84fd4 size 1259122
+DIST ardour-0.99.2.tar.bz2 1315985 size 1315985
EBUILD ardour-0.99.2.ebuild 2294 RMD160 6d5a3df124ba57b35f1ade54552c41cf3cdb479e SHA1 8efdba205e0cc0051a3bb52654ea0b895fcbb871 SHA256 373df4d59434e21cadad3051e61caf79f3ddb3d6f087f2c767d8b0a49a7db83a size 2294
MD5 8d0a130fc6cac1141b4ba8364b5c4bd2 ardour-0.99.2.ebuild 2294
RMD160 6d5a3df124ba57b35f1ade54552c41cf3cdb479e ardour-0.99.2.ebuild 2294
SHA256 373df4d59434e21cadad3051e61caf79f3ddb3d6f087f2c767d8b0a49a7db83a ardour-0.99.2.ebuild 2294
-EBUILD ardour-0.9_beta30.ebuild 2118 RMD160 c21544044ad7e92449bb92fdfa5e2ba2f4ca6c7d SHA1 506a1900f75a12deb9906c05f1a686047ebeab29 SHA256 8be5aa23d3633521c881cdf35f28e29070761cb2716237a3d6f41bf36204dbfb size 2118
-MD5 b8de9d208b3fa4445e031e06229a0ae2 ardour-0.9_beta30.ebuild 2118
-RMD160 c21544044ad7e92449bb92fdfa5e2ba2f4ca6c7d ardour-0.9_beta30.ebuild 2118
-SHA256 8be5aa23d3633521c881cdf35f28e29070761cb2716237a3d6f41bf36204dbfb ardour-0.9_beta30.ebuild 2118
-MISC ChangeLog 8447 RMD160 19e207e2171bb30454c69368bc764fde5a5d0e0c SHA1 2102f137b9026e37eba8ddd762bbaa973bbe7123 SHA256 bed78f1839a44d6862103139dde4d4bd00d2095d387f66ad798fb0f66279289f size 8447
-MD5 ab1e54f2705b69b4237740b42986ae21 ChangeLog 8447
-RMD160 19e207e2171bb30454c69368bc764fde5a5d0e0c ChangeLog 8447
-SHA256 bed78f1839a44d6862103139dde4d4bd00d2095d387f66ad798fb0f66279289f ChangeLog 8447
+MISC ChangeLog 8620 RMD160 ec3aa68da68ac347e8d1003ed0af5f3147641fa8 SHA1 ea9ec341b974983d6770d5696260cdc75ac9d770 SHA256 3e4abf24f547831fa14b7401052961bbebcbe1c066ebd58eb5c882318d63ef23 size 8620
+MD5 9116f8a5c08b7a64368660f3ea4e1aab ChangeLog 8620
+RMD160 ec3aa68da68ac347e8d1003ed0af5f3147641fa8 ChangeLog 8620
+SHA256 3e4abf24f547831fa14b7401052961bbebcbe1c066ebd58eb5c882318d63ef23 ChangeLog 8620
MISC metadata.xml 243 RMD160 19545b1637c60d6b8eb2d1468f375b98f6cc2fd3 SHA1 7bda6df19b35ec1526ee79a2b3695f95b46d7a82 SHA256 752170bbf0b4afbcc6e29f01decc5a58f7427732dad1ecb1097e8fab394bb3fa size 243
MD5 60299dd26385caa83f5b1b51b507a9d8 metadata.xml 243
RMD160 19545b1637c60d6b8eb2d1468f375b98f6cc2fd3 metadata.xml 243
SHA256 752170bbf0b4afbcc6e29f01decc5a58f7427732dad1ecb1097e8fab394bb3fa metadata.xml 243
-MD5 7f35f34f809b48f1cd8d1eaf4682c839 files/digest-ardour-0.99.2 247
-RMD160 06d0bfe32c7759efd86b7caf310b2918cdb74b38 files/digest-ardour-0.99.2 247
-SHA256 aa54b7842628aaa700f3a84666317bdee6097c8c34cb6ea376106530bcbc5446 files/digest-ardour-0.99.2 247
-MD5 e3a706760523f40ee6ebea9028441cf5 files/digest-ardour-0.9_beta30 256
-RMD160 a5d815ec5832517c9c62035b51d993b2e8b2286e files/digest-ardour-0.9_beta30 256
-SHA256 3acc783143d5fe7b4c19af499584ce7a6bf55d92cc1c88117c3c6371a5545843 files/digest-ardour-0.9_beta30 256
+MD5 2238c69eecfda1c0f071cc1ca3ff6190 files/digest-ardour-0.99.2 67
+RMD160 2ca7c1e58c76a341d16329f92798af19dc9c8f1a files/digest-ardour-0.99.2 67
+SHA256 ac902a066c9c92b91e3f2768af90d3d6949ab040b01486fc2585e6f44d8863f8 files/digest-ardour-0.99.2 67
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
-iD8DBQFEUWgKW78445TWHXcRAprHAJ4x/6nK51Dyih7l9xDTu+Ul813q9gCbBFVm
-mEka0sNfRwpbDqxNEplkH/8=
-=dTDB
+iD8DBQFEZe7YT+MN7JbqCpMRAupvAJ44SkJVeEhmRUvs84E20l+bUI3wswCeL9cD
+YSgt7ENxTv5ko1GcCQEWkH4=
+=paeN
-----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-0.9_beta30.ebuild b/media-sound/ardour/ardour-0.9_beta30.ebuild
deleted file mode 100644
index aa948780ebf0..000000000000
--- a/media-sound/ardour/ardour-0.9_beta30.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-0.9_beta30.ebuild,v 1.4 2006/04/03 17:30:54 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="http://ardour.org/files/releases/${P/_/}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="nls debug sse altivec"
-
-# From beta30 release notes:
-# plugin latency compensation now working correctly (we believe)
-# This really requires JACK 0.100.0 or above to work
-# properly, but even without that, they result in notable improvements
-# in the way Ardour aligns newly recorded material.
-#
-# As media-sound/jack-audio-connection-kit-0.100.0 is still -arch and it is not required for beta30
-# only suggested, RDEPEND needs to be updated as media-sound/jack-audio-connection-kit-0.100.0 gets
-# into ~arch. (2005 Sep 14 eldad)
-
-RDEPEND="dev-util/pkgconfig
- >=media-libs/liblrdf-0.3.6
- >=media-libs/raptor-1.2.0
- >=media-sound/jack-audio-connection-kit-0.98.1
- =dev-libs/glib-1.2*
- =x11-libs/gtk+-1.2*
- >=media-libs/libsndfile-1.0.4
- sys-libs/gdbm
- >=media-libs/ladspa-sdk-1.12
- >=media-libs/libsamplerate-0.0.14
- >=dev-libs/libxml2-2.5.7
- >=media-libs/libart_lgpl-2.3.16"
-
-DEPEND="${RDEPEND}
- sys-devel/autoconf
- sys-devel/automake
- dev-util/pkgconfig
- >=dev-util/scons-0.96.1
- nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_compile() {
- # bug 99664
- cd ${S}/libs/gtkmm
- chmod a+x autogen.sh && ./autogen.sh || die "autogen failed"
- econf || die "configure failed"
-
- # Required for scons to "see" intermediate install location
- mkdir -p ${D}
-
- use altivec && ALTIVEC=1 || ALTIVEC=0
- use debug && ARDOUR_DEBUG=1 || ARDOUR_DEBUG=0
- use nls && NLS=1 || NLS=0
- use sse && SSE=1 || SSE=0
-
- cd ${S}
- scons \
- ALTIVEC=${ALTIVEC} \
- DEBUG=${ARDOUR_DEBUG} \
- DESTDIR=${D} \
- NLS=${NLS} \
- PREFIX=/usr \
- USE_SSE_EVERYWHERE=${SSE} \
- KSI=0 \
- -j2
-}
-
-src_install() {
- scons install || die "make install failed"
-
- dodoc DOCUMENTATION/*
-}
diff --git a/media-sound/ardour/files/ardour-gcc34.patch b/media-sound/ardour/files/ardour-gcc34.patch
deleted file mode 100644
index 5fe73180c1ce..000000000000
--- a/media-sound/ardour/files/ardour-gcc34.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/ardour_dialog.h ardour-0.9beta17.1/gtk_ardour/ardour_dialog.h
---- ardour-0.9beta17.1.orig/gtk_ardour/ardour_dialog.h 2004-07-11 16:39:53.000864856 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/ardour_dialog.h 2004-07-11 16:40:00.998649008 -0400
-@@ -48,7 +48,6 @@
- void set_keyboard_input (bool yn);
- int run_status();
-
-- protected:
- gint enter_notify_event_impl (GdkEventCrossing*);
- gint leave_notify_event_impl (GdkEventCrossing*);
- gint unmap_event_impl (GdkEventAny *);
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/audio_time_axis.h ardour-0.9beta17.1/gtk_ardour/audio_time_axis.h
---- ardour-0.9beta17.1.orig/gtk_ardour/audio_time_axis.h 2004-07-11 16:39:53.013862880 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/audio_time_axis.h 2004-07-11 16:40:00.999648856 -0400
-@@ -252,7 +252,7 @@
- void show_all_automation ();
- void show_existing_automation ();
-
-- friend struct RedirectAutomationNode {
-+ struct RedirectAutomationNode {
- unsigned long what;
- Gtk::CheckMenuItem* menu_item;
- AutomationTimeAxisView* view;
-@@ -264,7 +264,7 @@
- ~RedirectAutomationNode ();
- };
-
-- friend struct RedirectAutomationInfo {
-+ struct RedirectAutomationInfo {
- ARDOUR::Redirect* redirect;
- bool valid;
- Gtk::Menu* menu;
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/editor_ops.cc ardour-0.9beta17.1/gtk_ardour/editor_ops.cc
---- ardour-0.9beta17.1.orig/gtk_ardour/editor_ops.cc 2004-07-11 16:39:52.999865008 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/editor_ops.cc 2004-07-11 16:40:01.001648552 -0400
-@@ -2814,7 +2814,6 @@
- void
- Editor::paste_named_selection (float times)
- {
-- using Gtk::CList_Helpers;
- Gtk::CList_Helpers::SelectionList& selected = named_selection_display.selection();
- TrackSelection::iterator i;
-
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/editor_region_list.cc ardour-0.9beta17.1/gtk_ardour/editor_region_list.cc
---- ardour-0.9beta17.1.orig/gtk_ardour/editor_region_list.cc 2004-07-11 16:39:52.999865008 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/editor_region_list.cc 2004-07-11 16:40:01.002648400 -0400
-@@ -195,7 +195,6 @@
- void
- Editor::add_audio_region_to_region_display (AudioRegion *region)
- {
-- using Gtk::CTree_Helpers;
-
- vector<const char*> item;
- Gtk::CTree_Helpers::RowList::iterator i;
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/mixer_strip.cc ardour-0.9beta17.1/gtk_ardour/mixer_strip.cc
---- ardour-0.9beta17.1.orig/gtk_ardour/mixer_strip.cc 2004-07-11 16:39:53.016862424 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/mixer_strip.cc 2004-07-11 16:40:01.005647944 -0400
-@@ -1829,7 +1829,6 @@
- gint
- MixerStrip::compute_redirect_sort_keys ()
- {
-- using Gtk::CList_Helpers;
- CList_Helpers::RowList::iterator i;
- unsigned long sort_key;
-
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/route_params_ui.cc ardour-0.9beta17.1/gtk_ardour/route_params_ui.cc
---- ardour-0.9beta17.1.orig/gtk_ardour/route_params_ui.cc 2004-07-11 16:39:53.008863640 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/route_params_ui.cc 2004-07-11 16:40:01.007647640 -0400
-@@ -1037,7 +1037,6 @@
- gint
- RouteParams_UI::compute_redirect_sort_keys ()
- {
-- using Gtk::CList_Helpers;
- CList_Helpers::RowList::iterator i;
- unsigned long sort_key;
-
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/route_ui.h ardour-0.9beta17.1/gtk_ardour/route_ui.h
---- ardour-0.9beta17.1.orig/gtk_ardour/route_ui.h 2004-07-11 16:39:53.002864552 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/route_ui.h 2004-07-11 16:40:01.007647640 -0400
-@@ -48,7 +48,6 @@
-
- string name() const;
-
-- protected:
- ARDOUR::Route& _route;
-
-
-diff -ur ardour-0.9beta17.1.orig/gtk_ardour/visual_time_axis.h ardour-0.9beta17.1/gtk_ardour/visual_time_axis.h
---- ardour-0.9beta17.1.orig/gtk_ardour/visual_time_axis.h 2004-07-11 16:39:52.977868352 -0400
-+++ ardour-0.9beta17.1/gtk_ardour/visual_time_axis.h 2004-07-11 16:40:01.008647488 -0400
-@@ -135,7 +135,6 @@
- */
- //SigC::Signal2<void,std::string,void*> VisualTimeAxisRemoved ;
-
-- protected:
- //---------------------------------------------------------------------------------------//
- // Constructor / Desctructor
-
-diff -ur ardour-0.9beta17.1.orig/libs/ardour/ardour/tempo.h ardour-0.9beta17.1/libs/ardour/ardour/tempo.h
---- ardour-0.9beta17.1.orig/libs/ardour/ardour/tempo.h 2004-07-11 16:39:52.854887048 -0400
-+++ ardour-0.9beta17.1/libs/ardour/ardour/tempo.h 2004-07-11 16:40:01.010647184 -0400
-@@ -178,12 +178,12 @@
- };
-
- typedef vector<BBTPoint> BBTPointList;
--
-+#if 0
- template<class T> void apply_with_points (T& obj, void (T::*method)(BBTPointList&)) {
- LockMonitor lm (lock, __LINE__, __FILE__);
- (obj.*method)(bbt_points);
- }
--
-+#endif
-
- template<class T> void apply_with_metrics (T& obj, void (T::*method)(const Metrics&)) {
- LockMonitor lm (lock, __LINE__, __FILE__);
-diff -ur ardour-0.9beta17.1.orig/libs/gtkmm/src/build_sources/proxy.h.m4 ardour-0.9beta17.1/libs/gtkmm/src/build_sources/proxy.h.m4
---- ardour-0.9beta17.1.orig/libs/gtkmm/src/build_sources/proxy.h.m4 2004-07-11 16:39:52.783897840 -0400
-+++ ardour-0.9beta17.1/libs/gtkmm/src/build_sources/proxy.h.m4 2004-07-11 16:40:01.011647032 -0400
-@@ -167,6 +167,7 @@
- }
-
- public:
-+ using [ProxySignal]NUM($1)<LIST([R],1,ARG_TYPE($1),[$1],[Obj,gObj,index],1)>::obj;
- SlotType slot()
- {
- SigC::SlotData* tmp=manage(new SigC::SlotData());
-diff -ur ardour-0.9beta17.1.orig/libs/gtkmm/src/curve.gen_h ardour-0.9beta17.1/libs/gtkmm/src/curve.gen_h
---- ardour-0.9beta17.1.orig/libs/gtkmm/src/curve.gen_h 2004-07-11 16:39:52.799895408 -0400
-+++ ardour-0.9beta17.1/libs/gtkmm/src/curve.gen_h 2004-07-11 16:40:01.011647032 -0400
-@@ -136,6 +136,7 @@
- void gtk_curve_get_vector(GtkCurve*,int,gfloat*),
- void get_vector(int num,gfloat* data));
-
-+#if 0
- // For containers
- template <class Iterator>
- int get_vector(Iterator b,Iterator e) const
-@@ -150,6 +151,7 @@
- delete [] data;
- return i;
- };
-+#endif
-
- //void gtk_curve_set_vector(GtkCurve*,int,gfloat[]);
- //: Sets the vector of points on the curve.
-diff -ur ardour-0.9beta17.1.orig/libs/gtkmm/src/gtk--/base.h ardour-0.9beta17.1/libs/gtkmm/src/gtk--/base.h
---- ardour-0.9beta17.1.orig/libs/gtkmm/src/gtk--/base.h 2004-07-11 16:39:52.784897688 -0400
-+++ ardour-0.9beta17.1/libs/gtkmm/src/gtk--/base.h 2004-07-11 16:41:02.354321528 -0400
-@@ -482,7 +482,7 @@
- value_type operator*() const
- {
- if (node && node->data)
-- return Gtk::wrap(static_cast<impl*>((*node).data));
-+ return static_cast<value_type>( Gtk::wrap_auto((GtkObject*)static_cast<impl*>((*node).data)) );
- return 0;
- }
-
-diff -ur ardour-0.9beta17.1.orig/libs/gtkmmext/pix.cc ardour-0.9beta17.1/libs/gtkmmext/pix.cc
---- ardour-0.9beta17.1.orig/libs/gtkmmext/pix.cc 2004-07-11 16:39:52.901879904 -0400
-+++ ardour-0.9beta17.1/libs/gtkmmext/pix.cc 2004-07-11 16:40:01.012646880 -0400
-@@ -36,7 +36,7 @@
-
- namespace std
- {
-- struct less<string *> {
-+ template<> struct less<string *> {
- bool operator()(string *s1, string *s2) const {
- return *s1 < *s2;
- }
-diff -ur ardour-0.9beta17.1.orig/libs/pbd/pbd/stl_delete.h ardour-0.9beta17.1/libs/pbd/pbd/stl_delete.h
---- ardour-0.9beta17.1.orig/libs/pbd/pbd/stl_delete.h 2004-07-11 16:39:52.763900880 -0400
-+++ ardour-0.9beta17.1/libs/pbd/pbd/stl_delete.h 2004-07-11 16:40:01.013646728 -0400
-@@ -24,7 +24,7 @@
- /* To actually use any of these deletion functions, you need to
- first include the revelant container type header.
- */
--#if defined(_CPP_VECTOR) || defined(__SGI_STL_VECTOR)
-+#if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)
- template<class T> void vector_delete (std::vector<T *> *vec)
- {
- typename std::vector<T *>::iterator i;
-@@ -36,7 +36,7 @@
- }
- #endif // _CPP_VECTOR || __SGI_STL_VECTOR
-
--#if defined(_CPP_MAP) || defined(__SGI_STL_MAP)
-+#if defined(_CPP_MAP) || defined(_GLIBCXX_MAP) || defined(__SGI_STL_MAP)
- template<class K, class T> void map_delete (std::map<K, T *> *m)
- {
- typename std::map<K, T *>::iterator i;
-@@ -48,7 +48,7 @@
- }
- #endif // _CPP_MAP || __SGI_STL_MAP
-
--#if defined(_CPP_LIST) || defined(__SGI_STL_LIST)
-+#if defined(_CPP_LIST) || defined(_GLIBCXX_LIST) || defined(__SGI_STL_LIST)
- template<class T> void list_delete (std::list<T *> *l)
- {
- typename std::list<T *>::iterator i;
-@@ -61,7 +61,7 @@
- }
- #endif // _CPP_LIST || __SGI_STL_LIST
-
--#if defined(_CPP_SLIST) || defined(__SGI_STL_SLIST)
-+#if defined(_CPP_SLIST) || defined(_GLIBCXX_SLIST) || defined(__SGI_STL_SLIST)
- template<class T> void slist_delete (std::slist<T *> *l)
- {
- typename std::slist<T *>::iterator i;
-@@ -74,7 +74,7 @@
- }
- #endif // _CPP_SLIST || __SGI_STL_SLIST
-
--#if defined(_CPP_SET) || defined(__SGI_STL_SET)
-+#if defined(_CPP_SET) || defined(_GLIBCXX_SET) || defined(__SGI_STL_SET)
- template<class T> void set_delete (std::set<T *> *sset)
- {
- typename std::set<T *>::iterator i;
-diff -ur ardour-0.9beta17.1.orig/libs/sigc++/sigc++/macros/class_slot.h.m4 ardour-0.9beta17.1/libs/sigc++/sigc++/macros/class_slot.h.m4
---- ardour-0.9beta17.1.orig/libs/sigc++/sigc++/macros/class_slot.h.m4 2004-07-11 16:39:52.933875040 -0400
-+++ ardour-0.9beta17.1/libs/sigc++/sigc++/macros/class_slot.h.m4 2004-07-11 16:40:01.014646576 -0400
-@@ -77,7 +77,7 @@
- if (!obj) return 0;
- SlotData* tmp=manage(new SlotData());
- CallData &data=reinterpret_cast<CallData&>(tmp->data_);
-- data.callback=&callback;
-+ data.callback=&[ObjectSlot]NUM($1)_<LIST(R,1,ARG_TYPE($1),[$1],Obj,1)>::callback;
- data.obj=&obj;
- data.func=(Func)func;
- return tmp;
diff --git a/media-sound/ardour/files/ardour.aclocal.patch b/media-sound/ardour/files/ardour.aclocal.patch
deleted file mode 100644
index 72f7864b2860..000000000000
--- a/media-sound/ardour/files/ardour.aclocal.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -ru ardour-0.9beta18.3.orig/gtk_ardour/aclocal.m4 ardour-0.9beta18.3/gtk_ardour/aclocal.m4
---- ardour-0.9beta18.3.orig/gtk_ardour/aclocal.m4 2004-07-22 11:15:43.000000000 +0000
-+++ ardour-0.9beta18.3/gtk_ardour/aclocal.m4 2004-07-23 18:44:28.878403696 +0000
-@@ -2756,6 +2756,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -2770,7 +2772,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -2790,13 +2792,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-diff -ru ardour-0.9beta18.3.orig/libs/ardour/aclocal.m4 ardour-0.9beta18.3/libs/ardour/aclocal.m4
---- ardour-0.9beta18.3.orig/libs/ardour/aclocal.m4 2004-07-22 11:15:18.000000000 +0000
-+++ ardour-0.9beta18.3/libs/ardour/aclocal.m4 2004-07-23 18:59:16.276498680 +0000
-@@ -2756,6 +2756,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -2770,7 +2772,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -2790,13 +2792,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-diff -ru ardour-0.9beta18.3.orig/libs/gtkmmext/aclocal.m4 ardour-0.9beta18.3/libs/gtkmmext/aclocal.m4
---- ardour-0.9beta18.3.orig/libs/gtkmmext/aclocal.m4 2004-07-22 11:15:32.000000000 +0000
-+++ ardour-0.9beta18.3/libs/gtkmmext/aclocal.m4 2004-07-23 18:59:35.627556872 +0000
-@@ -2756,6 +2756,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -2770,7 +2772,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -2790,13 +2792,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-diff -ru ardour-0.9beta18.3.orig/libs/midi++/aclocal.m4 ardour-0.9beta18.3/libs/midi++/aclocal.m4
---- ardour-0.9beta18.3.orig/libs/midi++/aclocal.m4 2004-07-22 11:15:13.000000000 +0000
-+++ ardour-0.9beta18.3/libs/midi++/aclocal.m4 2004-07-23 18:59:49.517445288 +0000
-@@ -951,6 +951,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -965,7 +967,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -985,13 +987,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-diff -ru ardour-0.9beta18.3.orig/libs/pbd/aclocal.m4 ardour-0.9beta18.3/libs/pbd/aclocal.m4
---- ardour-0.9beta18.3.orig/libs/pbd/aclocal.m4 2004-07-22 11:15:06.000000000 +0000
-+++ ardour-0.9beta18.3/libs/pbd/aclocal.m4 2004-07-23 18:21:14.026453424 +0000
-@@ -839,6 +839,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -853,7 +855,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -873,13 +875,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
-diff -ru ardour-0.9beta18.3.orig/libs/soundtouch/aclocal.m4 ardour-0.9beta18.3/libs/soundtouch/aclocal.m4
---- ardour-0.9beta18.3.orig/libs/soundtouch/aclocal.m4 2004-07-22 11:15:10.000000000 +0000
-+++ ardour-0.9beta18.3/libs/soundtouch/aclocal.m4 2004-07-23 19:00:52.502870048 +0000
-@@ -839,6 +839,8 @@
- dnl figure out how best to optimize
- dnl
-
-+gcc_major_version=$($CC -dumpversion | sed -e 's/\..*//')
-+
- if test "$target_cpu" = "powerpc"; then
- AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?")
- altivecLinux=
-@@ -853,7 +855,7 @@
- else
- OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple"
- fi
-- OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt"
-+ OPT_FLAGS="$OPT_FLAGS -mhard-float -mpowerpc-gfxopt"
- elif echo $target_cpu | grep "i*86" >/dev/null; then
- cat /proc/cpuinfo | grep mmx >/dev/null
- if test $? = 0; then
-@@ -873,13 +875,15 @@
- elif test "$target_cpu" = "i686"; then
- OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- if test "$gcc_major_version" = "3"; then
-- OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow"
-+ OPT_FLAGS="$OPT_FLAGS $mmx $sse $dreidnow"
- fi
- else
- OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables"
- fi
- fi
-
-+OPT_FLAGS="$OPT_FLAGS -pipe"
-+
- # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
- LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-
diff --git a/media-sound/ardour/files/digest-ardour-0.9_beta30 b/media-sound/ardour/files/digest-ardour-0.9_beta30
deleted file mode 100644
index 575247118f3d..000000000000
--- a/media-sound/ardour/files/digest-ardour-0.9_beta30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d2c709003c151cd97d4324d54cdaa6d4 ardour-0.9beta30.tar.bz2 1259122
-RMD160 796b8d53ed60621e21f5e61d00a81e600af17680 ardour-0.9beta30.tar.bz2 1259122
-SHA256 fb95e24b93d4bdefca9382db1d6e64e26a52403447dd98e428d63c78a2e84fd4 ardour-0.9beta30.tar.bz2 1259122