media-gfx/fontmatrix: Fix qt4 dependencies for split qt4, quoting

svn path=/sunrise/; revision=6707

diff --git a/media-gfx/fontmatrix/ChangeLog b/media-gfx/fontmatrix/ChangeLog
index 3ce408efcf8b52c7086df8936d344f79947ffa4f..b11fc6851bcd72d1f8b284e817637204b17061fa 100644 (file)
--- a/media-gfx/fontmatrix/ChangeLog
+++ b/media-gfx/fontmatrix/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  fontmatrix-0.4.2.ebuild:
+  Fix qt4 dependencies for split qt4, quoting
+
   03 Aug 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   fontmatrix-0.4.2.ebuild:
   Simplify, add die to dobin

diff --git a/media-gfx/fontmatrix/Manifest b/media-gfx/fontmatrix/Manifest
index a80f219371a7576adfdce68ead849b548ca6c504..e00712070357180fe64723d1ae90d3ae1bf5e90c 100644 (file)
--- a/media-gfx/fontmatrix/Manifest
+++ b/media-gfx/fontmatrix/Manifest
@@ -1,4 +1,4 @@
 DIST fontmatrix-0.4.2-Source.tar.gz 656806 RMD160 64b54eea1b78101650296495d68e6813dccaea6c SHA1 6d4623b0b4169e9544259d4b04f9077c902b8dc3 SHA256 3b5ad1e27b33d81fea610d4748a9a42107006a36bff277529eb3377670600075
-EBUILD fontmatrix-0.4.2.ebuild 1007 RMD160 7f65634bc8cc967133548bd9c7fb22a8c5f78f52 SHA1 1279dd32bd55975f1a040bd11d8099b00e0e8e82 SHA256 8a9d16ce3228f6830eb152915b37bdb9f935f5e4d435b53e6b3e9928792d8410
-MISC ChangeLog 1283 RMD160 a74148539dac673555d303c00c2f14f1a0499298 SHA1 1c1dcaabce5959235f685a78fb7e09111f34cd75 SHA256 837ff594a7c3b9f9db4d81cabdf758730abaf048bef39c7d5438a98138a0d2c2
+EBUILD fontmatrix-0.4.2.ebuild 1080 RMD160 654cc1bbdcf48136ae37bce5e8a4c1ace936941b SHA1 e781ccb1b09fac001d5a077185596f0b4c92cfd6 SHA256 47a71fa0a0fe2e39b5b59ab803910ab1cab3ea46b59a48e539445fc5e82863f8
+MISC ChangeLog 1413 RMD160 22bcb665f47cf55adf4fe73eecc9022497555434 SHA1 295aed47692cfcc4a365b6a1b98b3c8264e42d8d SHA256 1188fec541cdb71e67970ac2395ccc876df10a69c7413807beee0e4e048a48fc
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-gfx/fontmatrix/fontmatrix-0.4.2.ebuild b/media-gfx/fontmatrix/fontmatrix-0.4.2.ebuild
index 250437c37447651181ac643636f3b627b8f19cbe..2db075c3bf4950ea5a329feea06cfc5ef862204a 100644 (file)
--- a/media-gfx/fontmatrix/fontmatrix-0.4.2.ebuild
+++ b/media-gfx/fontmatrix/fontmatrix-0.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="1"
 
 inherit cmake-utils qt4
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND=">=x11-libs/qt-4.3:4
+DEPEND="|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 x11-libs/qt-svg:4 )
+       >=x11-libs/qt-4.3:4 )
        >=media-libs/freetype-2"
 
 S=${WORKDIR}/${P}-Source
@@ -24,12 +25,12 @@ B=${WORKDIR}/${PN}_build
 src_compile() {
        local mycmakeargs="-DOWN_SHAPER=1"
        cmake-utils_src_compile
-       cd ${B}
+       cd "${B}"
        emake || die "emake failed"
 }
 
 src_install() {
-       dobin ${B}/src/${PN} || die
+       dobin "${B}"/src/${PN} || die
        doicon "${S}/${PN}.png"
        make_desktop_entry ${PN} "Fontmatrix" ${PN}.png
 }