[proaudio] [1750] cleanup; added patch fixing MAKE_DIRECTORY

[subversion@xxxxxxxxxxxxx]

Revision: 1750
Author:   gentoid
Date:     2010-09-07 21:33:37 +0200 (Tue, 07 Sep 2010)
Log Message:
-----------
cleanup; added patch fixing MAKE_DIRECTORY

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/canorus/ChangeLog
    trunk/overlays/proaudio/media-sound/canorus/Manifest
    trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/canorus/files/canorus-9999-fix-MAKE_DIRECTORY.patch

Modified: trunk/overlays/proaudio/media-sound/canorus/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/ChangeLog	2010-09-05 19:59:04 UTC (rev 1749)
+++ trunk/overlays/proaudio/media-sound/canorus/ChangeLog	2010-09-07 19:33:37 UTC (rev 1750)
@@ -1,7 +1,11 @@
 # ChangeLog for media-sound/canorus
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2010; Viktor Lazarev <taurus101v@xxxxxxxxx> canorus-9999.ebuild,
+  +files/canorus-9999-fix-MAKE_DIRECTORY.patch:
+  cleanup; added patch fixing MAKE_DIRECTORY
+
   17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
   added a changelog
 

Modified: trunk/overlays/proaudio/media-sound/canorus/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/Manifest	2010-09-05 19:59:04 UTC (rev 1749)
+++ trunk/overlays/proaudio/media-sound/canorus/Manifest	2010-09-07 19:33:37 UTC (rev 1750)
@@ -1,3 +1,4 @@
-EBUILD canorus-9999.ebuild 1093 RMD160 2d8eb76aeed8503bb1e1d761d4e1cb2e6c23b209 SHA1 1043248b14b195678f94b026c242f238df4d54f8 SHA256 e04763597dfe6ec97df177c6c3a3349270c56e6e33306c05d0188961be4b7825
-MISC ChangeLog 207 RMD160 4bde3870fef7a82a40168888856d7a52f20d282f SHA1 1404c93c7dd6da698738e79967263cba5982788e SHA256 bf0d26ebf8061541ff9c5e19f6d7cea4e4871e39206618b6f1d539e75d9ae3e2
+AUX canorus-9999-fix-MAKE_DIRECTORY.patch 989 RMD160 57a27f87bbcca15f1204ea570b8dc2e2faaf8f57 SHA1 ea9fc3fa37df0e01429770ed6e0067c63e08e4d1 SHA256 ce53467edbfbbdb99992314e0186be27bc9915ea9580ed9e1816345bbd30851d
+EBUILD canorus-9999.ebuild 1043 RMD160 bcdb6e2c3da0ad49341f2532d9602445d6c7669e SHA1 1056efcbbc5e5c81e6a1ee524faf7ff9d44673f9 SHA256 c5cbdb5e2c929fbd58b3c4d033b266e06910a1ac68c13ed94b2c23f737f063a7
+MISC ChangeLog 375 RMD160 e6a60a009faee45362e91d171c70d66165177747 SHA1 95113eb392f11cdb1b21dea6d9e89b699daca269 SHA256 a355dc821e8c527018dcc4ba3ffb0ce4f89f1f384394a3843fbc352aaefc84c3
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild	2010-09-05 19:59:04 UTC (rev 1749)
+++ trunk/overlays/proaudio/media-sound/canorus/canorus-9999.ebuild	2010-09-07 19:33:37 UTC (rev 1750)
@@ -1,15 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="2"
+CMAKE_IN_SOURCE_BUILD="1"
 
-inherit eutils multilib qt4 subversion
+inherit eutils qt4-r2 subversion cmake-utils
 
 ESVN_REPO_URI="svn://svn.berlios.de/canorus/trunk"
 ESVN_PROJECT="canorus"
 
-DESCRIPTION="Graphical Score-editor using Qt4"
+DESCRIPTION="a free extensible music score editor"
 HOMEPAGE="http://canorus.berlios.de";
 SRC_URI=""
 
@@ -17,34 +18,33 @@
 SLOT="0"
 KEYWORDS=""
 
-IUSE="python ruby"
+IUSE="ruby"
 
+RDEPEND=">=dev-lang/python-2.5
+	sys-libs/zlib
+	media-libs/alsa-lib
+	>=x11-libs/qt-svg-4.4:4
+	>=x11-libs/qt-core-4.4:4
+	ruby? ( dev-lang/ruby )"
+	#>=x11-libs/qt-assistant-4.4:4
 
-DEPEND="|| ( ( x11-libs/qt-core x11-libs/qt-gui
-		x11-libs/qt-xmlpatterns x11-libs/qt-svg )
-			=x11-libs/qt-4.2*:4 )
-        >=dev-util/cmake-2.4.2
-		dev-lang/swig
-        python? ( dev-lang/python )
-        ruby?   ( dev-lang/ruby )"
+DEPEND="${REDEND}
+	dev-lang/swig"
 
 pkg_setup() {
 	ewarn "if this ebuild fails have a look at"
 	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=157501";
 	ewarn "hav no time to fix the ebuild"
-}
 
-src_compile() {
-	cmake \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		-DCANORUS_INSTALL_LIB_DIR=$(get_libdir) \
-		-DNO_PYTHON=$( use python && echo false || echo true ) \
+	mycmakeargs+=" -DCANORUS_INSTALL_LIB_DIR=$(get_libdir) \
 		-DNO_RUBY=$( use ruby && echo false || echo true ) \
-	. || die
+		-DNO_PYTHON=false"
+}
 
-	emake || die
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-MAKE_DIRECTORY.patch"
 }
 
-src_install() {
-		emake install DESTDIR=${D} || die
+src_unpack() {
+	subversion_src_unpack
 }

Added: trunk/overlays/proaudio/media-sound/canorus/files/canorus-9999-fix-MAKE_DIRECTORY.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/canorus/files/canorus-9999-fix-MAKE_DIRECTORY.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/canorus/files/canorus-9999-fix-MAKE_DIRECTORY.patch	2010-09-07 19:33:37 UTC (rev 1750)
@@ -0,0 +1,13 @@
+--- ./src/CMakeLists.txt.old	2010-09-07 22:53:06.000000000 +0400
++++ ./src/CMakeLists.txt	2010-09-07 22:54:40.000000000 +0400
+@@ -696,8 +696,8 @@
+ # Install fonts
+ INSTALL(FILES ${Canorus_Fonts} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/fonts")
+ # Install users manual, if it exists
+-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
+-INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
++INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc)")
++INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide)")
+ FILE(GLOB Canorus_Usersguide RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ../doc/usersguide/*.qhc ../doc/usersguide/*.qch)
+ INSTALL(FILES ${Canorus_Usersguide} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}/doc/usersguide")
+ # Install examples