Fixed to work with ipafont USE flag. Removed old versions.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 14 insertions, 97 deletions

diff --git a/media-fonts/mplus-outline-fonts/ChangeLog b/media-fonts/mplus-outline-fonts/ChangeLog
index 9b2b3784b67a..ce8dd837abd4 100644
--- a/media-fonts/mplus-outline-fonts/ChangeLog
+++ b/media-fonts/mplus-outline-fonts/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-fonts/mplus-outline-fonts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/ChangeLog,v 1.21 2010/04/30 22:35:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/ChangeLog,v 1.22 2010/05/18 12:05:36 matsuu Exp $
+
+*mplus-outline-fonts-0_pre030-r1 (18 May 2010)
+
+  18 May 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -mplus-outline-fonts-0_pre027.ebuild,
+  -mplus-outline-fonts-0_pre028.ebuild,
+  -mplus-outline-fonts-0_pre030.ebuild,
+  +mplus-outline-fonts-0_pre030-r1.ebuild:
+  Fixed to work with ipafont USE flag. Removed old versions.
 
 *mplus-outline-fonts-0_pre030 (30 Apr 2010)
 
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre027.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre027.ebuild
deleted file mode 100644
index c66e206be513..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre027.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre027.ebuild,v 1.1 2009/11/08 03:01:25 matsuu Exp $
-
-EAPI="2"
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-DESCRIPTION="M+ Japanese outline fonts with IPA font"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.gz"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
-IUSE="ipafont"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.01
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS="README_J README_E"
-
-RESTRICT="strip binchecks"
-
-IPAFONT_DIR="/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.otf" "${S}" || die
-	fi
-}
-
-src_compile() {
-	if use ipafont ; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.otf || die
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre028.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre028.ebuild
deleted file mode 100644
index d1a42ee5a95d..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre028.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre028.ebuild,v 1.1 2009/12/24 13:19:43 matsuu Exp $
-
-EAPI="2"
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-DESCRIPTION="M+ Japanese outline fonts with IPA font"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.gz"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86"
-IUSE="ipafont"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.01
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS="README_J README_E"
-
-RESTRICT="strip binchecks"
-
-IPAFONT_DIR="/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.otf" "${S}" || die
-	fi
-}
-
-src_compile() {
-	if use ipafont ; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.otf || die
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030-r1.ebuild
index 3abab5c36a40..151c53144611 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030.ebuild,v 1.1 2010/04/30 22:35:16 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030-r1.ebuild,v 1.1 2010/05/18 12:05:36 matsuu Exp $
 
 EAPI="2"
 inherit font
@@ -17,7 +17,7 @@ IUSE="ipafont"
 
 DEPEND="ipafont? (
 		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.01
+		>=media-fonts/ja-ipafonts-003.02
 	)"
 RDEPEND=""
 
@@ -34,13 +34,13 @@ IPAFONT_DIR="/usr/share/fonts/ja-ipafonts"
 
 src_prepare() {
 	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.otf" "${S}" || die
+		cp -p "${IPAFONT_DIR}/ipag.ttf" "${S}" || die
 	fi
 }
 
 src_compile() {
 	if use ipafont ; then
 		fontforge -script m++ipa.pe || die
-		rm -f ipag.otf || die
+		rm -f ipag.ttf || die
 	fi
 }