added prefix support (bug #484146)

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 38 insertions, 22 deletions

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index ce19faa92681..7b6bb6636ba2 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.185 2013/09/30 17:14:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.186 2013/10/17 22:49:36 ottxor Exp $
+
+  17 Oct 2013; Christoph Junghans <ottxor@gentoo.org> fontconfig-2.10.93.ebuild:
+  added prefix support (bug #484146)
 
   30 Sep 2013; Agostino Sarubbo <ago@gentoo.org> fontconfig-2.10.92.ebuild:
   Stable for x86, wrt bug #481824
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 98fa93887d20..000080de721c 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX fontconfig-2.10.2-docbook.patch 648 SHA256 d4b5acc1fe079071cbe7b886769dc561d6318f9193c1e32ed2cca9720a3c346e SHA512 b0adb7c406445c25c96c5dc37af9e6fcc8c75a0752af255465673812bdc332ce43439a100c056744ace0dd5b3350596eedd612489c33d19a6f6cd182c08e2961 WHIRLPOOL b2cfd619aff49024190409c33bd5ff3754b88e5c04a30df52c90bf0ab9b4ce5cd5727423939b70538760bb1e7a02325d76426cf94bdb9e8eb165966b40767197
 AUX fontconfig-2.10.92-automake-1.13.patch 4236 SHA256 130c3f824d6cb4bb251acff1d290140f4a72c99524aca1523d48572a9c831a45 SHA512 2be9f76684c16a2c136649262af6c9f4f362a6cc91dd782d644da7bdbb958a9058b65f245ee36e2327226b695fc86982ab6243eea15f3b274b9181d272f1a142 WHIRLPOOL 7e1655fa20b2b026772cbb4d5891a37f2c0277a1f45e130105f34a51de59b33f913a995c57c07ab201cd4d43bcc1a99fac5c0b109c5949e136d2b12e336bcc91
@@ -18,25 +18,19 @@ DIST fontconfig-2.10.93.tar.bz2 1526089 SHA256 ea901f278848829ed9937d76fb0ce63ad
 DIST fontconfig-2.8.0.tar.gz 1548409 SHA256 fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 SHA512 a110e72cc631f1e374324a02f6ba9526b89a547cafe2ae27b9913938b19018843b2940084d62f0dfaf38a6919dea6974fb98422d3908026f6873d5fba17c55a0 WHIRLPOOL cb7c5c461bcb0a0f6ef93d24a10506512beb99233a1f81d904321577c4023e38c7090806c616b8224689400fc4e2209e26aa20aa1f0ad84b2fcad5477061a003
 DIST fontconfig-2.9.0.tar.gz 1682774 SHA256 ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a SHA512 1e91132141756c7455b97fb4d7773b8c0812d98d0c0f5f137c728d6f03cb4601a7f2857c246bd63619d47a8d9aeceb475a16dd625bfc085e235e85b04d29014f WHIRLPOOL a3814b4b2a1b86cedde702545defbcfbca7d3d61ecf512f37a09b5c4041ebb317aadcde1553be534e70d30c212729f547b50cbcd3102226fa92a7c75a7e55620
 EBUILD fontconfig-2.10.92.ebuild 4303 SHA256 ed99599373ed5ed92f7475ba43dd8dfe0c10130b0a91d8665ea2fda383717b2c SHA512 a4db178067cc0804a55a435bd907bc7b135af5dd85febd7c29dce70598a751a9654979f75bce044254c05105fb627738173f78666a8a8b6c03b0307d1f4f92f1 WHIRLPOOL c7ca5c2a532dcee0897fe5908a6cbb7d01dabebe3de8bfe906ebcf86dd8f732b6034530f3814c8ae4c0e6ca3051489f57209f4667870e8f38c307d23f5c656dd
-EBUILD fontconfig-2.10.93.ebuild 3999 SHA256 e4b0597ebc3a574a753d09fa18bc16622b784215e7ab4c3a2477d97843077e18 SHA512 0915e8e2995c18745e7220fd69e04319769e0ace57d9143e052cf9a040058f8f96b636879bc874302cb536d71dd6fde271484014635a3dda1b7e1162f572388c WHIRLPOOL 7bc0a783d40f89b8c3602db389fb4594f2bdfce89ee14353c250b4093cf09098685e908235350fa1e584782622ce3c26cd315f42f3f606805eae8e67cf6ecb16
+EBUILD fontconfig-2.10.93.ebuild 4709 SHA256 5d6180fef41fe2cfe95218b145942c41f30bd130fb130c56f0829f320db65113 SHA512 3d32cc5127087c1473108b2dc27b6c9aeed4347246a853626fd16c271fc1bddb8e23fdd0ab00b392ffb6d47f49a9762653706d35c29377904c1b278eed85bd79 WHIRLPOOL 8b17b583b7ef1b3df8fe77b01131ef003382e7343bd0a086f674e69f4c02e55f5cfc4b797f33510605e19eb2d3636aef451712f0b264c8534e98330b1a0eb1ab
 EBUILD fontconfig-2.8.0-r1.ebuild 3979 SHA256 41cc191c9e0763037801dcc0c8d8c753ce3ec5f236cec906a2e21a6140e5306f SHA512 5f0e19e48f9a7ca5ea863f2dd6c1afdcc2de2433a06da0ce69e5b6fcb769c757ebf2dcfaa500fc6532862af100501d5162678a1f7ce11256a871520350956556 WHIRLPOOL 7aca6d65eba1a31ab29ade2dbe39f6fc85d6542bed47aaadd3bfa38f5708aacf60b357a8f2df61b16da7e654e91a16b345cf17997de775099bad91680d305c92
 EBUILD fontconfig-2.9.0.ebuild 4081 SHA256 6c897b70cec26bf69f8fd6344e62fa5204b4cd46860c1e5ea7cfa961c8b22b14 SHA512 7495d2a674d407d3ba535288b444034a3a7a9465eab1b89807e4f59366f0a8b548d0db973858026e58c4e633e0652ad7ffe9c0f5ba8037e207ede9082e84694b WHIRLPOOL 0d9a1b4d4dbd2c4e6fb790d5dea3e369ec112468843af9ce0c7a5f0dce0af1f411544b13dfeb4dceb4cfe9c1d5507dd304349ba33fc57a8a761ed47bc834ad18
-MISC ChangeLog 29543 SHA256 44bf412f0a0d7db3fadc0943dbd1a46cb2426ed850a020b41a3ad710d8488b49 SHA512 e480bd9744ee427b69809bc3b54793fe510c8cfa495d1ad965e3bf918adcf54bddcb5a3f026e3d6451b746cb73a11ba69eac4cb13e65eccd332597fee96a1d31 WHIRLPOOL 077c7a81fd068e31adc36e04373b35f20f480a04ce519a554e8a5053fc33d640db8b19f4c32b621c8a99bd0527ac304912805e9ecac30954327057837d8eae51
+MISC ChangeLog 29665 SHA256 62c0fe80b513c3e3162af0ad970accae27c7afa79959de90baa75f9e93f9e291 SHA512 96e473b24d50b38ad3b0514c16e656141370e927dd52f5acb72f2a35c550e7815c43425afd8fcd10dbc3aec0133f4121d31766db9828b313df3cd7917088fe3e WHIRLPOOL 27c3722419e8116d27f448f87d488febb16aadd30ef5e95f7a1485293f41841861fe7376af9c1f53c49825dd6251ad558649c64060f40858a22c6a1493275373
 MISC metadata.xml 727 SHA256 90e4744ccb449b368e08690f44e02d4d8812b2a85223fb28943e5cbfd9bc1cbc SHA512 57e7f4ccb02227afe7ff2a9e2ad78a7ad54932d900a82c470bf0a71056357e8393d27c73e7f9f78940d8dc35d83182a14a0ca8feffe4c08a029c158ba343724d WHIRLPOOL fb47925fc948cac4a70befbf369a1cafcc94b00b607e07709692288fca5dd4fadb2e8e2e0b1e495d92ed3746d9fa9d45fd45d6aa4dea403617aa78b13e8b4f89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSSbFjAAoJELp701BxlEWfbboQAJT3oV3FO7XW+84SbIxygfE4
-buezAmviTLzzGSteMe/ecAZXVT6Nx9LBnfjI6pJ8a9g9yRjwbgbosxQjUkYE7GlX
-Go4QWCFdvq1YMpMWOchlPOC/xekLowftGO9QK+9WkwWGyWoJmRFJ/7Ug2HgB0LZ9
-P5CfWEcjkY9G8LWcUcDkeUiF2y1t4QhiGNHsHikv7n693qSY0wCbBKJH3GR8EyHI
-rWqqBC7BBoMzudTMfcDsxC+8d1cweuOd5Z3a/Klw3P6d69tnkY+APPgIfwshWUMC
-4LD6CDpl0xkDAz7B9cgz7tGejeUnAAGQVo5e/KECM3FWORR84/cCkd/q3MbY2uV0
-qyA6KopoIGNSr+k1EIT6PMO0FwZkcjoX+yjqdKgLWwAwOVFaxajQOoMwCTKkqPdL
-MnS/AizL1vJz33Uu/4fzHPtT01M25rJZO/PpqaUdNiXLxJyfcHQgtL9Enec+ioy/
-vVh/S9+MhGT5QVuBwmH2BpdZ3IzT39PnMjQkNEicVVj8YHGLzodU5EAkKSk+0dpx
-8jTUAqiyPuxjbYSsjgH0nX66VrK99eSbHtdGzSL5AX0YQwkc6xj8u9264BpjCXfb
-Qcjn1evKmt1saNKpZ1NH9uawPvOQ/RJwgaPj7O/L1HbU2jgVTxlNu7Uc/FzSftdd
-94E7cSuR/e3EQRguuUxy
-=BrS2
+iQEcBAEBCAAGBQJSYGmIAAoJEOeBhlrCAAWGs8kH/jH9GjugVctyi6kNPOj2GiKo
+qmiqpdG32I56YU/e+BZWSgZHDvw5mhLODUtaKXXNaw57iswv921ArYPld7PGENix
+g9NTSrw6fOPoIcpXQvw2+YqOKtz76RwNOZjpbc2getLaniUPN3FAK03hKd9+/uZ4
+CUxvZjbGNF6ZTn4fax6ulVO2ujqP+WZgIIS5+AepY4PyABH4b1Xe5wjy5Yr+zXyF
+D0hdn9XFgiUnxVUcHpzL0pRPMD3fTEWv1ztfhrZQW+4v1dRt+3qD5rtTWLOttyD1
++Rj2K8Ry8qhaDxCIi6IBewOKDC2g4vaD/Ws7nvvxU0R9ixzExVC66e2gJE7tSqc=
+=xOpG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.10.93.ebuild b/media-libs/fontconfig/fontconfig-2.10.93.ebuild
index 20ae0349f4b5..ae51645de7df 100644
--- a/media-libs/fontconfig/fontconfig-2.10.93.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.93.ebuild,v 1.1 2013/08/21 08:42:47 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.93.ebuild,v 1.2 2013/10/17 22:49:36 ottxor Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -13,7 +13,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 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 ~arm-linux ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 		=app-text/docbook-sgml-dtd-3.1*
 		app-text/docbook-sgml-utils[jadetex]
 	)"
-PDEPEND="app-admin/eselect-fontconfig
+PDEPEND="!x86-winnt? ( app-admin/eselect-fontconfig )
 	virtual/ttf-fonts"
 
 PATCHES=(
@@ -44,13 +44,32 @@ pkg_setup() {
 }
 
 src_configure() {
+	local addfonts
+	# harvest some font locations, such that users can benefit from the
+	# host OS's installed fonts
+	case ${CHOST} in
+		*-darwin*)
+			addfonts=",/Library/Fonts,/System/Library/Fonts"
+		;;
+		*-solaris*)
+			[[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+				addfonts=",/usr/X/lib/X11/fonts/TrueType"
+			[[ -d /usr/X/lib/X11/fonts/Type1 ]] && \
+				addfonts="${addfonts},/usr/X/lib/X11/fonts/Type1"
+		;;
+		*-linux-gnu)
+			use prefix && [[ -d /usr/share/fonts ]] && \
+				addfonts=",/usr/share/fonts"
+		;;
+	esac
+
 	local myeconfargs=(
 		$(use_enable doc docbook)
 		# always enable docs to install manpages
 		--enable-docs
 		--localstatedir="${EPREFIX}"/var
 		--with-default-fonts="${EPREFIX}"/usr/share/fonts
-		--with-add-fonts="${EPREFIX}"/usr/local/share/fonts
+		--with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" \
 		--with-templatedir="${EPREFIX}"/etc/fonts/conf.avail
 	)