Revision: 2526
Author:   gavlee
Date:     2013-03-10 23:07:39 +0100 (Sun, 10 Mar 2013)
Log Message:
-----------
media-sound/museseq: bump 2.1.1 freshen live ebuild, cleanup.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/museseq/ChangeLog
    trunk/overlays/proaudio/media-sound/museseq/Manifest
    trunk/overlays/proaudio/media-sound/museseq/metadata.xml
    trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild

Added Paths:
-----------
    
trunk/overlays/proaudio/media-sound/museseq/files/museseq-2.1.1-cmake-rpath.patch
    trunk/overlays/proaudio/media-sound/museseq/museseq-2.1.1.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/museseq/files/fix_zyn.patch
    
trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild
    trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild

Modified: trunk/overlays/proaudio/media-sound/museseq/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/ChangeLog       2013-03-10 
21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/ChangeLog       2013-03-10 
22:07:39 UTC (rev 2526)
@@ -2,6 +2,16 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*museseq-2.1.1 (10 Mar 2013)
+
+  10 Mar 2013; Gavin Pryke (gavlee) <[email protected]>
+  -museseq-1.0_rc1.ebuild, -museseq-1.0.1.ebuild, -museseq-1.9999.ebuild,
+  +museseq-2.1.1.ebuild, +files/museseq-2.1.1-cmake-rpath.patch,
+  museseq-2.9999.ebuild, -files/museseq-9999-find_fltk.patch,
+  -files/fix_zyn.patch, metadata.xml:
+  bump to 2.1.1 and freshen live ebuild. add patch for cmake rpath.
+  remove some patches and old 1.x ebuilds requiring qt3.
+
   09 Mar 2013; Dominique Michel <[email protected]>
   Moved QT depend to dev-qt/* in all 4 ebuilds
 

Modified: trunk/overlays/proaudio/media-sound/museseq/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/Manifest        2013-03-10 
21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/Manifest        2013-03-10 
22:07:39 UTC (rev 2526)
@@ -1,11 +1,7 @@
-AUX fix_zyn.patch 1115 SHA256 
0a66f0dfc9451efd7a19833dbb22a7abc6382e6857596c54475ff14eadf20ee7 SHA512 
24d2e4966450dbafb4b49fda7b0617768649f5f6666bfc62292e102f9c097961d9db7c3a73a0f0a7e69dd0547d81ebafcb01e0e74cb5e6891abf0464e7a9a14d
 WHIRLPOOL 
bce35658846fb097a45e266f92e57d67d1df829c76deb7ed72cc0b3ad3761209070ee41c0be504cc9d37fd4d60e50db345c6c766dcef1a3c9e53eaeb407d7ca1
-AUX museseq-9999-find_fltk.patch 363 SHA256 
e31ec9777580f44a9c7facea9122c5c4a9e9e3ba4090a98968598e40d85889f2 SHA512 
bd484a05d0b925d9cce391d3a68d4c5f54afd19fec414e313335998a54c16a492d559f526ab86249b8d1e211c8a130f7918405332488585823dbe25e8a82b532
 WHIRLPOOL 
14638c7758306a5e5dd628d67db469866bafce4e19d41195e062c2bd345f46b80c9afdbd28a38176fe91670da166a0485bb5aa3106d3dadccf1fb724ee2238fe
+AUX museseq-2.1.1-cmake-rpath.patch 442 SHA256 
70bde2cdc603ce0547e1170d374e92da512a3a829826c9472b3bbaef7007f880 SHA512 
5741ff14bc6fe2ee6f5557d89cf96650c5948e117a057fde764f3f2e63d29d57a3dab21f474cd1442d09b802cad64e4ed9fe25c0084d52eb70073dbaf7c07fb2
 WHIRLPOOL 
2ed96374df4963853df6217f7c8b9bde6fd7d6a0dabc7d5518f41775ce24fce0a7d5846d1e5733b1ef323878d7c6a3b4bdde59c55e9ec036c9a3668d64178239
 AUX sse_functions_64bit.s 12051 SHA256 
460e6f8ec1a8a4691a72ebec5551c0104f933ea500c6f93ee51be47fb8508285 SHA512 
14713938ef5c5cc8f0f9173b9d21729d9a01d3231f16f0322b9d5ff234bdeb2e0d582397ed2b6b6ca1c33237b8243d0241904eadd0f260e5b40cb25d8991513b
 WHIRLPOOL 
045dfe3b99281836a5b9098c18b9692af98125b771532b51e44bc4585b931c3a43a30095da1d63a6bcd6d0131afc694bcd43e93d3c699158ae2d11d334637156
-DIST muse-1.0.1.tar.gz 2666184 SHA256 
e78cb3f01791974976bc7577478d1cbecfdb7c5b3694fa742038b682a1abe03b SHA512 
cd03048fe093221bfdcd77b43666ca3dcb8cca77219dcecb06ebc618c3433de534b70a38b8380bcf039e594737fef6b11aff4a2e04a2141fd5323d232bdc0c60
 WHIRLPOOL 
f9192d82c56d5b3782c12428efbd561d799ad08804a9567671dd0ec684bf25961398fd6b49533d0098eb33ebe72a552d0899a387850346e462af29d826031c7d
-DIST muse-1.0rc1.tar.gz 2461851 SHA256 
c5f9fd6ad978dc789de1f60329b904d0476a142525d80ddaad3c13850fded756
-EBUILD museseq-1.0.1.ebuild 2303 SHA256 
ffd2fdc226c19f9c53e14bebe3887dcf78681aef721e3bea2e594b198d53af5b SHA512 
3b3783ba1c37f84fe16c40fa3675fcd9099eb46726d67fc6ec5f56fdb7e2f6553bd342583668f0eddb283907cff26e7709cb6b0418c8494cf3fae33036774849
 WHIRLPOOL 
1dae29f8cee6e8344498ae20f2a37e6fd51d2015e0fffea281247b7a508098fa63a4b9b8338c7ae6e6d3d700d11311ba4f107ca88dcfa0d362f8c53a505c6e07
-EBUILD museseq-1.0_rc1.ebuild 1927 SHA256 
e47e7a88d95aa60f5cbbebff3cb98c60f257aac253790daa90153486e70ba88d SHA512 
892edd4a228b7ac2b68b5e7f4547287ed44f5dae5d834767edb9b3089a2173da9b1452fd6f948d5735c7e70076eb5a1b8efba8fce5c5da02aee18bf8699cff52
 WHIRLPOOL 
9008c9bb2147e194bfea2b699b95f4eb0cfca488304ea2b6c6c467a0ba32fd7e462a17588022b88a62dd6b49582beffd0e9cc650b546bb50914810c4ba68c9a9
-EBUILD museseq-1.9999.ebuild 2112 SHA256 
56a32e0b1055a71a48711ee54496faae787397b68a347377aa005a1f1013c0a1 SHA512 
b6d63e4d44b2dc43267e6029e90db1383682917369606e493bcb68ff9498975331b38817a06d25a0a3c37bfd5ebe0627337638e42e3916456806c69c8867e5d2
 WHIRLPOOL 
c2d9f8e29ec2fde8e3b0ac79cdf6cc4d7aef86fc9abd1e00f0b6e9e3db16d4fd9bc4b8bc69a089caa75343c3cb01ef4b25ee21213853932ea462395afd381eb2
-EBUILD museseq-2.9999.ebuild 2922 SHA256 
fe6cfd1a30349613fe730b8ec0913c3e78f3d09d6fb62970eabc59b9ba262fcf SHA512 
1487c688add2b107ace0aeacd5f253bca5e63e7bf9dcb1fefec2fed36d776dbef6fa9324b12cef7106f080b2d6bb78ff4cfcb6fa4a3dbae5fa6ef02b7a225250
 WHIRLPOOL 
b02b582e5febafc997f4ecb7f4f7f5ee8a21743e28381a1f645c5aaf7b487d5e1ae7461d044c6892be75f5a5c377bb20e6b514d2f0d8426413888bcc7a7b60e1
-MISC ChangeLog 1838 SHA256 
3e16e1b62a614d2079197eb550fe686433570945cf4af611f6d9b774fbc6e2a5 SHA512 
dde257e0590c6a30d9a7306f8ba3a1eaba0aba89c8a15a571fa643e82fb9a83e7211c0d86411643734e2c5d7fc417f501daa3b2b1a74173e6238d19c272db16d
 WHIRLPOOL 
c2229685c8c5a06130932ef56b0eec816a6b672425725c6f8ffb21af99cb8432c1beb61fb104094b5011b13b40f90fef40a618e00e0cd64e5a4b1b9d6948ee5f
-MISC metadata.xml 802 SHA256 
6527b2ce80dd6637e4090df3e073815bd49c267d3bd2289a4472999ccfc00e8a SHA512 
25264af8b9695c616756aab621f988599610abead4d72359003f23c36ddf0f788d6a90a3aecc92d07a64b45d6a163481c2daebffcff542ae7ae0ee41ced7a805
 WHIRLPOOL 
30d556a5304148b080efb2958ce80a5937958910839e426fdfc09604d2f553e472017d70858f7afeb0474527ba4f7ebdf5b9652f3eff8bea41a2200ef16a26e9
+DIST muse-2.1.1.tar.gz 5409903 SHA256 
aa901a6ce014d8e7996d976ec43b8f8c9d454efb12a123e837de4c25a78de619 SHA512 
dc2d632a8ae3ac22d20a9c68fe13d4c1e50011dacb4e0fdc3dda410ffbd4be06de01d1f317b3bd4447820855b9b6c543610e4dc1e8c9e24b13bf138ddc2ac1fb
 WHIRLPOOL 
c71aa26c0680239bf8e694624052e22a5dc087efe777f225fa8a8315eb65290e744c511cd3eab97c719a56dbaa18d9aba2bc2b38e6c233b54e2a9eba420e3e05
+EBUILD museseq-2.1.1.ebuild 1404 SHA256 
b3bf4c6f46c5be55cb46e7f597092d2f02c0446c9de560396ab2d81654313195 SHA512 
f44101e9ef94c5ffa08a2324d6adefc3bf78d02810feadca5e6bb9cc11a48c7e75b1387d673f82ac2ed15d7299c94c8ebf6208ff89a628e0911485a6a6612ed4
 WHIRLPOOL 
b433a3edfc2fbe52ae617b96a2927adc7877fd1b6fd92858e4fcd6a8949a0114469bd4061e1b59c4c343203926fcce161d8529516046fb08d4eaa772c869a37f
+EBUILD museseq-2.9999.ebuild 1381 SHA256 
4fb7e5029070a9c3f90036ecea4addaf26d984afcbd3f5ec6ae0ae69fa7a5868 SHA512 
c151df70f920dd4b3eb881555a03447015c6949fa3a6a3568c1a6639b935d32c168df3d7453f68a859fba186d4ad164bd7edbedef1db35867101fc063e7c430b
 WHIRLPOOL 
3cbfc7f1b45d4b5fa5b0b65f0b4f2c3517ba573c08dee52759ad813edd98ddc3409e3588bbafcd0ecc5af06ac7b1d557c57d2006dbd6964b505ef21186a1980a
+MISC ChangeLog 2298 SHA256 
27d120a8429ef3ce8324b701c3af9e1fd2a44cc3331e686a39d8e4b5aed821c8 SHA512 
76aa8814904740464847d96b5126fea4df78ca2740a7e2794d004c914830d7c4eca337913672b6db5bdaa8fe13afafa7c08ecd93c006daf6929a5d4eb9e04013
 WHIRLPOOL 
1dec3fd37f89ba2d5c51d390859de2c5ca4bd1b836f17179f8aa1199f173fc6ed8606f5d88da4f1157041870f1ff8c9aa1fdf20e56f252723b5579b5756c8f40
+MISC metadata.xml 603 SHA256 
8e497a29b208fd4546323fe278988c3b13c2657f713433a99cff906db0cac2f2 SHA512 
e173d68af23c23a02c5cbea082cde793b05a955865ecf2a319d5c27b9f0e582a7e21020b14eccb8a576f4036d629b67f94c0885e07ca22a05c6688ee1b40da32
 WHIRLPOOL 
5bfc4cd7a95afcb76f256909eeb26272feff1fa26aaaaee2d2d55bb506baddf04ba578ca143d8fa5e2a4860aac2d622b049d86639a259a8d9be4620ad6b92208

Deleted: trunk/overlays/proaudio/media-sound/museseq/files/fix_zyn.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/files/fix_zyn.patch     
2013-03-10 21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/files/fix_zyn.patch     
2013-03-10 22:07:39 UTC (rev 2526)
@@ -1,34 +0,0 @@
---- a/synti/zynaddsubfx/CMakeLists.txt.orig    2007-03-22 20:55:08.000000000 
+0100
-+++ b/synti/zynaddsubfx/CMakeLists.txt 2007-03-22 21:28:53.000000000 +0100
-@@ -52,6 +52,16 @@
- #      Input/ALSAMidiIn.C
- #      Input/NULLMidiIn.C
- 
-+
-+FIND_LIBRARY(FLTK NAMES fltk PATHS /usr/lib/fltk-1.1)
-+set(FLTK ${FLTK})
-+
-+#FIND_PATH(FLTK_INCL_DIR  PATHS /usr/include/fltk-1.1/ )
-+set(FLTK_INCL_DIR /usr/include/fltk-1.1/)
-+
-+FIND_PATH(CONFIG_INCL_DIR config.h PATHS ../../ )
-+set(CONFIG_INCL_DIR ${CONFIG_INCL_DIR})
-+
- add_library ( zynaddsubfx SHARED
-       ${fltk_ui_FLTK_UI_SRCS}
-       DSP/AnalogFilter.C
-@@ -107,12 +117,12 @@
- 
- set_target_properties ( zynaddsubfx
-    PROPERTIES PREFIX ""
--   COMPILE_FLAGS "-O6 -fvisibility=hidden -DASM_F2I_YES -DOS_LINUX 
-DFFTW_VERSION_3"
-+   COMPILE_FLAGS "-O6 -fvisibility=hidden -DASM_F2I_YES -DOS_LINUX 
-DFFTW_VERSION_3 -I${FLTK_INCL_DIR} -I${CONFIG_INCL_DIR}"
-    )
- 
- target_link_libraries( zynaddsubfx
-       synti jack asound pthread fftw3 mxml
--      m z fltk
-+      m z ${FLTK}
-       )
- 
- install_targets ( /${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/synthi/ 
zynaddsubfx )

Added: 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-2.1.1-cmake-rpath.patch
===================================================================
--- 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-2.1.1-cmake-rpath.patch
                           (rev 0)
+++ 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-2.1.1-cmake-rpath.patch
   2013-03-10 22:07:39 UTC (rev 2526)
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17e82ee..c4d2340 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,7 @@ if ( MODULES_BUILD_STATIC )
+ else ( MODULES_BUILD_STATIC )
+       SET(MODULES_BUILD SHARED )
+       SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+-      SET(CMAKE_INSTALL_RPATH ${MusE_MODULES_DIR})
++      SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${MusE_MODULES_DIR})
+ endif ( MODULES_BUILD_STATIC )
+ 
+ ##

Deleted: 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch
===================================================================
--- 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch  
    2013-03-10 21:36:09 UTC (rev 2525)
+++ 
trunk/overlays/proaudio/media-sound/museseq/files/museseq-9999-find_fltk.patch  
    2013-03-10 22:07:39 UTC (rev 2526)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig        2008-12-01 13:04:16.000000000 +0100
-+++ CMakeLists.txt     2008-12-01 13:05:16.000000000 +0100
-@@ -126,7 +126,7 @@
- 
- if (ENABLE_ZYNADDSUBFX)
-       # HACK:
--      set (FLTK_INCLUDE_DIR     "/usr/include")
-+      set (FLTK_INCLUDE_DIR     "/usr/include/fltk-1.1")
-       set(FLTK_FLUID_EXECUTABLE "/usr/bin/fluid")
- 
-       include (FindFLTK)

Modified: trunk/overlays/proaudio/media-sound/museseq/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/metadata.xml    2013-03-10 
21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/metadata.xml    2013-03-10 
22:07:39 UTC (rev 2526)
@@ -8,12 +8,9 @@
        <use>
                <flag name="doc">Install the depends needed to build the 
doc</flag>
                <flag name="dssi">Enable dssi and dssi-vst support</flag>
-               <flag name="experimental">Enable experimental features</flag>
                <flag name="fluidsynth">Enable fluidsynth support</flag>
                <flag name="lash">Enable lash support</flag>
-               <flag name="optimization">Enable Release build type</flag>
                <flag name="osc">Enable OSC support</flag>
-               <flag name="python">Enable python control module build</flag>
-               <flag name="vst">Enable obsolated vst support trough 
fst/wine</flag>
+               <flag name="vst">Enable vst support through vestige</flag>
        </use>
 </pkgmetadata>

Deleted: trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild    
2013-03-10 21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.0.1.ebuild    
2013-03-10 22:07:39 UTC (rev 2526)
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-MY_P=${P/museseq/muse}
-MY_P=${MY_P/_/}
-
-DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
-SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz"
-HOMEPAGE="http://www.muse-sequencer.org/";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fluidsynth lash pch"
-# how about "dssi (open)jade sse vst/win"?
-RDEPEND="
-       dev-qt/qtcore:4[qt3support]
-       dev-qt/qtgui:4[qt3support]
-       >=media-libs/alsa-lib-0.9.0
-       fluidsynth? ( >=media-sound/fluidsynth-1.0.3 )
-       dev-lang/perl
-       >=media-libs/libsndfile-1.0.1
-       >=media-libs/libsamplerate-0.1.0
-       >=media-sound/jack-audio-connection-kit-0.98.0
-       lash? ( >=media-sound/lash-0.5.0 )"
-
-DEPEND="${RDEPEND}
-       doc? ( app-text/openjade
-                  app-doc/doxygen
-                  media-gfx/graphviz )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       # new strange --as-needed error, not like the old one
-       filter-ldflags -Wl,--as-needed --as-needed
-
-       for i in am in; do
-               sed -e "/-include 
\$(top_srcdir)\/all.h/s/dir)\/all.h/dir)\/all.h -DINSTPREFIX=\"\$(prefix)\"/" \
-                       -i "./muse/remote/Makefile.${i}" || die "fix 
Makefile.${i} failed";
-       done
-
-       sed -e "/string launcherfilename 
=/s/string(INSTPREFIX)/string(\"INSTPREFIX\")/" \
-               -i "./muse/remote/pyapi.cpp" || die "fix failed"
-
-       econf \
-               `use_enable lash` \
-               `use_enable debug` \
-               `use_enable pch` \
-               --disable-suid-install \
-               --enable-optimize \
-               --disable-suid-build \
-               || die "Configure failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "install failed"
-       dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
-       mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
-
-       newicon "packaging/muse_icon.png" "${PN}.png"
-       make_desktop_entry ${PN} "MusE Sequencer" ${PN} 
"AudioVideo;Audio;Sequencer"
-}
-
-pkg_postinst() {
-       echo
-       einfo "You have to enable realtime capabilities in order to run MuSE."
-       einfo "See http://www.gentoo.org/proj/en/desktop/sound/realtime.xml";
-       einfo
-       einfo "If using pam rlimits instead Realtime LSM and you hit this 
error:"
-       einfo "\"RtcTimer::setTimerFreq(): cannot set tick on /dev/rtc: 
Permission denied\""
-       einfo "add the following to /etc/sysctl.conf and run \"sysctl -a\""
-       echo
-       einfo "dev.rtc.max-user-freq = 1024"
-       echo
-}

Deleted: trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild  
2013-03-10 21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.0_rc1.ebuild  
2013-03-10 22:07:39 UTC (rev 2526)
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils flag-o-matic
-
-MY_P=${P/museseq/muse}
-MY_P=${MY_P/_/}
-
-DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
-SRC_URI="mirror://sourceforge/lmuse/${MY_P}.tar.gz"
-HOMEPAGE="http://www.muse-sequencer.org/";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fluidsynth lash pch"
-
-RDEPEND="
-       dev-qt/qtcore:4[qt3support]
-       dev-qt/qtgui:4[qt3support]
-       >=media-libs/alsa-lib-0.9.0
-       fluidsynth? ( >=media-sound/fluidsynth-1.0.3 )
-       dev-lang/perl
-       >=media-libs/libsndfile-1.0.1
-       >=media-libs/libsamplerate-0.1.0
-       >=media-sound/jack-audio-connection-kit-0.98.0
-       lash? ( >=media-sound/lash-0.5.0 )"
-
-DEPEND="${RDEPEND}
-       doc? ( app-text/openjade
-                  app-doc/doxygen
-                  media-gfx/graphviz )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       # new strange --as-needed error, not like the old one
-       filter-ldflags -Wl,--as-needed --as-needed
-
-       econf \
-               `use_enable lash` \
-               `use_enable debug` \
-               `use_enable pch` \
-               --disable-suid-install \
-               --enable-optimize \
-               --disable-suid-build \
-               || die "Configure failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "install failed"
-       dodoc AUTHORS ChangeLog INSTALL NEWS README SECURITY README.*
-       mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
-
-       newicon "packaging/muse_icon.png" "${PN}.png"
-       make_desktop_entry ${PN} "MusE Sequencer" ${PN} 
"AudioVideo;Audio;Sequencer"
-}
-
-pkg_postinst() {
-       echo
-       einfo "You have to enable realtime capabilities in order to run MuSE."
-       einfo "See http://www.gentoo.org/proj/en/desktop/sound/realtime.xml";
-       einfo
-       einfo "If using pam rlimits instead Realtime LSM and you hit this 
error:"
-       einfo "\"RtcTimer::setTimerFreq(): cannot set tick on /dev/rtc: 
Permission denied\""
-       einfo "add the following to /etc/sysctl.conf and run \"sysctl -a\""
-       echo
-       einfo "dev.rtc.max-user-freq = 1024"
-       echo
-}

Deleted: trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild   
2013-03-10 21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-1.9999.ebuild   
2013-03-10 22:07:39 UTC (rev 2526)
@@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9.ebuild,v 
1.4 2008/07/27 21:30:21 carlo Exp $
-
-EAPI="2"
-
-inherit exteutils subversion
-
-DESCRIPTION="MusE is a MIDI/Audio sequencer with recording and editing 
capabilities"
-HOMEPAGE="http://www.muse-sequencer.org";
-SRC_URI=""
-
-ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc lash debug"
-
-MY_PN=${PN/museseq/muse}
-
-RDEPEND="
-       dev-qt/qtcore:4[qt3support]
-       dev-qt/qtgui:4[qt3support]
-       >=media-libs/alsa-lib-0.9.0
-       >=media-sound/fluidsynth-1.0.3
-       dev-lang/perl
-       >=media-libs/libsndfile-1.0.1
-       >=media-libs/libsamplerate-0.1.0
-       >=media-sound/jack-audio-connection-kit-0.98.0
-       lash? ( >=media-sound/lash-0.5.0 )"
-
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       doc? ( app-text/openjade
-               app-doc/doxygen
-               media-gfx/graphviz )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_configure() {
-       einfo "Running autogen..."
-       ./autogen.sh || die "autogen failed"
-
-       econf --disable-suid-build --disable-optimize \
-               $(use_enable lash) $(use_enable debug) \
-               || die "econf failed."
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed."
-       dodoc AUTHORS ChangeLog NEWS README* SECURITY
-       mv "${D}"/usr/bin/muse "${D}"/usr/bin/museseq
-}
-
-pkg_postinst() {
-       elog "You must have the realtime module loaded to use MuSe.."
-       elog "Additionally, configure your Linux Kernel for non-generic"
-       elog "Real Time Clock support enabled or loaded as a module."
-       elog "User must have read/write access to /dev/misc/rtc device."
-       elog "Realtime LSM: 
http://www.gentoo.org/proj/en/desktop/sound/realtime.xml";
-       echo
-       elog "If using pam rlimits instead Realtime LSM and you hit this error:"
-       elog "\"RtcTimer::setTimerFreq(): cannot set tick on /dev/rtc: 
Permission denied\""
-       elog "add the following to /etc/conf.d/local.start"
-       elog "echo 1024 > /proc/sys/dev/rtc/max-user-freq"
-       elog "if /proc/sys/dev/rtc/max-user-freq could not be found"
-       elog "you hav to load the rtc module: modprobe rtc"
-       echo
-}

Added: trunk/overlays/proaudio/media-sound/museseq/museseq-2.1.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-2.1.1.ebuild            
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-2.1.1.ebuild    
2013-03-10 22:07:39 UTC (rev 2526)
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit cmake-utils toolchain-funcs flag-o-matic versionator
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
+HOMEPAGE="http://www.muse-sequencer.org/";
+SRC_URI="mirror://sourceforge/lmuse/muse-${MY_PV}/muse-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dssi fluidsynth lash osc vst"
+REQUIRED_USE=""
+
+CDEPEND=">=media-libs/alsa-lib-0.9.0
+       >=media-libs/libsamplerate-0.1.0
+       >=media-libs/libsndfile-1.0
+       >=media-sound/jack-audio-connection-kit-0.103
+       dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       dev-qt/qtsvg:4
+       dssi? ( >=media-libs/dssi-0.9.0 )
+       lash? ( >=media-sound/lash-0.4.0 )
+       osc? ( >=media-libs/liblo-0.23 )"
+RDEPEND="${CDEPEND}
+       fluidsynth? ( >=media-sound/fluidsynth-0.9.0 )"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig
+       doc? ( app-text/openjade
+                  app-doc/doxygen
+                  media-gfx/graphviz )"
+
+S=${WORKDIR}/muse-${PV}
+RESTRICT="mirror"
+
+PATCHES=("${FILESDIR}"/${P}-cmake-rpath.patch)
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_enable dssi DSSI)
+               $(cmake-utils_use_enable fluidsynth FLUID)
+               $(cmake-utils_use_enable lash LASH)
+               $(cmake-utils_use_enable osc OSC)
+               $(cmake-utils_use_enable vst VST_NATIVE)
+       )
+       cmake-utils_src_configure
+}
+
+#src_compile() {
+#      cmake-utils_src_compile -j1
+#}

Modified: trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild   
2013-03-10 21:36:09 UTC (rev 2525)
+++ trunk/overlays/proaudio/media-sound/museseq/museseq-2.9999.ebuild   
2013-03-10 22:07:39 UTC (rev 2526)
@@ -2,114 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI=5
+inherit cmake-utils toolchain-funcs flag-o-matic versionator subversion
 
-inherit subversion eutils toolchain-funcs cmake-utils flag-o-matic python
-
-MY_PN=${PN/museseq/muse2}
-ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/${MY_PN}";
-
-S=${WORKDIR}/${MY_PN}
-
 DESCRIPTION="The Linux (midi) MUSic Editor (a sequencer)"
 HOMEPAGE="http://www.muse-sequencer.org/";
+ESVN_REPO_URI="https://lmuse.svn.sourceforge.net/svnroot/lmuse/trunk/muse2";
 
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS=""
-IUSE="doc +dssi -experimental fluidsynth lash optimization +osc -python -vst"
+IUSE="doc dssi fluidsynth lash osc vst"
+REQUIRED_USE=""
 
-RDEPEND="dev-qt/qtcore
-       dev-qt/qtgui
-       dev-qt/qtxmlpatterns
-       dev-qt/qt3support
-       dev-qt/qtsvg
-       >=media-libs/alsa-lib-1.0
-       >=media-sound/fluidsynth-1.0.3
-       dev-lang/perl
-       >=media-libs/libsndfile-1.0.1
+CDEPEND=">=media-libs/alsa-lib-0.9.0
        >=media-libs/libsamplerate-0.1.0
-       >=media-sound/jack-audio-connection-kit-0.102.2
-       dssi? ( >=media-libs/dssi-0.9.0
-               media-plugins/dssi-vst )
+       >=media-libs/libsndfile-1.0
+       >=media-sound/jack-audio-connection-kit-0.103
+       dev-qt/qtcore:4
+       dev-qt/qtgui:4
+       dev-qt/qtsvg:4
+       dssi? ( >=media-libs/dssi-0.9.0 )
        lash? ( >=media-sound/lash-0.4.0 )
-       vst? ( >=media-libs/fst-9999 )"
+       osc? ( >=media-libs/liblo-0.23 )"
+RDEPEND="${CDEPEND}
+       fluidsynth? ( >=media-sound/fluidsynth-0.9.0 )"
+DEPEND="${CDEPEND}
+       virtual/pkgconfig
+       doc? ( app-text/openjade
+                  app-doc/doxygen
+                  media-gfx/graphviz )"
 
-DEPEND="
-       >=dev-util/cmake-2.4.7
-       =sys-devel/gcc-4*
-       doc? ( dev-texlive/texlive-context
-               app-text/openjade
-               app-doc/doxygen
-               media-gfx/graphviz )
-       sys-apps/util-linux"
+S=${WORKDIR}/muse2
+RESTRICT="mirror"
 
-if use optimization ; then
-       CMAKE_BUILD_TYPE="Release"
-fi
+PATCHES=("${FILESDIR}"/${PN}-2.1.1-cmake-rpath.patch)
 
-pkg_setup() {
-       if use osc ; then
-               if ! use dssi ; then
-                       ewarn "You enabled the osc use flag, it won't build 
without"
-                       ewarn "the dssi use flag!"
-                       die
-               fi
-       fi
-       if use vst ; then
-               ewarn "vst is onsoleted, considere to use dssi instead."
-       fi
-       python_set_active_version 2
-       python_pkg_setup
-}
-
-src_unpack() {
-       subversion_src_unpack
-}
-
 src_prepare() {
-       cd "${MY_S}" || die "cd failed"
-
-       # copy over correct header from ardour in case of amd64
-       use amd64 && cp "${FILESDIR}/sse_functions_64bit.s" al/dspSSE.cpp || 
die "cd failed"
-
-       # patch gor correct build with USE=experimental
-       sed -i -e 's:-DBUILD_EXPERIMENTAL 
${CMAKE_CXX_FLAGS}:"-DBUILD_EXPERIMENTAL ${CMAKE_CXX_FLAGS}":' \
-       "${S}"/CMakeLists.txt || die "sed failed"
+       base_src_prepare
+       subversion_src_prepare
 }
 
 src_configure() {
-       # linking with --as-needed is broken :(
-#      filter-ldflags -Wl,--as-needed --as-needed
-
-       # work around -lQtSvg not found error
-#      append-flags "-L/usr/$(get_libdir)/qt4"
-#      append-ldflags "-L/usr/$(get_libdir)/qt4"
-
-       mycmakeargs="${mycmakeargs}
+       local mycmakeargs=(
                $(cmake-utils_use_enable dssi DSSI)
-               $(cmake-utils_use_enable experimental EXPERIMENTAL)
-               $(cmake-utils_use_enable osc OSC)
                $(cmake-utils_use_enable fluidsynth FLUID)
-               $(cmake-utils_use_enable zynaddsubfx ZYNADDSUBFX)
-               $(cmake-utils_use_enable python PYTHON)
-               $(cmake-utils_use_enable vst VST)
-               "
-
+               $(cmake-utils_use_enable lash LASH)
+               $(cmake-utils_use_enable osc OSC)
+               $(cmake-utils_use_enable vst VST_NATIVE)
+       )
        cmake-utils_src_configure
-
-       # workaround empty revision.h
-#      svn info ${ESVN_STORE_DIR}/${PN}/muse | grep Revision | \
-#              cut     -f 2 -d " " > "${WORKDIR}/${PN}_build/revision.h" \
-#              || die "generating revision.h failed"
-
 }
-
-src_install() {
-       DOCS=""
-       cmake-utils_src_install
-
-       mv "${D}/usr/bin/grepmidi" "${D}/usr/bin/grepmidi2"
-       mv "${D}/usr/share/man/man1/grepmidi.1" 
"${D}/usr/share/man/man1/grepmidi2.1" || die
-}

Reply via email to