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

Package-Manager: portage-2.1_rc1-r3

5 files changed, 55 insertions, 28 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/Manifest b/media-gfx/pstoedit/Manifest
index 6d927de9a438..d815f386a266 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,24 +1,42 @@
-MD5 926d7b15fa2b2a2178f3ecf823c63f90 ChangeLog 3429
-RMD160 1a07f9b01fcb9f052741bb709a3cb7893cf88afa ChangeLog 3429
-SHA256 67b95a314fdde99a22f2617bc4d0565cea5ef9b10f87eee717ccfa365b1fe7c0 ChangeLog 3429
-MD5 a907639a46bec91770facf3dda3db0b6 files/digest-pstoedit-3.33 65
-RMD160 c40fad0752d511b3c6ab749ae0ad46e4b80e6cf9 files/digest-pstoedit-3.33 65
-SHA256 9b1617063307b58241e0577ca73323602935a9dda47487f2ce01527296747265 files/digest-pstoedit-3.33 65
-MD5 b4ab64e60b0732f6b73230e7834dc110 files/digest-pstoedit-3.40 65
-RMD160 13b2af44f9742ee0a1b378ca2ca0c4a33eeb309b files/digest-pstoedit-3.40 65
-SHA256 a383ccc0d17abfd76440749a52a2e5060da8803be38aaa6855579063bfd1ba44 files/digest-pstoedit-3.40 65
-MD5 0ab11abda10b4e03161ae0fe955f4bdc files/digest-pstoedit-3.42 65
-RMD160 f568efe190925cd87c0b6d4d3f42cedd03308c3f files/digest-pstoedit-3.42 65
-SHA256 19d9991f17d67568bf4aabd686a1a4d5a7b26a7f182f1566b53b190661e4def6 files/digest-pstoedit-3.42 65
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
-SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST pstoedit-3.33.tar.gz 729661 size 729661
+DIST pstoedit-3.40.tar.gz 791425 RMD160 e55d6b5086a3fd76334ef488a081d8cbde023389 SHA256 868b54e62de25628d3d4e038ec0543399f8f791dd9272620685bd88073518869 size 791425
+DIST pstoedit-3.42.tar.gz 807598 RMD160 8ed9827bf7626cbeff07f050322cc60e48e091bc SHA256 fcdddaee451c365b61c7f14e4b009b45b7d19ab4e09b6028b856bfa8b9ae3b6e size 807598
+EBUILD pstoedit-3.33.ebuild 1468 RMD160 4c3ec2d17c76ec3b7924f770e62e6891bf1da92a SHA1 ea501134a3c741f977866704328756a9d90b077f SHA256 df5ec259a32bf647a2018a763191f58089f4c0b13bf8d0bb5186e02fd8fd5f48 size 1468
 MD5 86c19385f574e106c3f3f7c75fb98a64 pstoedit-3.33.ebuild 1468
 RMD160 4c3ec2d17c76ec3b7924f770e62e6891bf1da92a pstoedit-3.33.ebuild 1468
 SHA256 df5ec259a32bf647a2018a763191f58089f4c0b13bf8d0bb5186e02fd8fd5f48 pstoedit-3.33.ebuild 1468
+EBUILD pstoedit-3.40.ebuild 1519 RMD160 7ab0138c41b4ba5f08a789d1cff4567ca9f839c8 SHA1 13bf03c2a697d6329e219d8d997d8ff085f875f2 SHA256 746c96760b5f88bc867a329b3958bce0acab92d167bac6bfb6b9fd12c66bc65e size 1519
 MD5 5a91f05aed2595611256f48111e9c91b pstoedit-3.40.ebuild 1519
 RMD160 7ab0138c41b4ba5f08a789d1cff4567ca9f839c8 pstoedit-3.40.ebuild 1519
 SHA256 746c96760b5f88bc867a329b3958bce0acab92d167bac6bfb6b9fd12c66bc65e pstoedit-3.40.ebuild 1519
-MD5 8cbb7428c5607e50d82538ff0d20fa0e pstoedit-3.42.ebuild 1532
-RMD160 a0fc81a517796063676deaefa17b15d5956cf4ef pstoedit-3.42.ebuild 1532
-SHA256 ebf7ff22b282855e8195111fc7fbcaee3d214260f42b026e6f9fe07523007e94 pstoedit-3.42.ebuild 1532
+EBUILD pstoedit-3.42.ebuild 1475 RMD160 ee75b78cdab7eaf59a3bde7edb25e167ce3a6e8a SHA1 285e6f312fe7533cc307deeb8150b03ecec2466b SHA256 22a5de93d299dff1a3c78a5c2c85b441f13f5b4a7d98b19ed9d41ebe9763c57e size 1475
+MD5 40f65b11b1a340b1aecb98e407d106d6 pstoedit-3.42.ebuild 1475
+RMD160 ee75b78cdab7eaf59a3bde7edb25e167ce3a6e8a pstoedit-3.42.ebuild 1475
+SHA256 22a5de93d299dff1a3c78a5c2c85b441f13f5b4a7d98b19ed9d41ebe9763c57e pstoedit-3.42.ebuild 1475
+MISC ChangeLog 3617 RMD160 ca3c307671b9bb892a1734771507e0c95f67c6c9 SHA1 0fc4edb88d29a59dff16e8becbc726550ea39557 SHA256 f1e98ca229564b1a94dd674ae37696dbd18f1aca30017cd739d5a089a32408e4 size 3617
+MD5 0f6a1302145e040992a50f880c3a199f ChangeLog 3617
+RMD160 ca3c307671b9bb892a1734771507e0c95f67c6c9 ChangeLog 3617
+SHA256 f1e98ca229564b1a94dd674ae37696dbd18f1aca30017cd739d5a089a32408e4 ChangeLog 3617
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 a907639a46bec91770facf3dda3db0b6 files/digest-pstoedit-3.33 65
+RMD160 c40fad0752d511b3c6ab749ae0ad46e4b80e6cf9 files/digest-pstoedit-3.33 65
+SHA256 9b1617063307b58241e0577ca73323602935a9dda47487f2ce01527296747265 files/digest-pstoedit-3.33 65
+MD5 a2dccfec9323cfd1cd451624edfde101 files/digest-pstoedit-3.40 241
+RMD160 de4704ee74a2f28c01362bf0a436f50e42485285 files/digest-pstoedit-3.40 241
+SHA256 acc74f263083be57bba738873f3ac81420d3ace58aaa55bdbeb76fa871af7c07 files/digest-pstoedit-3.40 241
+MD5 82b93d5f23ce148465049abd258c3818 files/digest-pstoedit-3.42 241
+RMD160 1cd1e9bac1450f1c7d5003296173fc9f41b020ae files/digest-pstoedit-3.42 241
+SHA256 20458319695a5807b44e57c85fb3d02d9f4a8e4dbfbb134a4d77266397552dab files/digest-pstoedit-3.42 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEcJ5mzxUa4FWw6mwRAv9NAJ4iIZ2krfaTi5z4feX/hYN5zmlF0ACfaNX3
++qsbI1JSNlLT4VIP0qZ6N7U=
+=G9um
+-----END PGP SIGNATURE-----
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"