Readd 2.3.2-r1 for bug #185484.

Package-Manager: portage-2.1.3_rc8

6 files changed, 161 insertions, 5 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 0cd6d028c557..13f8e2fc539e 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.93 2007/07/15 22:16:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.94 2007/07/16 01:31:54 dirtyepic Exp $
+
+  16 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/fontconfig-2.3.2-pkg_config.patch,
+  +files/fontconfig-2.3.2-symbol_alias.patch, +fontconfig-2.3.2-r1.ebuild:
+  Readd 2.3.2-r1 for bug #185484.
 
   15 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
   -files/patch/fontconfig-2.1-slighthint.patch,
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index f3bbe81a4854..58c07bf6f0c6 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -2,19 +2,35 @@ AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef9
 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
+AUX fontconfig-2.3.2-pkg_config.patch 421 RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e SHA1 5c1ee873eafcbb64cc6314a9a045eaf8cc8eedb0 SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88
+MD5 89e73e244d58f9a2f27bca903ed69000 files/fontconfig-2.3.2-pkg_config.patch 421
+RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e files/fontconfig-2.3.2-pkg_config.patch 421
+SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88 files/fontconfig-2.3.2-pkg_config.patch 421
+AUX fontconfig-2.3.2-symbol_alias.patch 532 RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 SHA1 8108108700b3e4f3d8b13161d8e8c88611387256 SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58
+MD5 a64531ab26e1d4d97f4d6dbd1f7c245c files/fontconfig-2.3.2-symbol_alias.patch 532
+RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 files/fontconfig-2.3.2-symbol_alias.patch 532
+SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58 files/fontconfig-2.3.2-symbol_alias.patch 532
+DIST fontconfig-2.3.2.tar.gz 964045 RMD160 42668475cca88f265a3b12c289eea2ff61ddaa2b SHA1 8ec60da668618383b539db9d70b8e320bd7dd031 SHA256 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227
 DIST fontconfig-2.4.2.tar.gz 1278340 RMD160 c953020a5193500080c9eceef47b76e61c41b188 SHA1 cd5e30625680a0435563b586275156eaf8d0d34a SHA256 63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
+EBUILD fontconfig-2.3.2-r1.ebuild 2687 RMD160 019cb380bbdbf76aa4779c662aea91622e251710 SHA1 fb92dfdf01a07ca8268e5a04d00d971f3ae373c9 SHA256 29afe3d8cafc507f934c663f9a052901e96dc90b68dfaa17d7678f58c8fdcca7
+MD5 9a63a9a8f9479e6148b46d08d99ed433 fontconfig-2.3.2-r1.ebuild 2687
+RMD160 019cb380bbdbf76aa4779c662aea91622e251710 fontconfig-2.3.2-r1.ebuild 2687
+SHA256 29afe3d8cafc507f934c663f9a052901e96dc90b68dfaa17d7678f58c8fdcca7 fontconfig-2.3.2-r1.ebuild 2687
 EBUILD fontconfig-2.4.2.ebuild 2456 RMD160 5c80bd1ec72cf21da6d59d8197cbd5a5be75d92c SHA1 b13bb9abaa911836722d794c2c3b933bc7d9be67 SHA256 92dd8ebca46c089e2b534c3f9a1054b3b961e08057f66bc955a7df4fa3f0ba28
 MD5 d38eebdd0f2585c7e8f539d80b3bd018 fontconfig-2.4.2.ebuild 2456
 RMD160 5c80bd1ec72cf21da6d59d8197cbd5a5be75d92c fontconfig-2.4.2.ebuild 2456
 SHA256 92dd8ebca46c089e2b534c3f9a1054b3b961e08057f66bc955a7df4fa3f0ba28 fontconfig-2.4.2.ebuild 2456
-MISC ChangeLog 14064 RMD160 404101479899598ae1f0af3f6bdd2598917139fc SHA1 d4dc8ae17d6d11aa0de4d89fcbf093cd754c3195 SHA256 5e3aeb6c50b4492d4f4894b2600b0a42e35aa3628316e1878da4b2fb97c2769a
-MD5 1d59ee68125c51a3b7150bbeb973a44d ChangeLog 14064
-RMD160 404101479899598ae1f0af3f6bdd2598917139fc ChangeLog 14064
-SHA256 5e3aeb6c50b4492d4f4894b2600b0a42e35aa3628316e1878da4b2fb97c2769a ChangeLog 14064
+MISC ChangeLog 14266 RMD160 079f7c52f7beed141c133b62f6097886291f8939 SHA1 cce83fa33b8817713e303e1f3fcbc8a78d5f148c SHA256 294ed7ef9e7ff829d8a9dc6f4db47bccfd11045b63416018cb465f3cdadd7d66
+MD5 514da4a465a77bc5477ef954ef875e8b ChangeLog 14266
+RMD160 079f7c52f7beed141c133b62f6097886291f8939 ChangeLog 14266
+SHA256 294ed7ef9e7ff829d8a9dc6f4db47bccfd11045b63416018cb465f3cdadd7d66 ChangeLog 14266
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 MD5 ae7171ca850597a2455b8b10c72a8de1 metadata.xml 419
 RMD160 898b8233ab233060d8137dadf28c291b83a65500 metadata.xml 419
 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db metadata.xml 419
+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 fefe447bacb538f936842e208c14c256 files/digest-fontconfig-2.4.2 253
 RMD160 4429ea91b6eb7e40bc3b187eba17603db99d6b1c files/digest-fontconfig-2.4.2 253
 SHA256 9bc90b9f75481e3584bd531ea37f75a3507873a272bfbb1d1a0d8213fbb7b4fc files/digest-fontconfig-2.4.2 253
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..573ba4d3c54f
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2007 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.20 2007/07/16 01:31:54 dirtyepic Exp $
+
+WANT_AUTOMAKE=1.9
+inherit eutils libtool autotools
+
+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 ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=media-libs/freetype-2.1.4
+	>=dev-libs/expat-1.95.3"
+# autotools.eclass RDEPEND overrides implicit DEPEND=RDEPEND
+RDEPEND=${DEPEND}
+
+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
+	# add docbook switch so we can disable it
+	epatch "${FILESDIR}"/${P}-docbook.patch
+
+	eautoreconf
+
+	# 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 \
+		--disable-docbook \
+		--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 -j1 || 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
+
+}