Fix path for X binaries to /usr/bin, as per bug #140590.

Package-Manager: portage-2.1.1_pre2-r8

3 files changed, 30 insertions, 16 deletions

diff --git a/media-fonts/monafont/ChangeLog b/media-fonts/monafont/ChangeLog
index b48e870aa074..3191e5c2a3fe 100644
--- a/media-fonts/monafont/ChangeLog
+++ b/media-fonts/monafont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/monafont
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.22 2006/07/11 19:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.23 2006/07/16 08:34:11 flameeyes Exp $
+
+  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  monafont-2.90-r2.ebuild:
+  Fix path for X binaries to /usr/bin, as per bug #140590.
 
   11 Jul 2006; Aron Griffis <agriffis@gentoo.org> monafont-2.90-r2.ebuild:
   Mark 2.90-r2 stable on ia64
diff --git a/media-fonts/monafont/Manifest b/media-fonts/monafont/Manifest
index 766891d5048f..feae241932d8 100644
--- a/media-fonts/monafont/Manifest
+++ b/media-fonts/monafont/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST monafont-2.90.tar.bz2 808897 RMD160 1b5dbd521581f05bd26e8339b316e0207be3c7a1 SHA1 6106097a74afed072b3c49555356c5cb88cec172 SHA256 26e608598edb2c9f1a662acd8bf4e06dc75910a69fc76698e4e062113a401978
 DIST monafont-ttf-2.90.zip 1712768 RMD160 92947e25c73f114d5720d23b629cdf9536875fe3 SHA1 0bf207d2b0c0cbe5610aad820996305645eddbff SHA256 06b324342ad13ea06a7e74811e1334a28cc52a1a16f9a326a919249622daeed6
 EBUILD monafont-2.90-r1.ebuild 1662 RMD160 f4950c61f6d16493678f42e8f739924d355461eb SHA1 83db67f68959a4a9e3aa96b0f849366ee631b12f SHA256 cf2f215d6fdb9775fbd9099834580cdf42c8e12426d142546163d71579dae540
 MD5 25f6259ee6887da579227e98d58ca895 monafont-2.90-r1.ebuild 1662
 RMD160 f4950c61f6d16493678f42e8f739924d355461eb monafont-2.90-r1.ebuild 1662
 SHA256 cf2f215d6fdb9775fbd9099834580cdf42c8e12426d142546163d71579dae540 monafont-2.90-r1.ebuild 1662
-EBUILD monafont-2.90-r2.ebuild 1687 RMD160 156e975be660b70db37433d9f52d8079153ade0f SHA1 c2a6fb1eca9d026f3fc5175b86d97136c5a2fbca SHA256 135f5db5540faebb1107f23a41f5ade5260be3d25e34154552f14e6090cbcd57
-MD5 961bc7cee153f67c58c2f540501efabb monafont-2.90-r2.ebuild 1687
-RMD160 156e975be660b70db37433d9f52d8079153ade0f monafont-2.90-r2.ebuild 1687
-SHA256 135f5db5540faebb1107f23a41f5ade5260be3d25e34154552f14e6090cbcd57 monafont-2.90-r2.ebuild 1687
-MISC ChangeLog 3230 RMD160 8f80562830477b5b1c14d0e2e91022bda4f1c4ea SHA1 81831dcda3a1c5dac5930abb8c7f883b8ee4d9f4 SHA256 983fa890f321010a5ee7a379a66c84b01c0e51d1677fe223739fd13141e463e9
-MD5 c16098027ab3c8012b1ea91072978dfe ChangeLog 3230
-RMD160 8f80562830477b5b1c14d0e2e91022bda4f1c4ea ChangeLog 3230
-SHA256 983fa890f321010a5ee7a379a66c84b01c0e51d1677fe223739fd13141e463e9 ChangeLog 3230
+EBUILD monafont-2.90-r2.ebuild 1739 RMD160 cc06ff39953a11f41686235aceabf680ae3e61f5 SHA1 778b3cfb57d11c02229fa2ab18ff786d16f282ae SHA256 8678a00bf9ad50181749b9955be8f4f79543f1518f42d43a71235fa9bf40ec62
+MD5 b598aef502cbded689c01136a2c218cd monafont-2.90-r2.ebuild 1739
+RMD160 cc06ff39953a11f41686235aceabf680ae3e61f5 monafont-2.90-r2.ebuild 1739
+SHA256 8678a00bf9ad50181749b9955be8f4f79543f1518f42d43a71235fa9bf40ec62 monafont-2.90-r2.ebuild 1739
+MISC ChangeLog 3371 RMD160 6f0fe9f6bcf096439393445d8176331da899f0f5 SHA1 db074656e5f19d319534cb6464326b9f3f88365b SHA256 666e3253b164e3353da80ac3c57893b84e56cf85f93d1b5e8409938065b028a9
+MD5 fc3a55453a750ee622c23f9ba58f87c3 ChangeLog 3371
+RMD160 6f0fe9f6bcf096439393445d8176331da899f0f5 ChangeLog 3371
+SHA256 666e3253b164e3353da80ac3c57893b84e56cf85f93d1b5e8409938065b028a9 ChangeLog 3371
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e metadata.xml 175
@@ -22,3 +25,10 @@ SHA256 41e1ad68058f0a630cc84a28d3ab7386c9c1273461c98b3288e00aa4a1ff6e01 files/di
 MD5 de70dc7e8c78eb919fa90e85df9f6096 files/digest-monafont-2.90-r2 491
 RMD160 53efef297785a779606be228420b74e182202c13 files/digest-monafont-2.90-r2 491
 SHA256 41e1ad68058f0a630cc84a28d3ab7386c9c1273461c98b3288e00aa4a1ff6e01 files/digest-monafont-2.90-r2 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEufokAiZjviIA2XgRAvbeAKCX9ev5ZOYSR86I9fSCfmdC8MN+LACeOyzR
+QtKmdAhFkwEmIkwESucP668=
+=ox7q
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index 8efec5494b02..61685badd6e4 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.2 2006/07/11 19:55:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.3 2006/07/16 08:34:11 flameeyes Exp $
 
 inherit font
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="truetype"
 
-DEPEND="|| ( ( x11-apps/bdftopcf x11-apps/mkfontdir ) virtual/x11 )
+DEPEND="|| ( ( x11-apps/bdftopcf x11-apps/mkfontdir ) <virtual/x11-7 )
 		dev-lang/perl
 		>=sys-apps/sed-4
 		app-arch/unzip"
@@ -35,18 +35,18 @@ src_unpack() {
 src_compile() {
 	PERL_BADLANG=0 ; LC_CTYPE=C
 	export PERL_BADLANG LC_CTYPE
-	emake || die
+	emake X11BINDIR="/usr/bin" || die
 }
 
 src_install() {
-	make install X11FONTDIR="${D}/${FONTDIR}" || die
-	mkfontdir ${D}/${FONTDIR}
-	insinto ${FONTDIR}
+	make install X11BINDIR="/usr/bin" X11FONTDIR="${D}/${FONTDIR}" || die
+	mkfontdir "${D}/${FONTDIR}"
+	insinto "${FONTDIR}"
 	newins fonts.alias.mona fonts.alias
 	dodoc README*
 
 	if use truetype ; then
-		DOCS=${WORKDIR}/README-ttf.txt
+		DOCS="${WORKDIR}/README-ttf.txt"
 		font_src_install
 	fi
 }