9 files changed, 37 insertions, 108 deletions
diff --git a/media-fonts/mplus-fonts/Manifest b/media-fonts/mplus-fonts/Manifest
index fe2ef9bc32dd..cb60d7b322e3 100644
--- a/media-fonts/mplus-fonts/Manifest
+++ b/media-fonts/mplus-fonts/Manifest
@@ -1,12 +1,8 @@
-MD5 c56352728cef4f57d2f3cea72fe41e39 mplus-fonts-2.1.4.ebuild 741
-MD5 671798d8a4129ebfbc2d5d10e6c63c35 mplus-fonts-2.1.1.ebuild 1153
-MD5 531b9c05afc3ea41f3e0160867f14833 mplus-fonts-2.1.0.ebuild 1118
-MD5 d2ea52978f662143bd4a858c5f0121d0 mplus-fonts-2.1.2.ebuild 1156
-MD5 c0ef4f2f2df7fd7fec4f694d550eed80 ChangeLog 3483
+MD5 9e02d0302eeaed842bf08dcffcef0455 mplus-fonts-2.1.4.ebuild 699
+MD5 9847da301c5c28025d8cb3b3af72ca57 mplus-fonts-2.1.2.ebuild 1149
+MD5 bf6959f485284c1dd36eb7cbeb7d7eca ChangeLog 3675
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
-MD5 c56352728cef4f57d2f3cea72fe41e39 mplus-fonts-2.1.3.ebuild 741
+MD5 f555a63a0e6a614db2bf0605fc5bd229 mplus-fonts-2.1.3.ebuild 739
 MD5 d8ae0a8f06d128a7dc9a7525e38935f1 files/digest-mplus-fonts-2.1.4 76
-MD5 9dc285e29a7998c98b922e9137a2292a files/digest-mplus-fonts-2.1.0 76
-MD5 a0a262cea019d746f6c032f0d4d5a945 files/digest-mplus-fonts-2.1.1 76
 MD5 35a60e6178fcd6d7ed3ceaddb9343def files/digest-mplus-fonts-2.1.2 76
 MD5 62d4a09d7000471d4cf54cf2dbfce868 files/digest-mplus-fonts-2.1.3 76
diff --git a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.0 b/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.0
deleted file mode 100644
index 8889e7c489d4..000000000000
--- a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 89b9f2abfd9e477989a18e96e6d9a727 mplus_bitmap_fonts-2.1.0.tar.gz 395169
diff --git a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.1 b/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.1
deleted file mode 100644
index 522a480692a1..000000000000
--- a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fcd4e11fe72c75c7978e30cf4182cd39 mplus_bitmap_fonts-2.1.1.tar.gz 395201
diff --git a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.4 b/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.4
new file mode 100644
index 000000000000..b5d22992e4d9
--- /dev/null
+++ b/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.1.4
@@ -0,0 +1 @@
+MD5 a600453c8420e4c690c9142f4b8156da mplus_bitmap_fonts-2.1.4.tar.gz 391526
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.1.0.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.1.0.ebuild
deleted file mode 100644
index 926b67261a67..000000000000
--- a/media-fonts/mplus-fonts/mplus-fonts-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +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/mplus-fonts/mplus-fonts-2.1.0.ebuild,v 1.2 2003/11/21 13:55:29 usata Exp $
-
-IUSE="X"
-
-MY_P="mplus_bitmap_fonts-${PV}"
-
-DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 alpha"
-
-DEPEND="virtual/x11
-	dev-lang/perl"
-RDEPEND="X? ( virtual/x11 )"
-
-S="${WORKDIR}/${MY_P}"
-FONT_PATH="/usr/share/fonts/mplus"
-
-src_install(){
-	DESTDIR="${D}${FONT_PATH}" ./install_mplus_fonts || die
-	dodoc README* INSTALL*
-}
-
-pkg_postinst(){
-
-	einfo
-	einfo "You need you add following line into 'Section \"Files\"' in"
-	einfo "XF86Config and reboot X Window System, to use these fonts."
-	einfo
-	einfo "\t FontPath \"${FONT_PATH}\""
-	einfo
-}
-
-pkg_postrm(){
-
-	einfo
-	einfo "You need you remove following line in 'Section \"Files\"' in"
-	einfo "XF86Config, to unmerge this package completely."
-	einfo
-	einfo "\t FontPath \"${FONT_PATH}\""
-	einfo
-}
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.1.1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.1.1.ebuild
deleted file mode 100644
index 997974c251f8..000000000000
--- a/media-fonts/mplus-fonts/mplus-fonts-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +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/mplus-fonts/mplus-fonts-2.1.1.ebuild,v 1.2 2003/12/08 13:04:52 usata Exp $
-
-IUSE="X"
-
-MY_P="mplus_bitmap_fonts-${PV}"
-
-DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa arm amd64 ia64"
-
-DEPEND="virtual/x11
-	dev-lang/perl"
-RDEPEND="X? ( virtual/x11 )"
-
-S="${WORKDIR}/${MY_P}"
-FONT_PATH="/usr/share/fonts/mplus"
-
-src_install(){
-	DESTDIR="${D}${FONT_PATH}" ./install_mplus_fonts || die
-	dodoc README* INSTALL*
-}
-
-pkg_postinst(){
-
-	einfo
-	einfo "You need you add following line into 'Section \"Files\"' in"
-	einfo "XF86Config and reboot X Window System, to use these fonts."
-	einfo
-	einfo "\t FontPath \"${FONT_PATH}\""
-	einfo
-}
-
-pkg_postrm(){
-
-	einfo
-	einfo "You need you remove following line in 'Section \"Files\"' in"
-	einfo "XF86Config, to unmerge this package completely."
-	einfo
-	einfo "\t FontPath \"${FONT_PATH}\""
-	einfo
-}
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild
index fb66722f66ad..e4649bbe9457 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild,v 1.3 2004/01/11 23:22:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.1.2.ebuild,v 1.4 2004/01/25 16:21:57 usata Exp $
 
 IUSE="X"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips hppa ~arm ~amd64 ~ia64"
+KEYWORDS="x86 ppc sparc alpha mips hppa arm amd64 ia64"
 
 DEPEND="virtual/x11
 	dev-lang/perl"
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild
index 7a49ecdc5a34..e97c9220b9c6 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild,v 1.1 2004/01/11 15:16:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.1.3.ebuild,v 1.2 2004/01/25 16:21:57 usata Exp $
 
 IUSE="X"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa ~arm ~amd64 ~ia64"
 
 DEPEND="virtual/x11
 	dev-lang/perl"
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.1.4.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.1.4.ebuild
new file mode 100644
index 000000000000..e1fb7a1a6c30
--- /dev/null
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.1.4.ebuild,v 1.1 2004/01/25 16:21:57 usata Exp $
+
+IUSE="X"
+
+MY_P="mplus_bitmap_fonts-${PV}"
+
+DESCRIPTION="M+ Japanese bitmap fonts"
+HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~alpha"
+
+DEPEND="virtual/x11
+	dev-lang/perl"
+RDEPEND="X? ( virtual/x11 )"
+
+S="${WORKDIR}/${MY_P}"
+FONTPATH="/usr/share/fonts/mplus"
+
+src_install(){
+
+	DESTDIR="${D}${FONTPATH}" ./install_mplus_fonts || die
+	dodoc README* INSTALL*
+}