Don't install t1asm and getafm. They conflict with t1lib (t1asm) and psutils (getafm). This closes bug #53261. Marked -r4 stable on x86, alpha and ppc.

5 files changed, 20 insertions, 14 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 6a9d21e1e18d..c2389729c4b0 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.56 2004/10/11 05:27:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.57 2004/10/17 06:52:25 usata Exp $
+
+  17 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> freetype-1.3.1-r3.ebuild,
+  freetype-1.3.1-r4.ebuild:
+  Don't install t1asm and getafm. They conflict with t1lib (t1asm) and
+  psutils (getafm). This closes bug #53261. Marked -r4 stable on x86,
+  alpha and ppc.
 
   10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   freetype-2.1.5-r1.ebuild, freetype-2.1.9.ebuild:
diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r3.ebuild
index 840d3ee71fb1..d68d55876617 100644
--- a/media-libs/freetype/freetype-1.3.1-r3.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.27 2004/07/14 19:35:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.28 2004/10/17 06:52:25 usata Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -80,11 +80,11 @@ src_install() {
 	dodoc docs/*.txt docs/FAQ docs/TODO
 	dohtml -r docs
 
-	# install contrib utils
+	# install contrib utils, omit t1asm (conflicts with t1lib)
+	# and getafm (conflicts with psutils)
 	cd ${S}/freetype1-contrib
 	into /usr
-	dobin ttf2bdf/ttf2bdf \
-		ttf2pfb/getafm ttf2pfb/t1asm ttf2pfb/.libs/ttf2pfb \
+	dobin ttf2bdf/ttf2bdf ttf2pfb/.libs/ttf2pfb \
 		ttf2pk/.libs/ttf2pk ttf2pk/.libs/ttf2tfm \
 		ttfbanner/.libs/ttfbanner \
 		|| die
diff --git a/media-libs/freetype/freetype-1.3.1-r4.ebuild b/media-libs/freetype/freetype-1.3.1-r4.ebuild
index b49386773931..0d0a4f09a880 100644
--- a/media-libs/freetype/freetype-1.3.1-r4.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r4.ebuild,v 1.7 2004/10/05 09:49:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r4.ebuild,v 1.8 2004/10/17 06:52:25 usata Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -25,7 +25,7 @@ SRC_URI="ftp://ftp.freetype.org/freetype/freetype1/${P}.tar.gz
 
 LICENSE="FTL"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64 ppc64"
+KEYWORDS="x86 ppc ~sparc alpha ~arm ~hppa ~amd64 ~ia64 ppc64"
 IUSE="nls tetex"
 
 DEPEND="virtual/libc
@@ -85,11 +85,11 @@ src_install() {
 	dodoc docs/*.txt docs/FAQ docs/TODO
 	dohtml -r docs
 
-	# install contrib utils
+	# install contrib utils, omit t1asm (conflicts with t1lib)
+	# and getafm (conflicts with psutils)
 	cd ${S}/freetype1-contrib
 	into /usr
-	dobin ttf2bdf/ttf2bdf \
-		ttf2pfb/getafm ttf2pfb/t1asm ttf2pfb/.libs/ttf2pfb \
+	dobin ttf2bdf/ttf2bdf ttf2pfb/.libs/ttf2pfb \
 		ttf2pk/.libs/ttf2pk ttf2pk/.libs/ttf2tfm \
 		ttfbanner/.libs/ttfbanner \
 		|| die
diff --git a/media-libs/freetype/freetype-2.1.5-r1.ebuild b/media-libs/freetype/freetype-2.1.5-r1.ebuild
index ef3e7ded5162..f9107825936f 100644
--- a/media-libs/freetype/freetype-2.1.5-r1.ebuild
+++ b/media-libs/freetype/freetype-2.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5-r1.ebuild,v 1.17 2004/10/11 05:27:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5-r1.ebuild,v 1.18 2004/10/17 06:52:25 usata Exp $
 
 inherit eutils flag-o-matic gnuconfig libtool
 
@@ -8,7 +8,7 @@ DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2"
 
-LICENSE="FTL | GPL-2"
+LICENSE="|| ( FTL GPL-2 )"
 SLOT="2"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 macos ppc-macos"
 IUSE="zlib bindist cjk doc"
diff --git a/media-libs/freetype/freetype-2.1.5.ebuild b/media-libs/freetype/freetype-2.1.5.ebuild
index 043030caef63..4d2030b16cad 100644
--- a/media-libs/freetype/freetype-2.1.5.ebuild
+++ b/media-libs/freetype/freetype-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5.ebuild,v 1.13 2004/09/16 02:02:16 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.5.ebuild,v 1.14 2004/10/17 06:52:25 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.freetype.org/"
 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2"
 
 SLOT="2"
-LICENSE="FTL | GPL-2"
+LICENSE="|| ( FTL GPL-2 )"
 KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~ia64 ~amd64 ppc64 macos ppc-macos"
 IUSE="bindist doc zlib"