Block media-gfx/fontforge. Marked 031123 stable on x86.

5 files changed, 21 insertions, 9 deletions

diff --git a/media-gfx/pfaedit/ChangeLog b/media-gfx/pfaedit/ChangeLog
index 7cd209d08b2f..ca3a561ebe87 100644
--- a/media-gfx/pfaedit/ChangeLog
+++ b/media-gfx/pfaedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pfaedit
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/ChangeLog,v 1.15 2004/04/26 02:31:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/ChangeLog,v 1.16 2004/05/17 17:26:36 usata Exp $
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> pfaedit-030512.ebuild,
+  pfaedit-031123.ebuild:
+  Block media-gfx/fontforge. Marked 031123 stable on x86.
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> pfaedit-030512.ebuild,
   pfaedit-031123.ebuild:
diff --git a/media-gfx/pfaedit/Manifest b/media-gfx/pfaedit/Manifest
index 6181a781f947..27cd13812a94 100644
--- a/media-gfx/pfaedit/Manifest
+++ b/media-gfx/pfaedit/Manifest
@@ -1,5 +1,6 @@
-MD5 bbdcde0383ecd74db594284de19397b8 pfaedit-031123.ebuild 1014
-MD5 256befbc6598380d3dca42ee246d40e8 pfaedit-030512.ebuild 1029
-MD5 e9bb5bf15b9cc62537e651175faf3812 ChangeLog 2096
+MD5 2444d96ddf82361016e99e5f23eebeaa pfaedit-030512.ebuild 1049
+MD5 f97e871460fc8406cfb23201a542e164 ChangeLog 2249
+MD5 f9133f7ab6cb22e1b5977a8342b0e1f0 pfaedit-031123.ebuild 1032
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 MD5 4b3e9e065c72a643c085a5a796357c67 files/digest-pfaedit-030512 69
 MD5 1c6f957f65cfbc2d2fdd3d576a35bb87 files/digest-pfaedit-031123 69
diff --git a/media-gfx/pfaedit/metadata.xml b/media-gfx/pfaedit/metadata.xml
new file mode 100644
index 000000000000..696065edd338
--- /dev/null
+++ b/media-gfx/pfaedit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>fonts</herd>
+</pkgmetadata>
diff --git a/media-gfx/pfaedit/pfaedit-030512.ebuild b/media-gfx/pfaedit/pfaedit-030512.ebuild
index 38ad69a8b458..b66f44fd5f9a 100644
--- a/media-gfx/pfaedit/pfaedit-030512.ebuild
+++ b/media-gfx/pfaedit/pfaedit-030512.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/pfaedit-030512.ebuild,v 1.9 2004/04/26 02:31:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/pfaedit-030512.ebuild,v 1.10 2004/05/17 17:26:36 usata Exp $
 
 inherit flag-o-matic
 
@@ -17,7 +17,8 @@ DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	gif? ( >=media-libs/libungif-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
+	truetype? ( >=media-libs/freetype-2.1.2 )
+	!media-gfx/fontforge"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/media-gfx/pfaedit/pfaedit-031123.ebuild b/media-gfx/pfaedit/pfaedit-031123.ebuild
index e744e894e548..dcf469972e3e 100644
--- a/media-gfx/pfaedit/pfaedit-031123.ebuild
+++ b/media-gfx/pfaedit/pfaedit-031123.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/pfaedit-031123.ebuild,v 1.6 2004/04/26 02:31:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pfaedit/pfaedit-031123.ebuild,v 1.7 2004/05/17 17:26:36 usata Exp $
 
 inherit flag-o-matic
 
@@ -10,14 +10,15 @@ SRC_URI="mirror://sourceforge/${PN}/pfaedit_full-${PV}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 alpha ~ppc ~amd64"
+KEYWORDS="x86 alpha ~ppc ~amd64"
 IUSE="png gif jpeg tiff truetype X"
 
 DEPEND="png? ( >=media-libs/libpng-1.2.4 )
 	gif? ( >=media-libs/libungif-4.1.0-r1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7-r1 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
+	truetype? ( >=media-libs/freetype-2.1.2 )
+	!media-gfx/fontforge"
 
 src_compile() {
 	local myconf=""