media-gfx/ipe: Version bump for ipe

svn path=/sunrise/; revision=9494

3 files changed, 24 insertions, 30 deletions

diff --git a/media-gfx/ipe/ChangeLog b/media-gfx/ipe/ChangeLog
index c90b82772..8ae29e542 100644
--- a/media-gfx/ipe/ChangeLog
+++ b/media-gfx/ipe/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+
   08 Jul 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   ipe-6.0_pre31.ebuild:
   Move from monolithic to split qt dependencies
diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
index f5ba6d050..54648cf1b 100644
--- a/media-gfx/ipe/Manifest
+++ b/media-gfx/ipe/Manifest
@@ -1,4 +1,4 @@
-DIST ipe-6.0pre31-src.tar.gz 949492 RMD160 088de15222b7af83ff65132eebfc458dc0c13b0a SHA1 9ac3ad251bcc7825f5d33be27b0cd1f0319604f6 SHA256 aab735fec5746234019a96564ea5c443915168f68f0e170556d25b82bfd9b891
-EBUILD ipe-6.0_pre31.ebuild 2141 RMD160 a7622b65ea32c0b711b2e26bdee1f6b1b13e74c9 SHA1 99543f9808f7bd64f62b0cb7d4ff864b7b7fdf89 SHA256 98c779c47c945a64908075958d5f1ae42c4ed5add646d4c122978c9ac6287331
-MISC ChangeLog 3953 RMD160 96c3e9a72ae71ae3c70a4f2158b82330b38adda3 SHA1 e46ba6727cab60340ed4766037528df8236932cc SHA256 d215c35e1b9b1c5b5ec63a83672f9f45afb386b043fc033b470c02af8be0f7c6
+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
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-gfx/ipe/ipe-6.0_pre31.ebuild b/media-gfx/ipe/ipe-7.0.8.ebuild
index 915e7fc16..d11805cba 100644
--- a/media-gfx/ipe/ipe-6.0_pre31.ebuild
+++ b/media-gfx/ipe/ipe-7.0.8.ebuild
@@ -5,20 +5,23 @@
 EAPI="1"
 inherit qt4 eutils
 
-MY_P="${P/_/}"
 DESCRIPTION="A drawing editor which creates figures for inclusion in LaTeX documents and makes PDF presentations."
 HOMEPAGE="http://tclab.kaist.ac.kr/ipe/"
-SRC_URI="http://luaforge.net/frs/download.php/3824/${MY_P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/ipe7/ipe/${P}-src.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="seamonkey"
 
 DEPEND=">=x11-libs/qt-core-4.2:4
 	>=x11-libs/qt-gui-4.2:4
-	>=media-libs/freetype-2.1.8"
-# The virtual/tetex dep is for pdfLaTeX and URW fonts.
+	>=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"
+
 RDEPEND="${DEPEND}
 	virtual/latex-base
 	!seamonkey? ( || ( www-client/mozilla-firefox
@@ -26,7 +29,7 @@ RDEPEND="${DEPEND}
 	seamonkey? ( || ( www-client/seamonkey
 		www-client/seamonkey-bin ) )"
 
-S="${WORKDIR}/${MY_P}/src"
+S="${WORKDIR}/${P}/src"
 
 search_urw_fonts() {
 	local texmfdist="$(kpsewhich -var-value=TEXMFDIST)"	# colon-separated list of paths
@@ -43,11 +46,6 @@ search_urw_fonts() {
 }
 
 pkg_setup() {
-	if has_version ">=x11-libs/qt-4.2.2" ; then
-		QT4_BUILT_WITH_USE_CHECK="qt3support"
-		qt4_pkg_setup
-	fi
-
 	if search_urw_fonts; then
 		einfo "URW fonts found in ${URWFONTDIR}."
 	else
@@ -60,25 +58,17 @@ src_compile() {
 	# Ipe's default browser is Firefox
 	local myconf
 	use seamonkey && myconf="IPEBROWSER=seamonkey"
+	# fix detection of lua
+	sed -i -e 's/lua5.1/lua/g' config.mak
+	# don't strip installed binaries
+	sed -i -e 's/install -s/install/' common.mak
 
-	eqmake4 main.pro \
-		${myconf} \
-		"IPEPREFIX=/usr" \
-		"IPEDOCDIR=/usr/share/doc/${PF}"
-	emake || die "emake failed"
+	# -j1, since there are no deps in the Makefiles on libipe
+	emake -j1 $myconf IPEPREFIX="/usr" IPEDOCDIR="/usr/share/doc/${PF}" || die "emake failed"
 }
 
 src_install() {
-	emake install INSTALL_ROOT="${D}" || die "emake install failed"
-
-	cd "${WORKDIR}"/${MY_P}
-	local fontmapdir=/usr/share/${PN}/${MY_P/${PN}-/}
-	if [ -n ${URWFONTDIR} ]; then
-		einfo "Creating fontmap ..."
-		sed -e "s:/usr/share/texmf/fonts/type1/urw:${URWFONTDIR}:" \
-			tetex-fontmap.xml > "${D}/${fontmapdir}/fontmap.xml"
-		eend $?
-	fi
-
+	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
 }