media-gfx/ipe: Fix deps, add missing die, fix g++ call for crosscompile, cleanup

svn path=/sunrise/; revision=9531

diff --git a/media-gfx/ipe/ChangeLog b/media-gfx/ipe/ChangeLog
index 8ae29e54262cae994c87047248e751781b04cf36..0bdc79f48f94742bb97dd3baa34dcce823fe5326 100644 (file)
--- a/media-gfx/ipe/ChangeLog
+++ b/media-gfx/ipe/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Nov 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> ipe-7.0.8.ebuild:
+  Fix deps, add missing die, fix g++ call for crosscompile, cleanup
+
   09 Nov 2009; Andrés Becerra Sandoval (bec) <andres.becerra@gmail.com>
   -ipe-6.0_pre31.ebuild, +ipe-7.0.8.ebuild:
   Version bump for ipe

diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
index 54648cf1b63ab67d263a1eef4976bff629d6b9da..626cb90221382fb480a01c453198086ad17fd337 100644 (file)
--- a/media-gfx/ipe/Manifest
+++ b/media-gfx/ipe/Manifest
@@ -1,4 +1,4 @@
 DIST ipe-7.0.8-src.tar.gz 1148541 RMD160 ec836de89aa5b442ff1c3bbfe99af7014bdc923e SHA1 a7e87bb11c243839447a38c95dd3b731f024fea5 SHA256 c8a004e2b34b4482793f57e469d8e75992f7d05b55e9ad4164cf542994c4dbe9
-EBUILD ipe-7.0.8.ebuild 2012 RMD160 32bea867f38a3fd82c4612c94e604671a5f490fb SHA1 5ec0ff74b501aa561608b0e5ca38832748ad3d70 SHA256 ba759183d87b593e07d59485564ae0d1e19176f1fe07771c92bacbb2a97fcdb6
-MISC ChangeLog 4094 RMD160 6707ea20724209c9b5690992587c2018d532fd54 SHA1 304a78dbf184b5b406d50293d3888290f9858821 SHA256 643ef987ee895e48af84bb3c73c16c933db22e053582a4d4cf8784b10083db5f
+EBUILD ipe-7.0.8.ebuild 1976 RMD160 30e06dadbcb31b2eddd877e12bd6be6018626967 SHA1 429ee2716d220d4964a617aef3e179b569eec527 SHA256 b37e8e49efba55c99ff2d85198e92cb5176b48ac9401c42516d27b211b174282
+MISC ChangeLog 4240 RMD160 e217decf7d6669d94a32879cdc38837345de180e SHA1 24e647b5abd4dc0274f8eeebf3203d7f4dc6f60c SHA256 a8d298a6a7479436107e7dbd6a550e139ae7a07662104792488ccd4916c1c5de
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/media-gfx/ipe/ipe-7.0.8.ebuild b/media-gfx/ipe/ipe-7.0.8.ebuild
index d11805cba94df8bb8663ec07a59a918a2ea9dcc5..599b3b3173591dfca7373790481d9b60dd79689b 100644 (file)
--- a/media-gfx/ipe/ipe-7.0.8.ebuild
+++ b/media-gfx/ipe/ipe-7.0.8.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit qt4 eutils
+inherit eutils toolchain-funcs qt4
 
 DESCRIPTION="A drawing editor which creates figures for inclusion in LaTeX documents and makes PDF presentations."
 HOMEPAGE="http://tclab.kaist.ac.kr/ipe/"
@@ -14,22 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="seamonkey"
 
-DEPEND=">=x11-libs/qt-core-4.2:4
-       >=x11-libs/qt-gui-4.2:4
+DEPEND=">=x11-libs/qt-core-4.5:4
+       >=x11-libs/qt-gui-4.5:4
        >=media-libs/freetype-2.1.8
        >=x11-libs/cairo-1.8.0
        >=dev-lang/lua-5.1
-       >=x11-libs/qt-core-4.5
-       >=x11-libs/qt-gui-4.5"
+       app-text/texlive-core"
 
 RDEPEND="${DEPEND}
-       virtual/latex-base
        !seamonkey? ( || ( www-client/mozilla-firefox
                www-client/mozilla-firefox-bin ) )
        seamonkey? ( || ( www-client/seamonkey
                www-client/seamonkey-bin ) )"
 
-S="${WORKDIR}/${P}/src"
+S=${S}/src
 
 search_urw_fonts() {
        local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"     # colon-separated list of paths
@@ -59,16 +57,15 @@ src_compile() {
        local myconf
        use seamonkey && myconf="IPEBROWSER=seamonkey"
        # fix detection of lua
-       sed -i -e 's/lua5.1/lua/g' config.mak
+       sed -i -e 's/lua5.1/lua/g' config.mak || die
        # don't strip installed binaries
-       sed -i -e 's/install -s/install/' common.mak
+       sed -i -e 's/install -s/install/' common.mak || die
 
        # -j1, since there are no deps in the Makefiles on libipe
-       emake -j1 $myconf IPEPREFIX="/usr" IPEDOCDIR="/usr/share/doc/${PF}" || die "emake failed"
+       emake -j1 CXX=$(tc-getCXX) $myconf IPEPREFIX="/usr" IPEDOCDIR="/usr/share/doc/${PF}" || die "emake failed"
 }
 
 src_install() {
        emake install IPEPREFIX="/usr" IPEDOCDIR="/usr/share/doc/${PF}" INSTALL_ROOT="${D}" || die "emake install failed"
-       cd "${WORKDIR}/${P}"
-       dodoc install.txt news.txt readme.txt
+       dodoc ../{news,readme}.txt || die
 }