Changed font path to /usr/share/fonts, closing bug #44842. Removed old ebuilds.

8 files changed, 58 insertions, 147 deletions

diff --git a/media-fonts/kochi-substitute/ChangeLog b/media-fonts/kochi-substitute/ChangeLog
index 6d7ec34b9702..85d9c48353d6 100644
--- a/media-fonts/kochi-substitute/ChangeLog
+++ b/media-fonts/kochi-substitute/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-fonts/kochi-substitute
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/ChangeLog,v 1.10 2004/05/14 01:53:52 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/ChangeLog,v 1.11 2004/05/15 10:34:58 usata Exp $
+
+*kochi-substitute-20030809-r1 (15 May 2004)
+
+  15 May 2004; Mamoru KOMACHI <usata@gentoo.org>
+  kochi-substitute-20030626.ebuild, kochi-substitute-20030628.ebuild,
+  kochi-substitute-20030809-r1.ebuild:
+  Changed font path to /usr/share/fonts, closing bug #44842.
+  Removed old ebuilds.
 
   13 May 2004; Stephen P. Becker <geoman@gentoo.org>
   kochi-substitute-20030809.ebuild:
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 0841fb3cdf03..4bb435dda3d4 100644
--- a/media-fonts/kochi-substitute/Manifest
+++ b/media-fonts/kochi-substitute/Manifest
@@ -1,8 +1,6 @@
-MD5 7a43a86d53a3466ef91a936793f862bd kochi-substitute-20030626.ebuild 1761
 MD5 1f06f7c77b661fc49e589de8d39888d8 kochi-substitute-20030809.ebuild 1895
-MD5 908a4758e62f1b65e6bbdedf0dac4064 kochi-substitute-20030628.ebuild 1893
-MD5 7e4754200a9658aef880cdcce30ec949 ChangeLog 1610
+MD5 93e59a5c8b778a6f66b350bba21d26cd ChangeLog 1897
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
-MD5 57c7d4d4848ed98955f01411ef5625c8 files/digest-kochi-substitute-20030626 79
-MD5 960946cb673590d966d212aefc0308de files/digest-kochi-substitute-20030628 79
+MD5 68a42fffe2055a93d6264e39ec8d3905 kochi-substitute-20030809-r1.ebuild 1307
+MD5 13dfd0e0ce07b13f410914df34b4b45f files/digest-kochi-substitute-20030809-r1 79
 MD5 13dfd0e0ce07b13f410914df34b4b45f files/digest-kochi-substitute-20030809 79
diff --git a/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030626 b/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030626
deleted file mode 100644
index 7ad46912de6f..000000000000
--- a/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030626
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f50ec4245b0d86c39eed90a5e2a1ca7 kochi-substitute-20030626.tar.bz2 8017626
diff --git a/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030628 b/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030628
deleted file mode 100644
index f8d362853942..000000000000
--- a/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030628
+++ /dev/null
@@ -1 +0,0 @@
-MD5 719d52e40fe0571915c40abfc75b2d94 kochi-substitute-20030628.tar.bz2 8076471
diff --git a/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030809-r1 b/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030809-r1
new file mode 100644
index 000000000000..1f80ee0beceb
--- /dev/null
+++ b/media-fonts/kochi-substitute/files/digest-kochi-substitute-20030809-r1
@@ -0,0 +1 @@
+MD5 c4b14e287cf2b1688c649e2274e128b3 kochi-substitute-20030809.tar.bz2 8675822
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030626.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030626.ebuild
deleted file mode 100644
index 67519f502ded..000000000000
--- a/media-fonts/kochi-substitute/kochi-substitute-20030626.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030626.ebuild,v 1.3 2004/05/14 01:53:52 geoman Exp $
-
-IUSE="X"
-
-FONT_PATH="/usr/X11R6/lib/X11/fonts/truetype"
-DESCRIPTION="Kochi Japanese TrueType fonts with Wadalab Fonts"
-HOMEPAGE="http://efont.sourceforge.jp/"
-SRC_URI="http://downloads.sourceforge.jp/efont/4845/${P}.tar.bz2"
-
-# naga10 has free-noncomm license
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="x86 alpha sparc ppc"
-
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )"
-
-S=${WORKDIR}/${PN}-${PV:0:8}
-
-src_install () {
-
-	insinto ${FONT_PATH}
-	doins kochi-gothic-subst.ttf
-	doins kochi-mincho-subst.ttf
-	dosym kochi-gothic-subst.ttf ${FONT_PATH}/kochi-gothic.ttf
-	dosym kochi-mincho-subst.ttf ${FONT_PATH}/kochi-mincho.ttf
-
-	dodoc README.ja COPYING
-}
-
-rebuild_fontfiles() {
-
-	einfo "Refreshing fonts.scale and fonts.dir..."
-
-	cd ${FONT_PATH}
-
-	# recreate fonts.scale
-	ttmkfdir > fonts.scale \
-		|| die "Unable to create fonts.scale! Please emerge ttmkfdir and try again."
-
-	# recreate fonts.dir
-	mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings
-
-	if [ -x /usr/bin/fc-cache ] ; then
-		einfo "Updating font cache..."
-		/usr/bin/fc-cache -f ${FONT_PATH}
-	fi
-}
-
-pkg_postinst() {
-
-	use X > /dev/null && rebuild_fontfiles
-
-	echo ""
-	einfo "This is a Kochi \"alternative\" font, but not kochi font itself."
-	einfo "Unfortunately, there is a possibility of copyright infringement,"
-	einfo "so the author of kochi font suspended distributing kochi font."
-	einfo "Please see http://khdd.net/kanou/fonts/stolenbitmap.en.html and"
-	einfo "${HOMEPAGE} for details."
-}
-
-pkg_postrm() {
-
-	use X > /dev/null && rebuild_fontfiles
-}
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030628.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030628.ebuild
deleted file mode 100644
index 777545f4c5fe..000000000000
--- a/media-fonts/kochi-substitute/kochi-substitute-20030628.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030628.ebuild,v 1.4 2004/05/14 01:53:52 geoman Exp $
-
-IUSE="X"
-
-FONT_PATH="/usr/X11R6/lib/X11/fonts/truetype"
-DESCRIPTION="Kochi Japanese TrueType fonts with Wadalab Fonts"
-HOMEPAGE="http://efont.sourceforge.jp/"
-SRC_URI="http://downloads.sourceforge.jp/efont/4845/${P}.tar.bz2"
-
-# naga10 has free-noncomm license
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="x86 alpha sparc ppc hppa amd64"
-
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )"
-
-S=${WORKDIR}/${PN}-${PV:0:8}
-
-src_install () {
-
-	insinto ${FONT_PATH}
-	doins kochi-gothic-subst.ttf
-	doins kochi-mincho-subst.ttf
-	dosym kochi-gothic-subst.ttf ${FONT_PATH}/kochi-gothic.ttf
-	dosym kochi-mincho-subst.ttf ${FONT_PATH}/kochi-mincho.ttf
-
-	dodoc README.ja COPYING docs/README
-	cd docs
-	for d in kappa20 k14goth ayu20gothic wadalab shinonome* naga10; do
-		docinto $d
-		dodoc $d/*
-	done
-}
-
-rebuild_fontfiles() {
-
-	einfo "Refreshing fonts.scale and fonts.dir..."
-
-	cd ${FONT_PATH}
-
-	# recreate fonts.scale
-	ttmkfdir > fonts.scale \
-		|| die "Unable to create fonts.scale! Please emerge ttmkfdir and try again."
-
-	# recreate fonts.dir
-	mkfontdir -e /usr/X11R6/lib/X11/fonts/encodings
-
-	if [ -x /usr/bin/fc-cache ] ; then
-		einfo "Updating font cache..."
-		/usr/bin/fc-cache -f ${FONT_PATH}
-	fi
-}
-
-pkg_postinst() {
-
-	use X > /dev/null && rebuild_fontfiles
-
-	echo ""
-	einfo "This is a Kochi \"alternative\" font, but not kochi font itself."
-	einfo "Unfortunately, there is a possibility of copyright infringement,"
-	einfo "so the author of kochi font suspended distributing kochi font."
-	einfo "Please see http://khdd.net/kanou/fonts/stolenbitmap.en.html and"
-	einfo "${HOMEPAGE} for details."
-}
-
-pkg_postrm() {
-
-	use X > /dev/null && rebuild_fontfiles
-}
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r1.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r1.ebuild
new file mode 100644
index 000000000000..653e384f3a91
--- /dev/null
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809-r1.ebuild,v 1.1 2004/05/15 10:34:58 usata Exp $
+
+IUSE="X"
+
+DESCRIPTION="Kochi Japanese TrueType fonts with Wadalab Fonts"
+HOMEPAGE="http://efont.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
+
+# naga10 has free-noncomm license
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~ia64 ~x86 ~alpha ~sparc ~ppc ~hppa ~amd64 ~mips"
+
+DEPEND="virtual/glibc
+	X? ( virtual/x11 )"
+
+S=${WORKDIR}/${PN}-${PV:0:8}
+FONTPATH="/usr/share/fonts/${PN}"
+
+src_install () {
+
+	insinto ${FONTPATH}
+	doins kochi-gothic-subst.ttf
+	doins kochi-mincho-subst.ttf
+	dosym kochi-gothic-subst.ttf ${FONTPATH}/kochi-gothic.ttf
+	dosym kochi-mincho-subst.ttf ${FONTPATH}/kochi-mincho.ttf
+	dodir /usr/X11R6/lib/X11/fonts/truetype
+	for f in ${FONTPATH}/*.ttf ; do
+		dosym $f /usr/X11R6/lib/X11/fonts/truetype
+	done
+	mkfontscale ${D}${FONTPATH}
+	newins ${D}${FONTPATH}/fonts.scale fonts.dir
+	if [ -x /usr/bin/fc-cache ] ; then
+		/usr/bin/fc-cache -f ${D}${FONTPATH}
+	fi
+
+	dodoc README.ja COPYING docs/README
+	cd docs
+	for d in kappa20 k14goth ayu20gothic wadalab shinonome* naga10; do
+		docinto $d
+		dodoc $d/*
+	done
+}