Added emf use flag which pulls libemf (only on non amd64), bug #133290.

(Portage version: 2.1_rc1-r3)

4 files changed, 19 insertions, 10 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index abbb7a51b73b..42a6b4e84d8e 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pstoedit
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.23 2006/04/13 19:17:45 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.24 2006/05/21 17:06:34 ehmsen Exp $
+
+  21 May 2006; Martin Ehmsen <ehmsen@gentoo.org> pstoedit-3.42.ebuild:
+  Added emf use flag which pulls libemf (only on non amd64), thanks to whereami 
+  <whereami@gmail.com>, bug #133290.
 
   13 Apr 2006; Patrick McLean <chutzpah@gentoo.org> pstoedit-3.33.ebuild,
   pstoedit-3.40.ebuild, pstoedit-3.42.ebuild:
diff --git a/media-gfx/pstoedit/files/digest-pstoedit-3.40 b/media-gfx/pstoedit/files/digest-pstoedit-3.40
index 3eae5bfacb2c..37adbc152fc4 100644
--- a/media-gfx/pstoedit/files/digest-pstoedit-3.40
+++ b/media-gfx/pstoedit/files/digest-pstoedit-3.40
@@ -1 +1,3 @@
 MD5 cfad18cec035a3b8a13c1e2b960a24fe pstoedit-3.40.tar.gz 791425
+RMD160 e55d6b5086a3fd76334ef488a081d8cbde023389 pstoedit-3.40.tar.gz 791425
+SHA256 868b54e62de25628d3d4e038ec0543399f8f791dd9272620685bd88073518869 pstoedit-3.40.tar.gz 791425
diff --git a/media-gfx/pstoedit/files/digest-pstoedit-3.42 b/media-gfx/pstoedit/files/digest-pstoedit-3.42
index a0d04573d761..7f764b62eb99 100644
--- a/media-gfx/pstoedit/files/digest-pstoedit-3.42
+++ b/media-gfx/pstoedit/files/digest-pstoedit-3.42
@@ -1 +1,3 @@
 MD5 be262030dd15bc18cac03fda98f9871b pstoedit-3.42.tar.gz 807598
+RMD160 8ed9827bf7626cbeff07f050322cc60e48e091bc pstoedit-3.42.tar.gz 807598
+SHA256 fcdddaee451c365b61c7f14e4b009b45b7d19ab4e09b6028b856bfa8b9ae3b6e pstoedit-3.42.tar.gz 807598
diff --git a/media-gfx/pstoedit/pstoedit-3.42.ebuild b/media-gfx/pstoedit/pstoedit-3.42.ebuild
index 54a34f125611..336b2d24b5b9 100644
--- a/media-gfx/pstoedit/pstoedit-3.42.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.42.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.42.ebuild,v 1.2 2006/04/13 19:17:45 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.42.ebuild,v 1.3 2006/05/21 17:06:34 ehmsen Exp $
 
 inherit libtool
 
 # see bug #29724. please don't re-enable flash support until
 # ming has the patches applied <obz@gentoo.org>
-# secondly, we're not enabling libemf via a use flag, until it's
-# actually switchable via configure, see bug #39557
-# IUSE="flash libemf"
-IUSE="plotutils"
+# IUSE="flash emf"
+IUSE="plotutils emf"
 
 DESCRIPTION="translates PostScript and PDF graphics into other vector formats"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -17,10 +15,10 @@ HOMEPAGE="http://www.pstoedit.net/pstoedit"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="sys-libs/zlib
-	media-libs/libemf
+	!amd64? ( emf? ( media-libs/libemf ) )
 	media-libs/libpng
 	media-libs/libexif
 	plotutils? ( media-libs/plotutils )"
@@ -40,9 +38,12 @@ src_unpack() {
 src_compile() {
 
 	local myconf=""
-	# checking if libemf is previously installed, bug #29724
-	[ -f /usr/include/libEMF/emf.h ] \
+	if ! use amd64 && use emf ; then
+		myconf="${myconf} $(use_with emf)"
+		# bug #29724
+		[ -f /usr/include/libEMF/emf.h ] \
 		&& myconf="${myconf} --with-libemf-include=/usr/include/libEMF"
+	fi
 
 	elibtoolize
 	econf ${myconf} $(use_with plotutils libplot) || die "econf failed"