change installation to /usr from /usr/X11R6. Thanks to TGL <degrenier@easyconnect.fr> in bug #90803

(Portage version: 2.0.51.21-r1)

6 files changed, 24 insertions, 53 deletions

diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
index 5bce1674769b..9fa0d75e5323 100644
--- a/x11-misc/ttmkfdir/ChangeLog
+++ b/x11-misc/ttmkfdir/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/ttmkfdir
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.52 2005/02/08 02:46:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.53 2005/05/16 14:46:32 seemant Exp $
+
+*ttmkfdir-3.0.9-r3 (16 May 2005)
+
+  16 May 2005; Seemant Kulleen <seemant@gentoo.org> -ttmkfdir-3.0.9.ebuild,
+  -ttmkfdir-3.0.9-r1.ebuild, +ttmkfdir-3.0.9-r3.ebuild:
+  change installation to /usr from /usr/X11R6. Thanks to TGL
+  <degrenier@easyconnect.fr> in bug #90803
 
   07 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>;
   ttmkfdir-3.0.9-r2.ebuild:
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
index 63223ec2b484..f5ac4ed00b50 100644
--- a/x11-misc/ttmkfdir/Manifest
+++ b/x11-misc/ttmkfdir/Manifest
@@ -1,17 +1,15 @@
 MD5 1d35014dddf04eb2424298a4f4265c1c ChangeLog 6632
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 75330d289b3d82752c4d583db8011f92 ttmkfdir-3.0.9-r1.ebuild 1078
 MD5 ce12e4f3d2776f7cf7bd6b5ee2e0115b ttmkfdir-3.0.9-r2.ebuild 1270
-MD5 5344f69b72eabdc8b5634c5db34e0798 ttmkfdir-3.0.9.ebuild 896
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
+MD5 3a1acd97d933276b449cea889b824940 ttmkfdir-3.0.9-r3.ebuild 1366
 MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r2 66
 MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
 MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
 MD5 255516ccdde8cad5c8f7b6659f4bdde2 files/ttmkfdir-3.0.9-cpp.patch 505
 MD5 11a05e48e2bba01444957f6049353fc7 files/ttmkfdir-3.0.9-encoding.patch 2334
+MD5 5364b626b96f3a393fad212b3d99aa29 files/ttmkfdir-3.0.9-freetype_new_includes.patch 1199
 MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
 MD5 4a98d364009103c5afb6552165049585 files/ttmkfdir-3.0.9-gcc34.patch 878
 MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
 MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
-MD5 5364b626b96f3a393fad212b3d99aa29 files/ttmkfdir-3.0.9-freetype_new_includes.patch 1199
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r3 66
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r1 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r1
deleted file mode 100644
index 23c8357a597c..000000000000
--- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3
index 23c8357a597c..23c8357a597c 100644
--- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9
+++ b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r3
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild
index 88b8f4e8b0d0..c5283d7756ba 100644
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild,v 1.20 2005/02/08 02:46:34 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r3.ebuild,v 1.1 2005/05/16 14:46:32 seemant Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,27 +10,32 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/libc
 	sys-libs/zlib
 	>=media-libs/freetype-2.0.8"
+
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a-r5
 	sys-devel/libtool"
 
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
+	unpack ${A} ; cd ${S}
 	epatch ${FILESDIR}/${P}-cpp.patch
 	epatch ${FILESDIR}/${P}-zlib.patch
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-encoding.patch
+	# fix pack to work with new freetype include scheme (#44119)
+	epatch ${FILESDIR}/${P}-freetype_new_includes.patch
+
+	# Install into regular filesystem, not /usr/X11R6 hierarchy
+	sed -i "s:/usr/X11R6:/usr:" README ttmkfdir.cpp
 }
 
 src_compile() {
-	filter-flags -O -O1 -O2 -O3
+	filter-flags -O -O? -foptimize-sibling-calls -fstack-protector
 	emake \
 		CXX="$(tc-getCXX)" \
 		OPTFLAGS="${CFLAGS}" \
@@ -39,7 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/X11R6/bin
-	doexe ttmkfdir || die "doexe failed"
+	into /usr
+	dobin ttmkfdir || die "doexe failed"
 	dodoc README
 }
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild
deleted file mode 100644
index 99213a643f0f..000000000000
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild,v 1.16 2005/02/08 02:46:34 spyderous Exp $
-
-IUSE=""
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha hppa ia64 mips"
-
-DEPEND=">=media-libs/freetype-2.0.8
-	>=sys-devel/flex-2.5.4a-r5
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}; epatch ${FILESDIR}/${P}-gcc33.patch
-}
-
-src_compile() {
-	filter-flags "-O -O1 -O2 -O3"
-	make CXX="$(tc-getCXX)" \
-		OPTFLAGS="${CFLAGS}" DEBUG="" || die
-}
-
-src_install() {
-	exeinto /usr/X11R6/bin
-	doexe ${S}/ttmkfdir
-
-	dodoc ${S}/README
-}