From: Peter Volkov <pva@gentoo.org>
Date: Thu, 13 Oct 2011 16:59:41 +0000 (+0000)
Subject: Add static-libs USE flag, bug #378313 thank Thomas Capricelli for report.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=819639959a254b947c237ca3fa63e64637f9eae6;p=gentoo.git

Add static-libs USE flag, bug #378313 thank Thomas Capricelli for report.

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64
---

diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 4572f01b9a38..13a2b7a3fa66 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/fontconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.157 2011/09/09 15:09:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.158 2011/10/13 16:59:41 pva Exp $
+
+  13 Oct 2011; Peter Volkov <pva@gentoo.org> fontconfig-2.8.0-r2.ebuild:
+  Add static-libs USE flag, bug #378313 thank Thomas Capricelli for report.
 
 *fontconfig-2.8.0-r2 (09 Sep 2011)
 
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index cd55bdae9d50..349bdc6b648d 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5
 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
 EBUILD fontconfig-2.8.0-r1.ebuild 3984 RMD160 5d05157dfa506f4624439fe07bc5d9aa45d945c5 SHA1 76ffcb1df0769dc71b834708c2490ab5845aeef5 SHA256 4da792319d5bdeb01e4d2b72ba75ee3b579507d95d9dff7aa3f160abb0ee3da5
-EBUILD fontconfig-2.8.0-r2.ebuild 4059 RMD160 d648d4799467c237ecacb8ae91f659b512228b99 SHA1 187af2a7946871d58cbed20ca4175772751086e9 SHA256 4c0f4c502b30cfd4e2b843e03be9d424a593cf05a7be70d1ddc56d596f6c2bf0
-MISC ChangeLog 24943 RMD160 98fd5da1b3ce48b007871c28104fc7bcde395656 SHA1 6051c5f5206decc523295ab73e80af782ef32e68 SHA256 b4556433cda098a9efffbe05c905fa3bf106cb874be45a7b6fc91efae18af3db
+EBUILD fontconfig-2.8.0-r2.ebuild 4083 RMD160 f0675faf882824c815b7b8e5eacae6897f61fac2 SHA1 ad376cd70ed1033d2208c5befde1c60f0afbe087 SHA256 ac0c5b478df65950842a0fe2a37d0ce5a07eb6497a6fc4051604cc61ac2d120c
+MISC ChangeLog 25087 RMD160 3062e8f98d3b80a234fa0cf3e3aecf68b29b66d4 SHA1 443390ed0ff1c3755181da6795ea43f6d0dccf5b SHA256 371024d112144575a262f725f8672aefe75621fd2b5d347527373992097e4af3
 MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOaiwyAAoJEOSiRoyO7jvoN5UP/jg93kbaKiAtmusJBgbHYhh8
-VPJuk6PaDemHlDw2pFno3hlq4Qb57alZzGnA5z5NlzOKqWT1DR707DAti0R/HSOu
-jlV0vFmzt7wnZ989JEGc9SP4dvyHXoA0IaRkWkGuoDoUWDdAHbKWizNgezkLSj3c
-OHjRfVDE5D4mt055JWmZ5vLIypkzQ16OjeWYzD62LBVkWhMZxwqxNI1VmKY0x1wV
-HTbk570nG7DryV0TEzn5hBIoLy7/9Akt84DrIoTdes5GVqpH+NgZH2fjhjQBIPVv
-Sd7aY8RvXZEWiZc1Hc/sVARl7f99/V7/CiHEIWJdMHiYmvzmINC5DqF33MAsUZeq
-3+Mrh8II4V2YVM7p06l+9dCPTmVE9JkfB2Axm2QRCYoBZZXwOJ+XNXPdLDHu/LkH
-j7p2iDl21XqMVzIMec8Hi7r0GqbJsRZ19qG6y22m2ly6CJaY0zj11kHoHIgDbWcu
-jeE+C/h0Ooa0rUbo+NK+0vaJ97Lcy0QBLV2WweEUreyHMvUJN6YGCr2a7xHTlYGW
-qIecrRafRSal3zSMlmi8obgzyg9Br7RGY2r7GGBJBv5rT/hhWPbG6ImBGKwx7snx
-we7fcAQZuoDqXlQs90X4cMt9aM1U7ZU97dgwwrmYXeE9j7Ou75MWNbuIM9Agt6y9
-LLkxjkvsJ4gxs6h7l9bA
-=bkGP
+iF4EAREIAAYFAk6XGJIACgkQGrk+8vGYmweTIgEA6P+Os+Etr07Cbu8oJRfVPlky
+GIpp1TuS9MO5diqTh+4A/07qNRFiMuvAJeNE5D4xihYpU8H0ebx4Q6010K5okxlS
+=pNOc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
index 5f06c71f620f..5bfd876e6c23 100644
--- a/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.1 2011/09/09 15:09:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.8.0-r2.ebuild,v 1.2 2011/10/13 16:59:41 pva Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit autotools eutils libtool toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ 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 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc"
+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.
@@ -50,7 +50,7 @@ src_configure() {
 		replace-flags -march=* -DMARCH_CENSORED
 	fi
 	econf \
-		--disable-static \
+		$(use_enable static-libs static) \
 		$(use_enable doc docs) \
 		$(use_enable doc docbook) \
 		--localstatedir=/var \