add a couple of enhancing patches

(Portage version: 2.1_pre4-r1)

6 files changed, 153 insertions, 11 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 0a94505277ed..171c0953abd8 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.65 2006/03/31 20:11:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.66 2006/04/07 11:18:52 foser Exp $
+
+*fontconfig-2.3.2-r1 (07 Apr 2006)
+
+  07 Apr 2006; Marinus Schraal <foser@gentoo.org> fontconfig-2.3.2-r1.ebuild,
+  files/fontconfig-2.3.2-pkg_config.patch, files/fontconfig-2.3.2-symbol_alias.patch :
+  Fix pkgconfig includes crudely (#83623)
+  Remove reference to /usr/X11R6 in configure (#122526)
+  Install more docs (#124287, thanks to Andy Kittner)
+  Add aliases for symbol and dingbats fonts (#124238, thanks to Florian Mickler)
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   fontconfig-2.3.2.ebuild:
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 32646958c41b..d8d21aa174a2 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3dbc7169f9274cf6bf5c42ed0af771bb ChangeLog 9675
 RMD160 b791a8c22b2903b6ad811ddda046430f274ba33e ChangeLog 9675
 SHA256 991c5abadc40324a63069164d89fed722179900eb14a392ac107b5cbff6abc7d ChangeLog 9675
@@ -13,6 +10,15 @@ SHA256 6279d05d4c738283365c60a3a551157a8237d2423c12b9c087a621900273025c files/di
 MD5 10083207a4ef051d20d11e0838bdae94 files/digest-fontconfig-2.3.2 68
 RMD160 b7b2cd4916c2b16464ef99b60f694b2d183e3194 files/digest-fontconfig-2.3.2 68
 SHA256 bcf0550be26b78c15d8112b91ac08ec11e0645db20bd4acf0e6896039b66aeea files/digest-fontconfig-2.3.2 68
+MD5 c77d154bcfcfd17b636769089ba8a821 files/digest-fontconfig-2.3.2-r1 250
+RMD160 1aeaff56f8319f0831d42d6a367f83a57b51e0f6 files/digest-fontconfig-2.3.2-r1 250
+SHA256 94de40c9bac3de79a1bfc417f64d89398077e18e222d171493901211dac8bcae files/digest-fontconfig-2.3.2-r1 250
+MD5 083e41bbcbce3f6ee01214d8cecf150b files/fontconfig-2.3.2-docbook.patch 506
+RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 files/fontconfig-2.3.2-docbook.patch 506
+SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 files/fontconfig-2.3.2-docbook.patch 506
+MD5 980e58c4f197eb4f49b2dbded6099b82 files/fontconfig-2.3.2-symbol_alias.patch 398
+RMD160 de0f6398031db4d0ed90b39979279be422251b1a files/fontconfig-2.3.2-symbol_alias.patch 398
+SHA256 7df1bc192734a1b4f304fe729707fe57c22bf81954fb3459f440980b4284082b files/fontconfig-2.3.2-symbol_alias.patch 398
 MD5 37e60cdff43bf3f04e9db8931e0d1f47 files/patch/fontconfig-2.1-slighthint.patch 2171
 RMD160 58ce193f26b0b14ae5da950a1dbfbadf733577b9 files/patch/fontconfig-2.1-slighthint.patch 2171
 SHA256 d356ed4533d1d21c8d326fb183199c1d554888a5a8dd1e4883c931bcb0b84dc4 files/patch/fontconfig-2.1-slighthint.patch 2171
@@ -31,16 +37,12 @@ SHA256 64bd58e2373b6f15e887b191d3ba2f91fd9c8dfc9c22983c3c4601ab3d9a43de fontconf
 MD5 7fe2a6a842745d66817206e354bc47d8 fontconfig-2.2.3.ebuild 2752
 RMD160 b3cdaddad6fc7b8e50fee6e987a804d2f66dee9b fontconfig-2.2.3.ebuild 2752
 SHA256 3fbb8735612c0fc1fbc95732a22acf393f047e022de124775efd06f98b257f35 fontconfig-2.2.3.ebuild 2752
+MD5 d7fea799e726c1036752bc9f40b3f4d2 fontconfig-2.3.2-r1.ebuild 2210
+RMD160 9d4e5f9d279485bba62a77562de9c42843621f8e fontconfig-2.3.2-r1.ebuild 2210
+SHA256 a172a205957f867788d8556d8a85f90e349d072edb5cc4ee9f3c760988ad8702 fontconfig-2.3.2-r1.ebuild 2210
 MD5 a578afa9a421f842533106bb0b978d0d fontconfig-2.3.2.ebuild 2169
 RMD160 cb17f29befa2b9577c83cb43d9f5cf97661d3363 fontconfig-2.3.2.ebuild 2169
 SHA256 e1dae86754014d59880d8310455ce7107b7fe750dbe906c69a93c5bbc933434b fontconfig-2.3.2.ebuild 2169
 MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
 RMD160 898b8233ab233060d8137dadf28c291b83a65500 metadata.xml 419
 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db metadata.xml 419
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELYz2AiZjviIA2XgRAqrNAKDNWhqg9f6opXZcBKi6O94sPO5wVQCeI88v
-03Ak1lQacc2OiRv8aLy5HWc=
-=XwlN
------END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1 b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1
new file mode 100644
index 000000000000..cfe4f11048a6
--- /dev/null
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.3.2-r1
@@ -0,0 +1,3 @@
+MD5 7354f9f125ea78a8f2851cb9c31d4866 fontconfig-2.3.2.tar.gz 964045
+RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b fontconfig-2.3.2.tar.gz 964045
+SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227 fontconfig-2.3.2.tar.gz 964045
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch
new file mode 100644
index 000000000000..eb483db69278
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.3.2-pkg_config.patch
@@ -0,0 +1,10 @@
+--- fontconfig-2.3.2/fontconfig.pc.in	2003-03-05 07:09:14.000000000 +0100
++++ fontconfig-2.3.2/fontconfig.pc.in.new	2006-04-07 12:54:19.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+-Libs: -L${libdir} -lfontconfig
+-Cflags: -I${includedir}
++Libs: -L${libdir} @FREETYPE_LIBS@ -lfontconfig -lexpat
++Cflags: -I${includedir} @FREETYPE_CFLAGS@
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch
new file mode 100644
index 000000000000..2d35ff139cf7
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch
@@ -0,0 +1,22 @@
+--- fontconfig-2.3.2/fonts.conf.in	2005-04-03 23:07:50.000000000 +0200
++++ fontconfig-2.3.2/fonts.conf.in.new	2006-04-07 13:10:55.000000000 +0200
+@@ -311,6 +311,19 @@
+ 		</prefer>
+ 	</alias>
+ 
++<!--
++ Suitable free alias for Symbol font
++ -->
++
++	<alias>
++		<family>Symbol</family>
++		<accept><family>Standard Symbols L</family></accept>
++	</alias>
++	<alias>
++		<family>ZapfDingbats</family>
++		<accept><family>Dingbats</family></accept>
++	</alias>
++
+ <!-- 
+  Artificial oblique for fonts without an italic or oblique version
+  -->
diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..c9edfb8016c2
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.1 2006/04/07 11:18:52 foser Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
+
+LICENSE="fontconfig"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=media-libs/freetype-2.1.4
+	>=dev-libs/expat-1.95.3"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd "${S}"
+	# alias for Symbol and dingbats font (#124238)
+	epatch ${FILESDIR}/${P}-symbol_alias.patch
+	# fix pkgconfig includes (#83623)
+	epatch ${FILESDIR}/${P}-pkg_config.patch
+
+	elibtoolize
+	epunt_cxx #74077
+
+}
+
+src_compile() {
+
+	[ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
+		die "Dont compile fontconfig with ccc, it doesnt work very well"
+
+	# disable docs only disables local docs generation, they come with the tarball
+	econf --disable-docs \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-default-fonts=/usr/share/fonts \
+		--with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \
+		|| die
+
+	# this triggers sandbox, we do this ourselves
+	sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die
+
+	insinto /etc/fonts
+	doins ${S}/fonts.conf
+	newins ${S}/fonts.conf fonts.conf.new
+
+	cd ${S}
+	newman doc/fonts-conf.5 fonts-conf.5
+	newman fc-cache/fc-cache.man fc-cache.1
+	newman fc-list/fc-list.man fc-list.1
+
+	dohtml doc/fontconfig-user.html
+	dodoc doc/fontconfig-user.{txt,pdf}
+
+	if use doc; then
+		doman doc/Fc*.3
+		dohtml doc/fontconfig-devel.html doc
+		dohtml -r doc/fontconfig-devel
+		dodoc doc/fontconfig-devel.{txt,pdf}
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf, we force update it ...
+	# <azarah@gentoo.org> (11 Dec 2002)
+	ewarn "Please make fontconfig related changes to /etc/fonts/local.conf,"
+	ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!"
+	mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf
+	rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf
+
+	if [ "${ROOT}" = "/" ]
+	then
+		echo
+		einfo "Creating font cache..."
+		/usr/bin/fc-cache
+	fi
+
+}