Version bump, bug #238415 reported by Arfrever Frehtes Taifersar Arahesis. Fixes missing glyph problem, bug #233363, reported by Alexey Charkov. Added +pcf, +psf and raw USE flags so now you can select what font formats you are interested in, fixes bug #228793 reported by Nikita Ofitserov. Removed broken ebuild.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 62 insertions, 35 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index e20b6834b2d5..c03b4277564a 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.60 2008/08/17 06:31:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.61 2008/10/06 07:22:36 pva Exp $
+
+*terminus-font-4.28 (06 Oct 2008)
+
+  06 Oct 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  -terminus-font-4.26-r2.ebuild, +terminus-font-4.28.ebuild:
+  Version bump, bug #238415 reported by Arfrever Frehtes Taifersar Arahesis.
+  Fixes missing glyph problem, bug #233363, reported by Alexey Charkov.
+  Added +pcf, +psf and raw USE flags so now you can select what font formats
+  you are interested in, fixes bug #228793 reported by Nikita Ofitserov.
+  Removed broken ebuild.
 
   17 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 9ae4b9c7bf4d..8eb49e06119d 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,28 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST terminus-font-4.20.tar.gz 201816 RMD160 f7e8a3d6990d036d00c748dbb5ba466e3694e708 SHA1 f8215f8236e72423c4720956587cbda4eeea9176 SHA256 fe10b94591e77fd49a0dee00976e31cc3378fef74a6ec1fc93022e6479e1d687
-DIST terminus-font-4.26-ao2.diff.gz 3567 RMD160 a0db35927f06e6466b3baa61d20869cf7707b191 SHA1 80e0be9902ac955f4d7479097d2288e2cb6f3112 SHA256 e544279b54088198e95e599b2b3b0864661fe13b4599779b84c363b4c591d450
-DIST terminus-font-4.26-cm2.diff.gz 1380 RMD160 09e926e628e893f4b6d32aefd1ac45cf4d1fc296 SHA1 92a4cf0e0eafce7ea69a87494820f3e812e7d339 SHA256 5bc0bca82dd3fb33d3e81f81f364d11273eaa712427ba247669d4c328edad986
-DIST terminus-font-4.26-dv1.diff.gz 1184 RMD160 0631b56255a9158ed501e8aaadc7f0162ecff57d SHA1 ab8c32090996eeb48b349fde544aeeb744242034 SHA256 d6d8e822ef72399051342d85ddd9c9cd508b09ba6688d5aac577c21ad43647ea
-DIST terminus-font-4.26-ge1.diff.gz 1041 RMD160 c3977b3bd57e930ac2e4094a46152f70662e9718 SHA1 c69df1c565a1d1a0ba78e403d46685d0664bb739 SHA256 35b5f903b4c11f2ff0388a9f96323868f2e363697cd65b297292b6a56a319c64
-DIST terminus-font-4.26-gq2.diff.gz 574 RMD160 19caed681b93d32b228cb23d57eb79b82d668f88 SHA1 edf4ea7d54e9f33c85bc5e81befe67a09b4c41d4 SHA256 5a753a4bb9399e53b8c7df7e93f4085b183fbbc88dd19001832bd707287213ea
-DIST terminus-font-4.26-ij1.diff.gz 1373 RMD160 882b636679014f5a582ef585bb95d7db199011d0 SHA1 7672e9a7ced336ce3f061cb50e9cbfaa569bf96c SHA256 c3059cdac8b01a18deadc3a6cfc03f5c6f17fdcbb771a5c84c61ce51b208d584
-DIST terminus-font-4.26-ka2.diff.gz 1017 RMD160 b6017c6cf47c583096535c16b49d9692b9cd4430 SHA1 3a7004c474924ab357eb07dc1724f89753fe9293 SHA256 3bd76eaa52061d99b3f79ce1321971cba52985d164da7398ffdf1026f7808ea4
-DIST terminus-font-4.26-kx3-ao2.diff.gz 3567 RMD160 eacbcc784bdb87beaada659916bc5d3dd5df29db SHA1 f8278af12d41a142f288ffdf021edaf9868f0525 SHA256 7e97f01f7db2fa0d69626f77e137317a5fb1ce1707367ad7aa62d75a827e5339
-DIST terminus-font-4.26-kx3-ij1.diff.gz 1421 RMD160 751b5479c7064d44217252cf0365be8170e4eec5 SHA1 cab4bd087a0240b4ece89c5c43785750bf5e48db SHA256 8762cee055f750cabf8a8963d74a5694b3fa8ae33d1e413fe3b7e164457f5fb3
-DIST terminus-font-4.26-kx3-ka2.diff.gz 1018 RMD160 dd497f267af455c60ad85cab187bb92542f809f8 SHA1 121a3ee002a5e0917098262ba76088b311e001f6 SHA256 19c5f320310b9966dda8a0a6b9133fdd6b5de996d0a46b01d12df0c54a986acf
-DIST terminus-font-4.26-kx3.diff.gz 3166 RMD160 a768f8ed0ed6ad2d60b817e9ef7d003a5a768477 SHA1 f303bfbe3db644a7117597fd30037d8e5a7165cd SHA256 14a844b75f8cf59f0e44755a1c319e389794ad47b3abfbe6dd806a9a07e14d1f
 DIST terminus-font-4.26.tar.gz 215154 RMD160 70ff3e4125e8e89ad76d9ea9b16c624096c79384 SHA1 19ab13e1f2b4b6d284c2d4a0e1982df2a79f4a06 SHA256 ade97252374a9722b0489b81dd1300be93fb4fa819e456b5fe13f95c6b6e9299
+DIST terminus-font-4.28-ao2.diff.gz 3559 RMD160 ce574b7db845733d4829cbebbfac8b16c6aebba1 SHA1 986225c06981276b457e6a1624459e5dd8becc43 SHA256 ec49f123d447f269a1fdee6afca7efc85ac2faf04277ab2a1385063c985074fc
+DIST terminus-font-4.28-cm2.diff.gz 1428 RMD160 e9080fa0b5a008cf27cc3728fa7771d74c21afeb SHA1 aaa3d88a3dcf01b9c10f70d1cc0de3209f423d03 SHA256 9c29419e8221b95785234a5e7a6032c16d866e2fc29f20062b68ea4c183b8e02
+DIST terminus-font-4.28-dv1.diff.gz 1098 RMD160 509d723378b7357456fd150ba507414075327638 SHA1 a53b91226ddba21abeefd756b698ac363c43e27d SHA256 dec607b66ecd31ada8800e5c16af24692e7c5acb9e5f528156a57232a9c7b194
+DIST terminus-font-4.28-ge1.diff.gz 1045 RMD160 a88b347a3e8882779a6b896c77894f26f7bd36f4 SHA1 a9f9e9cd5c4d5ef0eebbe73302d6e1a3f127e2b7 SHA256 4279c670d01fb46617101ba2ad6816ecd3e45d8abc8c6c35e9d7f9439c6a6a67
+DIST terminus-font-4.28-gq2.diff.gz 579 RMD160 5360c21c4c9eae54a245305704921325d98cb8ff SHA1 00de882a9c720d02c6de9e804aecbf20fe7ec223 SHA256 624e62318b54e9c2356f5c41fe0a4b1a6916d57634abfbe79237d12a235ef0c5
+DIST terminus-font-4.28-ij1.diff.gz 1306 RMD160 a7c06baefc4d156b66115623368ad5531e4c3322 SHA1 be9ba6b5db31bb161a227f6add954315863c6c5f SHA256 c394e8351276f7bbb3bde9fe4407971ee157bf1570ba60146ba6d89c437affcc
+DIST terminus-font-4.28-ka2.diff.gz 967 RMD160 e5c5d5c19e72dd01d95a471b79b9965263c88aeb SHA1 2c909f37318a7ce205c8daf7edbacd6d3d1cb347 SHA256 94893a33f856da419676423133e1f1ae9480eab7b00c50909b07eadeaaf59b50
+DIST terminus-font-4.28-kx3-ao2.diff.gz 3555 RMD160 83d79ab2ab0a6a6e9d1101673c1be2d7cb510e97 SHA1 71c711e88f3a0b9f51c3f85fa008a4aef4f621d3 SHA256 0e80612a232b5bdb9e28ba699fa275d920e892e5913750aa4e2a227dc0abf30f
+DIST terminus-font-4.28-kx3-ij1.diff.gz 1340 RMD160 0a50624e891ef10810aaee085705ac2c6337f512 SHA1 3b500da871e5ec7f6d2d7d23fe53e72f8411cd6a SHA256 c369ec447fe30deecab4385d80e1d06c4fdcda4f5968fa48c92ef328cca5b069
+DIST terminus-font-4.28-kx3-ka2.diff.gz 961 RMD160 3ff191fdc2766197ead773b473e84e97b0a0b6c5 SHA1 58e487f0dd2173765f341b33f8d0774bb1c1e81e SHA256 a2b5184217562a66ed303f8063a4e63ba4bca03589b82ba777fc29b1e83fc408
+DIST terminus-font-4.28-kx3.diff.gz 3242 RMD160 18aae71374d196ed3d4049594fb520d7a5ae1d75 SHA1 0fa9a31c971e98c0d7282798a610552c1b208df2 SHA256 fb4776c6dcb31b17d2ae020af2e928c5c2d06c5f800201b9d2ed75131ded3804
+DIST terminus-font-4.28.tar.gz 229336 RMD160 79bc8e60c660cf166825974dd76e5a3772131ac4 SHA1 5134a39dd6f50f07e77d20e0718fe8cd00cc16b4 SHA256 1e8010ded51141d26ec0bb9bea70cc1360d27d562b80ca7c2dcbf3fef90fb20f
 EBUILD terminus-font-4.20.ebuild 1083 RMD160 9a423d3335f3fd1b9564e4bb6a722d88257d88d7 SHA1 3cc9b123480d39072d93ddfecf2f8b70ce949729 SHA256 c72ca13922a79f5047e27d168f1704f562a2edc6eaa96ccb508df996d010068e
-EBUILD terminus-font-4.26-r2.ebuild 2730 RMD160 237389490f71ee3994178e03ff0fd3a80047f6ac SHA1 aacca518e000123c9b512b113e83763e30203097 SHA256 7f2a786bcb27ad8afbe2d3113716d3438284cb2ab5590f148ed9d13551f03fb1
 EBUILD terminus-font-4.26.ebuild 1090 RMD160 ff2cfa302bbc76b9dacac270a8910fffc9b55877 SHA1 a8a1ff7c7c5b7328a92a5a5d3f2bf11cffdeba04 SHA256 45a4e160060d4e73bdd35ad69a866e7fbe203ff6bfe0da3f578e87f66dde3da3
-MISC ChangeLog 8209 RMD160 6aa7f359927ab4b07fb7e7993cd6962406c000da SHA1 6d99f70e0c8c32aef6f038b02c66eac2323564ec SHA256 b5da820cc2161bc3ea6f0cbd6d888aaad037bea7bb9e267ce25b48674a491a6c
-MISC metadata.xml 896 RMD160 7495c1cf943eab48cc459a85e79c6064865e9954 SHA1 1cd808996286945da4b2a095bf7361a1998a0bbd SHA256 1aec48837242efcae938161b10e210fab9bb88e934717c92f53420f94f9919fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkinxcwACgkQoeSe8B0zEfzl5gCdFnpxkuBHfT80MEVVxigAX90n
-UuwAni3GCUCfBlAli7SaLPVBHaXSA1RW
-=cLky
------END PGP SIGNATURE-----
+EBUILD terminus-font-4.28.ebuild 3299 RMD160 f51fa4b2136bc76843facfe2d7f90172b911af9c SHA1 c3c54f93120504cf0f1c3fcc718365e55e67ec73 SHA256 49a05f8102032a2919caeee7481f56c71bd3e82625e4453d7d948d2fe33a0b7c
+MISC ChangeLog 8686 RMD160 0e807c76eb466d95161a67b2004b227a454c1358 SHA1 28889011a4cfbd6ff3ab99cc9d91dd965eddd2f7 SHA256 b8b5654893e6fa0ea94fa6ec8e8f4c647b48f48a0a3e7c9c2079dc4392045556
+MISC metadata.xml 1199 RMD160 2722da09e53d59531b53a704dd618b5146bbb9f5 SHA1 2f334c73dae703c879b83f1bd4f6c4e6c8474c87 SHA256 b7f30ade029480c63b246444254439667e6aeb78c026ce64fb154ff2d18fd5d9
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index bc973f0f8a4e..e8e574f753cd 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
 <herd>fonts</herd>
 <use>
+	<flag name='psf'>Install PC Screen Font (PSF) with unicode data (for linux
+		console)</flag>
+	<flag name='raw'>Install RAW font data which should be compatible with most
+	UNIX systems (you don't need this on linux)</flag>
+	<flag name='pcf'>Intall Portable Compiled Font (PCF) (required for X11)</flag>
 	<flag name='a-like-o'>Changes view of letter 'a' - a looks like o
 		(see homepage)</flag>
 	<flag name='bolddiag'>Boldified diagonal parts of '4', 'k', 'x' and some
diff --git a/media-fonts/terminus-font/terminus-font-4.26-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.28.ebuild
index 7f91465b373f..4a88b205e1b5 100644
--- a/media-fonts/terminus-font/terminus-font-4.26-r2.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.28.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.26-r2.ebuild,v 1.1 2008/06/22 11:33:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.28.ebuild,v 1.1 2008/10/06 07:22:36 pva Exp $
 
 EAPI="1"
 
 inherit eutils font
 
 DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
+HOMEPAGE="http://www.is-vn.bg/hamster/"
 SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz
 		ru-dv? ( http://www.is-vn.bg/hamster/${P}-dv1.diff.gz )
 		ru-g? ( http://www.is-vn.bg/hamster/${P}-ge1.diff.gz )
 		quote? ( http://www.is-vn.bg/hamster/${P}-gq2.diff.gz )
 		width? ( http://www.is-vn.bg/hamster/${P}-cm2.diff.gz )
 		bolddiag? ( http://www.is-vn.bg/hamster/${P}-kx3.diff.gz
-				a-like-o? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ao2.diff.gz )
-				ru-i? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ij1.diff.gz )
-				ru-k? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ka2.diff.gz ) )
+				a-like-o? ( http://www.is-vn.bg/hamster/${P}-kx3-ao2.diff.gz )
+				ru-i? ( http://www.is-vn.bg/hamster/${P}-kx3-ij1.diff.gz )
+				ru-k? ( http://www.is-vn.bg/hamster/${P}-kx3-ka2.diff.gz ) )
 		!bolddiag? ( a-like-o? ( http://www.is-vn.bg/hamster/${P}-ao2.diff.gz )
 				ru-i? ( http://www.is-vn.bg/hamster/${P}-ij1.diff.gz )
 				ru-k? ( http://www.is-vn.bg/hamster/${P}-ka2.diff.gz ) )
@@ -24,15 +24,26 @@ SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag"
+IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw +pcf"
 
-DEPEND="sys-apps/gawk
-		x11-apps/bdftopcf"
+DEPEND="dev-lang/perl
+		sys-apps/gawk
+		app-arch/gzip
+		pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
 FONTDIR=/usr/share/fonts/terminus
 DOCS="README README-BG"
 
+pkg_setup() {
+	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
+	# That's why configuration +pcf and -X is supported, bug #155783.
+	if use X && ! use pcf ; then
+		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
+		die "Either disable X use flag or enabled pcf."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -67,11 +78,21 @@ src_compile() {
 		--unidir=/usr/share/consoletrans \
 		--x11dir=${FONTDIR}
 
-	emake psf txt pcf || die
+	if use psf; then emake psf txt || die; fi
+	if use raw; then emake raw || die; fi
+	if use pcf; then emake pcf || die; fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install-psf install-acm install-ref install-pcf || die
+	if use psf; then
+		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
+	fi
+	if use raw; then
+		emake DESTDIR="${D}" install.raw || die
+	fi
+	if use pcf; then
+		emake DESTDIR="${D}" install-pcf || die
+	fi
 
 	font_src_install
 }