Truetype support is not optional any more in this package thus removed truetype USE flag, fixes bug #248584, thank Diego E. 'Flameeyes' Pettenò for report. Respect CC and LDFLAGS.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

3 files changed, 22 insertions, 26 deletions

diff --git a/x11-misc/xmbdfed/ChangeLog b/x11-misc/xmbdfed/ChangeLog
index 670a839001ab..5282404ded1e 100644
--- a/x11-misc/xmbdfed/ChangeLog
+++ b/x11-misc/xmbdfed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xmbdfed
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.18 2008/03/16 22:00:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.19 2008/12/15 22:54:27 pva Exp $
+
+  15 Dec 2008; Peter Volkov <pva@gentoo.org> xmbdfed-4.7_p1.ebuild:
+  Truetype support is not optional any more in this package thus removed
+  truetype USE flag, fixes bug #248584, thank Diego E. 'Flameeyes' Pettenò
+  for report. Respect CC and LDFLAGS.
 
   16 Mar 2008; Ulrich Mueller <ulm@gentoo.org> xmbdfed-4.7_p1.ebuild:
   Remove calls to motif-config, fixes bug 211844.
diff --git a/x11-misc/xmbdfed/Manifest b/x11-misc/xmbdfed/Manifest
index 6047949ea46e..970c528fe463 100644
--- a/x11-misc/xmbdfed/Manifest
+++ b/x11-misc/xmbdfed/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xmbdfed-4.7_p1-gcc4.patch 784 RMD160 de8fe543f0d3a1eaa8a853e1094b0124c75748c5 SHA1 576df5ca7af674804e32e56f8664f13f558bfac3 SHA256 80362141ded71b5045ed66225734945f762bf17c9e75c446c2807e2b72152e9d
 DIST xmbdfed-4.7-patch1 549 RMD160 69880ceb0c055e569e9fae55740ac48bd472e4f6 SHA1 76e27d1fde66bd4bffdfc201be2476f3c2881cf4 SHA256 35dd9419ae1491da8343905f96ea4d5537cc4810d672f913ac0c0fcd801e2381
 DIST xmbdfed-4.7.tar.bz2 208877 RMD160 3df40c8061f2b84e01fdadd55904091c47d558e1 SHA1 d47e8b43d5326b0e09ac9e2808ce2f9510127e46 SHA256 d1807ae89238261738d6bf69e900eabdfe1f54cf110329ebde4b6a26cc134e65
-EBUILD xmbdfed-4.7_p1.ebuild 1303 RMD160 295a0c4a9c0811974f888c5030ecfb932056b2fe SHA1 4e195f3b253ed18a8529d195ae71d128d7731056 SHA256 8017ebd6b9a849cacc1be0a6b2d94ec349ac94f6f05c3719dc896ed114dac58d
-MISC ChangeLog 2377 RMD160 8b1ce17b20a8b51accfa7c223690ccd710f0368d SHA1 346c48167d5b9486359893716b45b6c4cd43ec6b SHA256 33241c47256f61cd483f92e69de2eefcb205b87ab0694ad5d970a0e43099248f
+EBUILD xmbdfed-4.7_p1.ebuild 1364 RMD160 5696de45ad350e4f0b6725538525c8f32ed596fe SHA1 e461df37bd8610c12ac82f33f9485554101ec58c SHA256 ee9c0c1c185226a6e5e9822a3f6d977e54dfd4b483fe2e3e523c488da0d9ff1f
+MISC ChangeLog 2633 RMD160 98961363420f38082d1c515cb78200f29eb9573b SHA1 e8d1cc6a49e26cd69860c6e26bea7b081551c1bf SHA256 379fb51d607bade9debc55c096c84c7a75af3292c29bd8f57f54ea5bfb1ed69a
 MISC metadata.xml 186 RMD160 f9c0cd0067910f83743571180499362e63c1bb34 SHA1 43794c2b15d9ecc45434cd22a06426daea0c119f SHA256 77b4ff7fa61d38152f48228d81bbf96b98b7bf9cec0a0ac22d70c99f84423125
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.8 (GNU/Linux)
-
-iEYEARECAAYFAkfdmHcACgkQOeoy/oIi7uzLEwCgzIo8Mj1HWzxkmhaWB67aMBmM
-E7AAn302TTlGpujjPTwpgHHKkKiijSS3
-=3f20
------END PGP SIGNATURE-----
diff --git a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
index 3849a4797558..e34fbe8db38b 100644
--- a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
+++ b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild,v 1.8 2008/03/16 22:00:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild,v 1.9 2008/12/15 22:54:27 pva Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 MY_P=${P/_p*}
 
 DESCRIPTION="BDF font editor for X"
@@ -13,10 +13,10 @@ HOMEPAGE="http://clr.nmsu.edu/~mleisher/xmbdfed.html"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc"
-IUSE="truetype"
+IUSE=""
 
 DEPEND=">=x11-libs/openmotif-2.3.0-r1
-	truetype? ( media-libs/freetype )"
+	media-libs/freetype"
 
 S=${WORKDIR}/${MY_P}
 
@@ -25,29 +25,30 @@ src_unpack() {
 	cd "${S}"
 	epatch "${DISTDIR}/${P/_p/-patch}"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	sed -e 's:\(-o xmbdfed \): $(LDFLAGS) \1:' -i Makefile || die
 }
 
 src_compile() {
 	# There's no ./configure in xmbdfed, so perform the make by manually
 	# specifying the correct options for Gentoo.
-
 	local flags=""
 	local incs=""
 	local libs="-lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE"
 
-	if use truetype ; then
-		flags="FTYPE_DEFS=\"-DHAVE_FREETYPE\""
-		incs="${incs} `freetype-config --cflags`"
-		libs="${libs} `freetype-config --libs`"
-	fi
+	flags="FTYPE_DEFS=\"-DHAVE_FREETYPE\""
+	incs="${incs} `freetype-config --cflags`"
+	libs="${libs} `freetype-config --libs`"
 
-	make CFLAGS="${CFLAGS}" ${flags} \
+	make CC=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" \
+		${flags} \
+		LDFLAGS="${LDFLAGS}" \
 		INCS="${incs}" \
 		LIBS="${libs}" || die
 }
 
 src_install() {
-	dobin xmbdfed
+	dobin xmbdfed || die
 	newman xmbdfed.man xmbdfed.1
-	dodoc CHANGES COPYRIGHTS INSTALL README xmbdfedrc
+	dodoc CHANGES README xmbdfedrc
 }