Version bumped. Updated HOMEPAGE. Closing bug #39795

8 files changed, 19 insertions, 58 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 799c23451c74..9290a23b4ccd 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,6 @@
-MD5 c1eb49526fba4d6195f0aa49b1835b98 terminus-font-4.06.ebuild 1069
-MD5 3b5464739ef6c2c99b45251f722a5ad7 terminus-font-4.03-r1.ebuild 1296
-MD5 683e604b5ce92d79a2373f302b27fcb8 ChangeLog 1174
+MD5 3b249c90691d38b65a2f1c2684d1e4a8 terminus-font-4.06.ebuild 1105
+MD5 9ed81b54331816de60856db9692fdae4 terminus-font-4.03-r1.ebuild 1335
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 dc5a2919ca6d219e4f4af8626b89e40c ChangeLog 1365
 MD5 570b1b829d7939ee44cd8ca1c952060d files/digest-terminus-font-4.06 70
 MD5 a76fa0ef0f4c837546b0a0d1f86941e6 files/digest-terminus-font-4.03-r1 135
diff --git a/media-fonts/terminus-font/files/digest-terminus-font-4.00-r2 b/media-fonts/terminus-font/files/digest-terminus-font-4.00-r2
deleted file mode 100644
index 08306f75856e..000000000000
--- a/media-fonts/terminus-font/files/digest-terminus-font-4.00-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 964ea14a9cba0c297603ea135bc77fe0 /terminus-font-4.00-r2.ebuild 1083
-MD5 a0153061a484906f2bbb08bc28fac757 terminus-font-4.00.tar.gz 107077
diff --git a/media-fonts/terminus-font/files/digest-terminus-font-4.03 b/media-fonts/terminus-font/files/digest-terminus-font-4.03
deleted file mode 100644
index dc0a4278baaf..000000000000
--- a/media-fonts/terminus-font/files/digest-terminus-font-4.03
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b24a2be0e9f966962fb08b1f49b8ec1b terminus-font-4.03.tar.gz 114366
diff --git a/media-fonts/terminus-font/files/digest-terminus-font-4.06 b/media-fonts/terminus-font/files/digest-terminus-font-4.06
new file mode 100644
index 000000000000..3eda6d14269c
--- /dev/null
+++ b/media-fonts/terminus-font/files/digest-terminus-font-4.06
@@ -0,0 +1 @@
+MD5 c3055b839118887a49666acaf7c8b3e5 terminus-font-4.06.tar.gz 122851
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
new file mode 100644
index 000000000000..696065edd338
--- /dev/null
+++ b/media-fonts/terminus-font/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>fonts</herd>
+</pkgmetadata>
diff --git a/media-fonts/terminus-font/terminus-font-4.00-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.00-r2.ebuild
deleted file mode 100644
index b65f0f76f650..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.00-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.00-r2.ebuild,v 1.2 2003/07/12 16:16:15 aliz Exp $
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.htm"
-SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X"
-
-DEPEND="X? ( virtual/x11 ) dev-lang/perl"
-RDEPEND="X? ( virtual/x11 )"
-
-src_compile() {
-	make psf || die
-
-	# If user wants fonts for X11
-	if [ -n "`use X`" ]; then
-		make pcf || die
-	fi
-}
-
-src_install() {
-	( cd vga && ../configure --prefix=${D}/usr )
-	make -f vga/Makefile install || die
-
-	# If user wants fonts for X11
-	if [ -n "`use X`" ]; then
-		( cd x11 && ../configure --prefix=${D}/usr )
-		perl -pi -e 's/local/misc/;' x11/Makefile
-		make -f x11/Makefile install || die
-	fi
-
-	dodoc README*
-}
-
-pkg_postinst() {
-	mkfontdir ${ROOT}usr/X11R6/lib/X11/fonts/misc
-}
-
-pkg_postrm() {
-	mkfontdir ${ROOT}usr/X11R6/lib/X11/fonts/misc
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild
index ef675fb552c3..c0be1d2552a4 100644
--- a/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild,v 1.1 2003/09/26 05:17:28 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.03-r1.ebuild,v 1.2 2004/01/31 14:26:45 usata Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.htm"
+HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
 SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz
 	http://www.is-vn.bg/hamster/courier-like-a.diff.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X"
 
 DEPEND="sys-apps/gawk
@@ -45,6 +45,7 @@ src_install() {
 	# If user wants fonts for X11
 	if [ -n "`use X`" ]; then
 		make install-pcf || die
+		mkfontdir ${D}/usr/share/fonts/terminus
 	fi
 
 	dodoc README*
diff --git a/media-fonts/terminus-font/terminus-font-4.03.ebuild b/media-fonts/terminus-font/terminus-font-4.06.ebuild
index 7e946154b59c..ee39e4d21006 100644
--- a/media-fonts/terminus-font/terminus-font-4.03.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.06.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.03.ebuild,v 1.3 2003/09/11 01:39:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.06.ebuild,v 1.1 2004/01/31 14:26:45 usata Exp $
 
 DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.htm"
+HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
 SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,6 +37,7 @@ src_install() {
 	# If user wants fonts for X11
 	if [ -n "`use X`" ]; then
 		make install-pcf || die
+		mkfontdir ${D}/usr/share/fonts/terminus
 	fi
 
 	dodoc README*