Tidy up ebuild. Thanks to Thomas L. Kjeldsen <tlk@mayi.dk>, closing bug #44839

6 files changed, 28 insertions, 77 deletions

diff --git a/media-fonts/arphicfonts/ChangeLog b/media-fonts/arphicfonts/ChangeLog
index b9d3450864cf..c2ce9cc91db1 100644
--- a/media-fonts/arphicfonts/ChangeLog
+++ b/media-fonts/arphicfonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/arphicfonts
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/ChangeLog,v 1.7 2004/05/14 01:55:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/ChangeLog,v 1.8 2004/05/15 09:31:12 usata Exp $
+
+  15 May 2004; Mamoru KOMACHI <usata@gentoo.org> arphicfonts-0.1-r1.ebuild,
+  arphicfonts-0.1.ebuild, metadata.xml:
+  Tidy up ebuild. Thanks to Thomas L. Kjeldsen <tlk@mayi.dk>, closing bug #44839
 
   13 May 2004; Stephen P. Becker <geoman@gentoo.org>
   arphicfonts-0.1-r1.ebuild:
diff --git a/media-fonts/arphicfonts/Manifest b/media-fonts/arphicfonts/Manifest
index 9398c10033a2..fc57a69b6f07 100644
--- a/media-fonts/arphicfonts/Manifest
+++ b/media-fonts/arphicfonts/Manifest
@@ -1,8 +1,6 @@
-MD5 6f3d968ed988b058eabc4716606f5d7d arphicfonts-0.1.ebuild 1531
-MD5 6628fbdc78eada814815970e0fea4650 arphicfonts-0.1-r1.ebuild 2849
-MD5 2e4be3cbb22f7dc98e0b6d8cecc71adf ChangeLog 1890
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 2fe8346e604f4ae761d1a8cbb551f6c7 files/digest-arphicfonts-0.1 244
+MD5 8954d8763676185ba38a405570d7d8c9 arphicfonts-0.1-r1.ebuild 2720
+MD5 90ac9e6de172abf6ed209e078e1940c0 ChangeLog 2087
+MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
 MD5 3bd7bba2b62aba255babce12594cbdd8 files/TW-fonts.scale 945
 MD5 8092f72476c54669d231fa1e36c4272d files/CN-fonts.scale 316
 MD5 2fe8346e604f4ae761d1a8cbb551f6c7 files/digest-arphicfonts-0.1-r1 244
diff --git a/media-fonts/arphicfonts/arphicfonts-0.1-r1.ebuild b/media-fonts/arphicfonts/arphicfonts-0.1-r1.ebuild
index 014a7d2d3654..f320363ae1e3 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.1-r1.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.1-r1.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/arphicfonts/arphicfonts-0.1-r1.ebuild,v 1.11 2004/05/14 01:55:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/arphicfonts/arphicfonts-0.1-r1.ebuild,v 1.12 2004/05/15 09:31:12 usata Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Arphic Fonts"
@@ -50,29 +50,29 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo ">>> Making big5 font dirs..."
 	cd /usr/share/fonts/ttf/zh_TW
-	echo ">>> Creating fonts.dir info"
 	mkfontdir -e /usr/share/fonts/encodings/large \
-	-e /usr/share/fonts/encodings
-	echo ">>> Making gb2312 font dirs..."
+		-e /usr/share/fonts/encodings
 	cd /usr/share/fonts/ttf/zh_CN
-	echo ">>> Creating fonts.dir info"
 	mkfontdir -e /usr/share/fonts/encodings/large \
-	-e /usr/share/fonts/encodings
-	echo ">>> Make sure X knows about these font directories!"
-	if (  `grep -e "^.*FontPath.*\"/usr/share/fonts/ttf/zh_TW\"" /etc/X11/XF86Config -q` ); then
-		echo "Font path for big5 fonts is listed in /etc/X11/XF86Config."
-	else
-		echo ">>> You must add /usr/share/fonts/ttf/zh_TW to your font path"
-		echo ">>> to be able to use your new Big5 fonts."
+		-e /usr/share/fonts/encodings
+
+	if ( ! `grep -qie "FontPath.*/usr/share/fonts/ttf/zh_TW" /etc/X11/XF86Config` ); then
+		einfo "You must add /usr/share/fonts/ttf/zh_TW to the font paths in XF86Config"
 	fi
-	if (  `grep -e "^.*[fF]ont[Pp]ath.*\"/usr/share/fonts/ttf/zh_CN\"" /etc/X11/XF86Config -q` ); then
-		echo "Font path for gb2312 fonts is listed in /etc/X11/XF86Config."
-	else
-		echo ">>> You must add /usr/share/fonts/ttf/zh_CN to your font path"
-		echo ">>> to be able to use your new gb2312 fonts."
+	if ( ! `grep -qie "FontPath.*/usr/share/fonts/ttf/zh_CN" /etc/X11/XF86Config` ); then
+		einfo "You must add /usr/share/fonts/ttf/zh_CN to the font paths in XF86Config"
 	fi
 
-	echo ">>> Restart font server for changes to take effect."
+	einfo "Restart font server for changes to take effect."
+}
+
+pkg_postrm() {
+#	FIXME: fonts.scale files should be cleaned up if necessary
+	einfo
+	einfo "You may need to remove the following lines from 'Section \"Files\"' in"
+	einfo "XF86Config, to unmerge this package completely:"
+	einfo "\t FontPath \"/usr/share/fonts/ttf/zh_TW\""
+	einfo "\t FontPath \"/usr/share/fonts/ttf/zh_CN\""
+	einfo
 }
diff --git a/media-fonts/arphicfonts/arphicfonts-0.1.ebuild b/media-fonts/arphicfonts/arphicfonts-0.1.ebuild
deleted file mode 100644
index 212824264b3b..000000000000
--- a/media-fonts/arphicfonts/arphicfonts-0.1.ebuild
+++ /dev/null
@@ -1,48 +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/arphicfonts/arphicfonts-0.1.ebuild,v 1.3 2004/05/14 01:55:16 geoman Exp $
-
-DESCRIPTION="Arphic Fonts"
-SRC_URI="ftp://ftp.gnu.org/non-gnu/chinese-fonts-truetype/gkai00mp.ttf.gz
-	 ftp://ftp.gnu.org/non-gnu/chinese-fonts-truetype/bkai00mp.ttf.gz
-	 ftp://ftp.gnu.org/non-gnu/chinese-fonts-truetype/bsmi00lp.ttf.gz
-	 ftp://ftp.gnu.org/non-gnu/chinese-fonts-truetype/gbsn00lp.ttf.gz"
-HOMEPAGE="http://www.arphic.com.tw/"
-LICENSE="Arphic"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-
-DEPEND="virtual/x11
-	x11-misc/ttmkfdir"
-
-src_unpack() {
-	mkdir ${WORKDIR}/${P}
-	gunzip -c ${DISTDIR}/gkai00mp.ttf.gz > ${WORKDIR}/${P}/gkai00mp.ttf
-	gunzip -c ${DISTDIR}/bkai00mp.ttf.gz > ${WORKDIR}/${P}/bkai00mp.ttf
-	gunzip -c ${DISTDIR}/bsmi00lp.ttf.gz > ${WORKDIR}/${P}/bsmi00lp.ttf
-	gunzip -c ${DISTDIR}/gbsn00lp.ttf.gz > ${WORKDIR}/${P}/gbsn00lp.ttf
-}
-
-src_compile() {
-	echo "Truetype fonts don't need to be compiled! ;)"
-}
-
-src_install() {
-	cd ${WORKDIR}/${P}
-	insopts -m0644
-	insinto /usr/share/fonts/truetype
-	doins *.ttf
-
-#	These don't get downloaded because there is no simple way to
-#	fetch them.. ie if I included the README in SRC_URI above, it would
-#	get saved as ${DISTDIR}/README which doesn't seem like
-#	a really good idea.
-#	dodoc LICENSE README
-}
-
-pkg_postinst() {
-	echo ">>> Making font dirs..."
-	cd /usr/share/fonts/truetype/
-	/usr/X11R6/bin/ttmkfdir > fonts.scale
-	mkfontdir
-}
diff --git a/media-fonts/arphicfonts/files/digest-arphicfonts-0.1 b/media-fonts/arphicfonts/files/digest-arphicfonts-0.1
deleted file mode 100644
index 8cb6db87971d..000000000000
--- a/media-fonts/arphicfonts/files/digest-arphicfonts-0.1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 5ee11417a8b42d08a33421dd6c64bed2 gkai00mp.ttf.gz 2698942
-MD5 9abc1efeaf08df5554629b10eb79b1b2 bkai00mp.ttf.gz 6013768
-MD5 42b13b73c5572d886824ee249d1ad500 bsmi00lp.ttf.gz 5653466
-MD5 757ca4959ed2325d49a64730766140ee gbsn00lp.ttf.gz 2345803
diff --git a/media-fonts/arphicfonts/metadata.xml b/media-fonts/arphicfonts/metadata.xml
index 2d5852c16c60..6e63c30f1bb2 100644
--- a/media-fonts/arphicfonts/metadata.xml
+++ b/media-fonts/arphicfonts/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>fonts</herd>
 <herd>cjk</herd>
 </pkgmetadata>