Version bump.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 142 insertions, 5 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index dc6c8e0daeae..e5761551cf6d 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.159 2012/04/26 19:28:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.160 2012/04/29 19:04:16 dirtyepic Exp $
+
+*fontconfig-2.9.0 (29 Apr 2012)
+
+  29 Apr 2012; Ryan Hill <dirtyepic@gentoo.org> +fontconfig-2.9.0.ebuild:
+  Version bump.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> fontconfig-2.8.0-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index eefc03c45df6..358bd6ddcd4e 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,14 +5,16 @@ AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef9
 AUX fontconfig-2.7.1-latin-reorder.patch 1701 RMD160 ea313617ab751d328e0c4cfb75262ed2acc9a4ef SHA1 e079a3d03c4e2e4dfd36131689694159591ce4bf SHA256 cd27212a9e8a3045106fd427f2e5079ea348789c8760e7af443c2745479c8f82
 AUX fontconfig-2.8.0-urw-aliases.patch 509 RMD160 b735f3bf416f79e82f2b0944e80972514c313ef6 SHA1 6af46fdd965cee43ec461cb2a4bd5e1fdffc8dd9 SHA256 4a1e122dd3b140765163ca72eba8c2c52daa9e9459ddbcb6a2eba9a5bebe76d4
 DIST fontconfig-2.8.0.tar.gz 1548409 RMD160 fefee412cad4fa71b573e997e14f1df12f439be2 SHA1 570fb55eb14f2c92a7b470b941e9d35dbfafa716 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
+DIST fontconfig-2.9.0.tar.gz 1682774 RMD160 9456d0ab2ae72086ec3edce9d72e007e2bf9bf1e SHA1 1ab2f437c2261028ae7969892277af2d8d8db489 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
 EBUILD fontconfig-2.8.0-r1.ebuild 3984 RMD160 5d05157dfa506f4624439fe07bc5d9aa45d945c5 SHA1 76ffcb1df0769dc71b834708c2490ab5845aeef5 SHA256 4da792319d5bdeb01e4d2b72ba75ee3b579507d95d9dff7aa3f160abb0ee3da5
 EBUILD fontconfig-2.8.0-r2.ebuild 4100 RMD160 f981d7f5a082db26f1d8262a790c9d2409398d35 SHA1 7450341dd9c80f9b26576d5610a139282644b4ab SHA256 20f66b437f904a1fc5064f1548f6f52297a0b23652947f06a639690c79e0c3e9
-MISC ChangeLog 25195 RMD160 152f0c82e68917efa0e4721dbc76cd53166d31aa SHA1 a3aaab3456f69b291cb6d0352df2d0ce431ad7cb SHA256 bf5a7a1a7128cd89539102b4fff3ace64a98a217b7ddca548b1f04fa614b8bee
+EBUILD fontconfig-2.9.0.ebuild 3999 RMD160 24265d6ec056db3c52c2f82174a4a9dbf6f3a8de SHA1 b852c1f913ff86462a8089b423d8bb813d558e62 SHA256 069965bd67956136e2ee3a0efd49139df7987cb100b75c080a9578189943e04d
+MISC ChangeLog 25320 RMD160 5078763aea7ad07250daf681366d92cd3a9ce725 SHA1 dd6597e1c55ae91548edac216ac4ffbee30fd38d SHA256 911401df3e61d41eadcc959d011189d8613bfd1ae70728183991642acbe51db0
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+Zoc8ACgkQvFcC4BYPU0oVxQCeKi/j57dx0u0rmoTJClIwtFlu
-NdkAoKr5TcLtR1FJ0CVAmQmG4bnKIVnC
-=fv/x
+iEYEARECAAYFAk+dktcACgkQiqiDRvmkBmKcYACgjqbVkDWY+JGxCXtRY+RLaVNF
+AOoAoM7paSQmY/VxMIGsvUOKDAPOIWBp
+=AZ0K
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.9.0.ebuild b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
new file mode 100644
index 000000000000..74376b797389
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.9.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.9.0.ebuild,v 1.1 2012/04/29 19:04:16 dirtyepic Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool toolchain-funcs flag-o-matic
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="http://fontconfig.org/"
+SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="doc static-libs"
+
+# Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
+# default and used by every distro.  See bug #283191.
+
+RDEPEND=">=media-libs/freetype-2.2.1
+	>=dev-libs/expat-1.95.3"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		app-text/docbook-sgml-utils[jadetex]
+		=app-text/docbook-sgml-dtd-3.1*
+	)"
+PDEPEND="app-admin/eselect-fontconfig
+	virtual/ttf-fonts"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.1-latin-reorder.patch	# 130466
+	epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch			# 310157
+
+	eautoreconf
+
+	# Needed to get a sane .so versioning on fbsd, please dont drop.
+	# If you have to run eautoreconf, you can also leave the elibtoolize
+	# call as it will be a no-op.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	if tc-is-cross-compiler; then
+		myconf="--with-arch=${ARCH}"
+		replace-flags -mtune=* -DMTUNE_CENSORED
+		replace-flags -march=* -DMARCH_CENSORED
+	fi
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable doc docbook) \
+		--localstatedir=/var \
+		--with-default-fonts=/usr/share/fonts \
+		--with-add-fonts=/usr/local/share/fonts \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install"
+	emake DESTDIR="${D}" -C doc install-man || die "emake install-man"
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	#fc-lang directory contains language coverage datafiles
+	#which are needed to test the coverage of fonts.
+	insinto /usr/share/fc-lang
+	doins fc-lang/*.orth
+
+	insinto /etc/fonts
+	doins "${S}"/fonts.conf
+
+	dodoc doc/fontconfig-user.{txt,pdf}
+	dodoc AUTHORS ChangeLog README
+
+	if [[ -e ${D}usr/share/doc/fontconfig/ ]];  then
+		mv "${D}"usr/share/doc/fontconfig/* "${D}"/usr/share/doc/${P}
+		rm -rf "${D}"usr/share/doc/fontconfig
+	fi
+
+	# Changes should be made to /etc/fonts/local.conf, and as we had
+	# too much problems with broken fonts.conf we force update it ...
+	echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > "${T}"/37fontconfig
+	doenvd "${T}"/37fontconfig
+
+	# As of fontconfig 2.7, everything sticks their noses in here.
+	dodir /etc/sandbox.d
+	echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > "${D}"/etc/sandbox.d/37fontconfig
+}
+
+pkg_preinst() {
+	# Bug #193476
+	# /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include various
+	# config files.  If we install as-is, we'll blow away user settings.
+	ebegin "Syncing fontconfig configuration to system"
+	if [[ -e ${ROOT}/etc/fonts/conf.d ]]; then
+		for file in "${ROOT}"/etc/fonts/conf.avail/*; do
+			f=${file##*/}
+			if [[ -L ${ROOT}/etc/fonts/conf.d/${f} ]]; then
+				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+					&& ln -sf ../conf.avail/"${f}" "${D}"etc/fonts/conf.d/ &>/dev/null
+			else
+				[[ -f ${D}etc/fonts/conf.avail/${f} ]] \
+					&& rm "${D}"etc/fonts/conf.d/"${f}" &>/dev/null
+			fi
+		done
+	fi
+	eend $?
+}
+
+pkg_postinst() {
+	einfo "Cleaning broken symlinks in "${ROOT}"etc/fonts/conf.d/"
+	find -L "${ROOT}"etc/fonts/conf.d/ -type l -delete
+
+	echo
+	ewarn "Please make fontconfig configuration changes using \`eselect fontconfig\`"
+	ewarn "Any changes made to /etc/fonts/fonts.conf will be overwritten."
+	ewarn
+	ewarn "If you need to reset your configuration to upstream defaults, delete"
+	ewarn "the directory ${ROOT}etc/fonts/conf.d/ and re-emerge fontconfig."
+	echo
+
+	if [[ ${ROOT} = / ]]; then
+		ebegin "Creating global font cache"
+		/usr/bin/fc-cache -srf
+		eend $?
+	fi
+}