Rewrite ebuild to use freebsd upstream distfile, and include freebsd patches and new patch for correct building - Part of Modular-X fixing. Also fix HOMEPAGE for older ebuilds.

(Portage version: 2.0.54)

7 files changed, 254 insertions, 22 deletions

diff --git a/media-fonts/zh-kcfonts/ChangeLog b/media-fonts/zh-kcfonts/ChangeLog
index 83dfa56cdf04..311af0c1f6a8 100644
--- a/media-fonts/zh-kcfonts/ChangeLog
+++ b/media-fonts/zh-kcfonts/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-fonts/zh-kcfonts
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.10 2005/09/23 15:53:40 gustavoz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.11 2006/01/12 00:42:06 robbat2 Exp $
+
+  12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  zh-kcfonts-1.05.ebuild, zh-kcfonts-1.05-r1.ebuild:
+  Fix HOMEPAGE for ebuilds.
+
+*zh-kcfonts-1.05-r2 (12 Jan 2006)
+
+  12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/kcfonts-1.05-code-fixups.patch, +zh-kcfonts-1.05-r2.ebuild:
+  Rewrite ebuild to use freebsd upstream distfile, and include freebsd patches
+  and new patch for correct building - Part of Modular-X fixing.
 
   23 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   zh-kcfonts-1.05-r1.ebuild:
diff --git a/media-fonts/zh-kcfonts/Manifest b/media-fonts/zh-kcfonts/Manifest
index 737278ae232d..5a77e906a748 100644
--- a/media-fonts/zh-kcfonts/Manifest
+++ b/media-fonts/zh-kcfonts/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e730c7798768c6ef7553f7bacd2c3c9c ChangeLog 1490
-MD5 bff38eaac666848279f0ef4c525ade03 zh-kcfonts-1.05.ebuild 933
+MD5 fcd29c965b2324922c1717732227a787 files/digest-zh-kcfonts-1.05 65
+MD5 fcd29c965b2324922c1717732227a787 files/digest-zh-kcfonts-1.05-r1 65
+MD5 989bd743784e18d223710a6930a21be4 files/digest-zh-kcfonts-1.05-r2 142
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
 MD5 1715f32850b4d7b058da1a3346fa7be1 zh-kcfonts-1.05-r1.ebuild 824
-MD5 fcd29c965b2324922c1717732227a787 files/digest-zh-kcfonts-1.05-r1 65
-MD5 fcd29c965b2324922c1717732227a787 files/digest-zh-kcfonts-1.05 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDNCUuKRy60XGEcJIRAk14AJ9oIYJuk8QAIS9TqybDhkEihsvJdgCfU9u5
-6iDTaFfNGLo2p5ZRVdGXV5A=
-=uWoT
------END PGP SIGNATURE-----
+MD5 b63b8176de8fa9abf38b45a89b114372 zh-kcfonts-1.05-r2.ebuild 1177
+MD5 bff38eaac666848279f0ef4c525ade03 zh-kcfonts-1.05.ebuild 933
diff --git a/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r2 b/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r2
new file mode 100644
index 000000000000..48330d419ba2
--- /dev/null
+++ b/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05-r2
@@ -0,0 +1,2 @@
+MD5 f5a9dd06249082f271543a7149ffc5e0 kcfonts-1.05-freebsd-aa_ad.patch.gz 4825
+MD5 9c059651a572d922c1a8ece4feac758b kcfonts-1.05.tar.gz 903701
diff --git a/media-fonts/zh-kcfonts/files/kcfonts-1.05-code-fixups.patch b/media-fonts/zh-kcfonts/files/kcfonts-1.05-code-fixups.patch
new file mode 100644
index 000000000000..2acf25bd8f0a
--- /dev/null
+++ b/media-fonts/zh-kcfonts/files/kcfonts-1.05-code-fixups.patch
@@ -0,0 +1,181 @@
+Written by Robin H. Johnson <robbat2@gentoo.org>.
+
+This patch is meant as additional to the FreeBSD patches aa-ad.
+1. Cleans up the Makefile so that it is properly parallel.
+2. Makefile now tracks errors correctly (piped errors are lost to Make).
+3. Fixes bugs in the code that caused glibc's corruption detection to trigger.
+4. Fixes code so it should mostly compile on gcc4.
+
+diff -Nuar kcfonts-1.05.orig/Makefile kcfonts-1.05/Makefile
+--- kcfonts-1.05.orig/Makefile	2006-01-11 16:33:36.976771750 -0800
++++ kcfonts-1.05/Makefile	2006-01-11 16:32:31.416674500 -0800
+@@ -16,20 +16,25 @@
+ 
+ all:	$(FONTS)
+ 
+-kc24f.pcf.gz:	kc24f 
+-	./kc24f | bdftopcf | gzip - > kc24f.pcf.gz 
+-kc15f.pcf.gz:	kc15f
+-	./kc15f | bdftopcf | gzip - > kc15f.pcf.gz 
+-kc8x15.pcf.gz:	kca2et kc8x15
++.SECONDARY: $(FONTS:.pcf.gz=.pcf)
++
++%.pcf: %.bdf
++	bdftopcf $< -o $@
++%.pcf.gz: %.pcf
++	gzip -9 < $< > $@
++
++kc24f.bdf:	kc24f 
++	./kc24f > kc24f.bdf
++kc15f.bdf:	kc15f
++	./kc15f >kc15f.bdf
++kc8x15.bdf:	kca2et kc8x15
+ 	./kca2et kctext16.f00 ascfont.15 256 16 15
+ 	./kc8x15 > kc8x15.bdf
+ 	patch < kc8x15.diff
+-	bdftopcf kc8x15.bdf | gzip - > kc8x15.pcf.gz
+-kc12x24.pcf.gz:	kca2et kc12x24
++kc12x24.bdf:	kca2et kc12x24
+ 	./kca2et kctext24.f00 ascfont.24 256 48 48
+ 	./kc12x24 > kc12x24.bdf
+ 	patch < kc12x24.diff
+-	bdftopcf kc12x24.bdf | gzip - > kc12x24.pcf.gz
+ 
+ kc24f:		tran.o kc24f.o
+ 	$(CC) $(CFLAGS) tran.o kc24f.o -o $@
+@@ -52,4 +57,4 @@
+ 	mkfontdir $(EFONTDIR)
+ 
+ clean:
+-	rm -f kc*.pcf.gz ascfont.* *.o *~ $(PROGS)
++	rm -f kc*.pcf.gz ascfont.* *.o *~ $(PROGS) *.pcf *.bdf
+diff -Nuar kcfonts-1.05.orig/kc12x24.c kcfonts-1.05/kc12x24.c
+--- kcfonts-1.05.orig/kc12x24.c	2006-01-11 16:33:36.980772000 -0800
++++ kcfonts-1.05/kc12x24.c	2006-01-11 16:34:33.300291750 -0800
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ char bdfhead[]=
+ "STARTFONT 2.1\n"
+diff -Nuar kcfonts-1.05.orig/kc15f.c kcfonts-1.05/kc15f.c
+--- kcfonts-1.05.orig/kc15f.c	2006-01-11 16:33:36.980772000 -0800
++++ kcfonts-1.05/kc15f.c	2006-01-11 16:36:44.316479750 -0800
+@@ -8,6 +8,8 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <stdlib.h>
++#include "tran.h"
+ 
+ char head[]=
+ "STARTFONT 2.1\n"
+@@ -66,7 +68,7 @@
+ 	fprintf(stdout,"ENDCHAR\n");
+ }
+ 
+-main()
++int main()
+ {
+ 
+ 	if ((fp=fopen("spcfont.15","r"))==NULL) {
+@@ -111,5 +113,8 @@
+ 
+ 	fprintf(stdout,"ENDFONT\n");
+ 
+-	fclose(fp);
++	// fp points to f2, which is either closed or already invalid here.
++	// We don't care about leaking a single fd this late anyway
++	//fclose(fp);
++	return 0;
+ }
+diff -Nuar kcfonts-1.05.orig/kc24f.c kcfonts-1.05/kc24f.c
+--- kcfonts-1.05.orig/kc24f.c	2006-01-11 16:33:36.980772000 -0800
++++ kcfonts-1.05/kc24f.c	2006-01-11 16:37:14.438362250 -0800
+@@ -7,6 +7,8 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <stdlib.h>
++#include "tran.h"
+ 
+ char head[]=
+ "STARTFONT 2.1\n"
+@@ -45,7 +47,7 @@
+ {
+ u_char tt[3],uu[3];
+ u_char bf[24][3];
+-int v,i,j,zc;
++int v,i,zc;
+ 
+ 
+ if ((v=fread(bf,1,72,fp)) != 72) return; 
+@@ -66,7 +68,7 @@
+ fprintf(stdout,"ENDCHAR\n");
+ }
+ 
+-main()
++int main()
+ {
+ 
+ if ((fp=fopen("spcfont.24","r"))==NULL) {
+@@ -110,5 +112,8 @@
+ 
+ fprintf(stdout,"ENDFONT\n");
+ 
+-fclose(fp);
++// fp points to f2, which is either closed or already invalid here.
++// We don't care about leaking a single fd this late anyway
++//fclose(fp);
++return 0;
+ }
+diff -Nuar kcfonts-1.05.orig/kc8x15.c kcfonts-1.05/kc8x15.c
+--- kcfonts-1.05.orig/kc8x15.c	2006-01-11 16:33:36.980772000 -0800
++++ kcfonts-1.05/kc8x15.c	2006-01-11 16:34:43.984959500 -0800
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ char bdfhead[]=
+ "STARTFONT 2.1\n"
+diff -Nuar kcfonts-1.05.orig/kca2et.c kcfonts-1.05/kca2et.c
+--- kcfonts-1.05.orig/kca2et.c	1995-12-16 09:22:25.000000000 -0800
++++ kcfonts-1.05/kca2et.c	2006-01-11 16:35:33.604060500 -0800
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-void main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	int i;
+ 	unsigned char tmp[60];
+@@ -29,5 +29,6 @@
+ 	
+ 	fclose( fp );
+ 	fclose( fout );
++	return 0;
+ }
+ 
+diff -Nuar kcfonts-1.05.orig/tran.c kcfonts-1.05/tran.c
+--- kcfonts-1.05.orig/tran.c	1995-12-16 09:22:06.000000000 -0800
++++ kcfonts-1.05/tran.c	2006-01-11 16:18:10.186851000 -0800
+@@ -4,6 +4,7 @@
+  */
+  
+ #include <sys/types.h>
++#include <stdio.h>
+ 
+ void ser_b5(u_char *ch, u_char *tt)
+ {
+diff -Nuar kcfonts-1.05.orig/tran.h kcfonts-1.05/tran.h
+--- kcfonts-1.05.orig/tran.h	1969-12-31 16:00:00.000000000 -0800
++++ kcfonts-1.05/tran.h	2006-01-11 16:36:26.099341250 -0800
+@@ -0,0 +1,3 @@
++#include <sys/types.h>
++void ser_b5(u_char *ch, u_char *tt);
++void b5_ser(u_char *s, u_char *t);
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
index 8beaabc6b498..69e6facadf38 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild,v 1.8 2005/09/23 15:53:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild,v 1.9 2006/01/12 00:42:06 robbat2 Exp $
 
 KCFONTS="${P}.tgz"
 
 DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
 SRC_URI="ftp://ftp.freebsd.org.tw/pub/releases/i386/4.9-RELEASE/packages/x11-fonts/${P}.tgz"
-HOMEPAGE=""	#No homepage exists that I am aware of or able to find
+HOMEPAGE="http://freebsd.sinica.edu.tw/"
+# no real homepage exists, but this was written by Taiwanese FreeBSD devs
 
 LICENSE="freedist"
 SLOT="0"
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
new file mode 100644
index 000000000000..3ad1c1e564c6
--- /dev/null
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild,v 1.1 2006/01/12 00:42:06 robbat2 Exp $
+
+inherit toolchain-funcs eutils
+
+KCFONTS="${P}.tgz"
+
+MY_PN="kcfonts"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
+SRC_URI="ftp://freebsd.sinica.edu.tw/pub/distfiles/${MY_P}.tar.gz
+		ftp://wm28.csie.ncu.edu.tw/pub/distfiles/${MY_P}.tar.gz
+		mirror://gentoo/${MY_P}-freebsd-aa_ad.patch.gz"
+HOMEPAGE="http://freebsd.sinica.edu.tw/"
+# no real homepage exists, but this was written by Taiwanese FreeBSD devs
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="|| ( ( x11-apps/mkfontdir x11-apps/bdftopcf ) virtual/x11 )"
+RDEPEND=""
+S="${WORKDIR}"
+FONTPATH="/usr/share/fonts/${PN}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${DISTDIR}/${MY_P}-freebsd-aa_ad.patch.gz
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${MY_P}-code-fixups.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	insinto ${FONTPATH}
+	doins *.pcf.gz || die
+	sort kc_fonts.alias | uniq > ${T}/fonts.alias
+	doins ${T}/fonts.alias || die
+	mkfontdir ${D}/${FONTPATH}
+	dodoc 00README Xdefaults.*
+}
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild
index 5b9b1d913d56..d04d6e68898e 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild,v 1.8 2004/07/14 17:11:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild,v 1.9 2006/01/12 00:42:06 robbat2 Exp $
 
 DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
 SRC_URI="ftp://ftp.freebsd.org.tw/pub/releases/i386/4.9-RELEASE/packages/x11-fonts/${P}.tgz"
-HOMEPAGE=""	#No homepage exists that I am aware of or able to find
+HOMEPAGE="http://freebsd.sinica.edu.tw/"
+# no real homepage exists, but this was written by Taiwanese FreeBSD devs
 
 LICENSE="freedist"
 SLOT="0"