remove stupid date in fonts.conf

6 files changed, 23 insertions, 55 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index e38d9a0a9172..6b1b86e86097 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.5 2002/10/27 16:15:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.6 2002/10/29 21:13:38 azarah Exp $
+
+*fontconfig-2.0-r2 (29 Oct 2002)
+
+  29 Oct 2002; Martin Schlemmer <azarah@gentoo.org> fontconfig-2.0-r2.ebuild :
+  Do not include date in generated /etc/fonts/fonts.conf, as users do not
+  seem to know how to set their timezone, or what to do with 'zic' for that
+  matter.  Bugs #9473, #9705 and #9768.
 
 *fontconfig-2.0-r1 (26 Oct 2002)
 
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r1
deleted file mode 100644
index 05efa21a9a47..000000000000
--- a/media-libs/fontconfig/files/digest-fontconfig-2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ef5c58e501b0cb873ee2b2a04ed74e3 fcpackage.2_0.tar.gz 538159
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.0 b/media-libs/fontconfig/files/digest-fontconfig-2.0-r2
index 05efa21a9a47..05efa21a9a47 100644
--- a/media-libs/fontconfig/files/digest-fontconfig-2.0
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.0-r2
diff --git a/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch b/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch
new file mode 100644
index 000000000000..3983cd5c02c8
--- /dev/null
+++ b/media-libs/fontconfig/files/patch/fontconfig-2.0-remove-stupid-date.patch
@@ -0,0 +1,11 @@
+--- fcpackage.2_0/fontconfig/setfontdirs.orig	2002-10-29 22:58:41.000000000 +0200
++++ fcpackage.2_0/fontconfig/setfontdirs	2002-10-29 23:00:10.000000000 +0200
+@@ -11,7 +11,7 @@
+ chmod +w fonts.conf
+ ed fonts.conf << EOF
+ /FONTPATH_END/a
+-<!-- Font directory list configured on `date` -->
++<!-- Font directory list configured for Gentoo -->
+ .
+ +r $FONTDIRS
+ a
diff --git a/media-libs/fontconfig/fontconfig-2.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.0-r2.ebuild
index 704cead38ba3..a76f2e7aa0b3 100644
--- a/media-libs/fontconfig/fontconfig-2.0-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r1.ebuild,v 1.1 2002/10/27 16:15:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0-r2.ebuild,v 1.1 2002/10/29 21:13:38 azarah Exp $
 
 S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
 DESCRIPTION="A library for configuring and customizing font access."
@@ -30,6 +30,9 @@ src_unpack() {
 	# Patch from Keith Packard to fix problem where 
 	# subdirectories could get lost from ~/.fonts.cache
 	patch -p1 < ${PPREFIX}-2.0-subdir.patch &> /dev/null || die
+	# Remove stupid date, as a lot of users do not seem to know
+	# how to use 'zic' ...
+	patch -p2 < ${PPREFIX}-2.0-remove-stupid-date.patch &> /dev/null || die
 }
 
 src_compile() {
diff --git a/media-libs/fontconfig/fontconfig-2.0.ebuild b/media-libs/fontconfig/fontconfig-2.0.ebuild
deleted file mode 100644
index 64df4e521f92..000000000000
--- a/media-libs/fontconfig/fontconfig-2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.0.ebuild,v 1.6 2002/10/25 13:01:20 jmorgan Exp $
-
-S="${WORKDIR}/fcpackage.${PV/\./_}/fontconfig"
-DESCRIPTION="A library for configuring and customizing font access."
-SRC_URI="http://fontconfig.org/release/fcpackage.${PV/\./_}.tar.gz"
-HOMEPAGE="http://fontconfig.org/"
-
-LICENSE="fontconfig"
-SLOT="1.0"
-KEYWORDS="x86 alpha ppc sparc sparc64"
-
-DEPEND=">=media-libs/freetype-2.0.9
-	>=dev-libs/expat-1.95.3
-	>=sys-apps/ed-0.2"
-
-
-src_compile() {
-	econf || die
-	
-	emake || die
-}
-
-src_install() {
-	einstall confdir=${D}/etc/fonts \
-		datadir=${D}/usr/share || die
-
-	insinto /etc/fonts
-	doins ${S}/fonts.conf
-
-	cd ${S}
-	
-	mv fc-cache/fc-cache.man fc-cache/fc-cache.1
-	mv fc-list/fc-list.man fc-list/fc-list.1
-	mv src/fontconfig.man src/fontconfig.3
-	for x in fc-cache/fc-cache.1 fc-list/fc-list.1 src/fontconfig.3
-	do
-		doman ${x}
-	done
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		einfo "Creating font cache..."
-		/usr/bin/fc-cache
-	fi
-}
-