From 1655426fe530e86b7d1dbcf5ebe4668b09b9e609 Mon Sep 17 00:00:00 2001 From: Ben de Groot Date: Sat, 13 Dec 2014 13:29:10 +0000 Subject: [PATCH] Prevent circular dependencies Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0F9C590B7FF324F6! --- media-libs/fontconfig-infinality/ChangeLog | 6 ++- media-libs/fontconfig-infinality/Manifest | 38 +++++++++---------- .../fontconfig-infinality-20130404.ebuild | 6 +-- media-libs/freetype/ChangeLog | 5 ++- media-libs/freetype/Manifest | 26 ++++++++++++- media-libs/freetype/freetype-2.5.4.ebuild | 4 +- 6 files changed, 57 insertions(+), 28 deletions(-) diff --git a/media-libs/fontconfig-infinality/ChangeLog b/media-libs/fontconfig-infinality/ChangeLog index eccba2fdc316..8b0e9ab11909 100644 --- a/media-libs/fontconfig-infinality/ChangeLog +++ b/media-libs/fontconfig-infinality/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/fontconfig-infinality # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/ChangeLog,v 1.8 2014/03/17 08:14:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/ChangeLog,v 1.9 2014/12/13 13:27:55 yngwin Exp $ + + 13 Dec 2014; Ben de Groot + fontconfig-infinality-20130404.ebuild: + Prevent circular dependencies 17 Mar 2014; Justin Lecher fontconfig-infinality-20130404.ebuild: diff --git a/media-libs/fontconfig-infinality/Manifest b/media-libs/fontconfig-infinality/Manifest index 75e5b7793975..00862102e4ec 100644 --- a/media-libs/fontconfig-infinality/Manifest +++ b/media-libs/fontconfig-infinality/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX Xresources 178 SHA256 434c990754b4fb41831bac2857138459db2822c68339cb71a61e66f3cba7674c SHA512 9b29089594c81f5adc533d2df299bffc696f3480344cc1010d128caa46e9668051e3b0bbfcaaf11dbaa737ab8f45f8fa9dba1d13554d5040a3f9130cd527a277 WHIRLPOOL e89812b63713446580085429c31842de1a45966fb48942278cb9eb38ff2ab82f596407ba839ffde4e1aeefdbecc036f597356f5751e7d3f08ec99410b0bfbf4b DIST fontconfig-infinality-20120619.tar.xz 18956 SHA256 56563ea3200fa9c9b0a269260115e93bb4a635cef073655bef8dbe541031cac6 SHA512 2b20dd6c459572d8864459c32b9a50cfa3757df9fbdab75528772be81dbe7de31d2e997c4047083270769ee80d5e110ca43a9bddaf8c771f70e4181cab7cfb56 WHIRLPOOL 9fb51dbd24e118b276a0e7688a5d8d1f3db4952a399ef076db62531bb13f48c5b7484f3664c0d8de6fc809ad37b76275a95124bea366d3a6bd4e847b5f354d2e @@ -7,25 +7,25 @@ DIST fontconfig-infinality-20130404.tar.xz 23344 SHA256 0704f593f2645866a831d54e DIST fontconfig-nyx-1.tar.xz 1344 SHA256 17b51546e95c5062789d9359b38a41bab9a40ab48889247c7baf340bba2441d5 SHA512 d4959b0e81f9dc3529f5ee043dd5e0c45dc66848f4685daa1ef02aa8a40ed8e229f1da3f20a1ff9e315b15daddf9fb37c6ec1396eb9965fdbe3faf22c1cc70c8 WHIRLPOOL 7eeb7c1ad460cd08b682b1da167df842daefcbde0eb759ccbb774f3b9c6d9f6454af7046d4301f0afcb51ac8cc94d97d69b985c94628b94a626457658815b4d6 DIST fontconfig-nyx-2.tar.xz 1376 SHA256 2381a784be2b6ca28aa74b1d67295c78a9b644fe0efa9eafd3d1f264f6b7b523 SHA512 7863c41f67b02a37d9d3b438bcd1d6ece2bf42310ea61090f4d6384e22893a4ffbb2f7bc349511f40ba4570784f14e5656506de6b7e60f6da9c9eaba252beb1d WHIRLPOOL 7f12f503f65c7b3e71b8ca12f4387bd3e28c7ff9da6169269ca30ee6921e169c3d22081adbdab3390d5e45c65c437f3aa57ad03b7a26a23c7f25e69322f5fb97 EBUILD fontconfig-infinality-20120619.ebuild 1513 SHA256 d08d193f81a950f4b1f8101357c6bd2d5b3b1ae8aaf277a212b8beffd79de033 SHA512 5a379c5adc14fba5cf3eea7366eef404fda407037bad064688b53b7dccac075a15ad1e4eda5e1ffcb44fd4e11c7160a20674ce9a7ac316d2b5bd0dc86932c72e WHIRLPOOL 129bca292f7ee344ff8d7edfbbeaaaff675632811426d6dbe66fee44ccf97c8823e9fda3141e4b4d9b5eb41cb323a2252015e83d880613339819db942664ad6a -EBUILD fontconfig-infinality-20130404.ebuild 1697 SHA256 c4f940da4684e89360151623e641689d4c1f23d52dc4175ddfa573fae3924138 SHA512 375fac896c963aa924e80776839c70de3e7fbb6e187ad709a357c50bd9a050acdd2234e235f6c38a7b692fb7259a917b598398e861d2ea08671ad8f0041872bf WHIRLPOOL 07ce35565585d4222ec2a16d2e664c669d8c853d6f2b6d004d442daaf2524a2d1869a72b02a9d1e5a510a7b9fb398a6de6a63d72724efae335ff57b6c46b3710 -MISC ChangeLog 1727 SHA256 c6bf3b5d83b821ecd63df0308d9cdbcfb6c13f0476a0acf4b7be6f78a44de2d0 SHA512 9e077db52b7e8698e1847c7a053406c84464b6af4e8b674d5b1ba139c77aa48160c857b6676d854b13d1f1fa7c1614581791ed72d1b8aca7d8174bd63bd6d607 WHIRLPOOL 8837984aede03d802291aa8244f1f5d43ed9cf6b185313156716464433207b47436aa60b4a89e2ec9d6e492f73a609400af175b0381c9326ace274e67a9f8273 +EBUILD fontconfig-infinality-20130404.ebuild 1699 SHA256 22af1dff79ae2ba9edbef8f7c9962709ac2765c7bb2e11438586fd571d7f8725 SHA512 d5b5686d024b23a21a1e2f692a484d6b7dac771ae9cf2df3047ab618264a2b08d34e47d46a3ece956692436a32f94ba2f50d3fe3ca4546e57d86d9f3925eff0b WHIRLPOOL 9df9e8931cce76c793f907dc2d75eeaf4c03da10a9e92949a2ddfc00fb8225c7946d8df938e0f5c6f545651ac6691169b3ab9ad347be68deb84357db292bf55c +MISC ChangeLog 1851 SHA256 066085b7c255fb382d399dd02fb2fca8ccd86c1e8d78c2c76c5ff8eb6746e8cd SHA512 bb88677bedd693f302c382f2b39484a89ce2e1a0497d298e0cb2521820ac8583572a138eca5d358f6b80fcbf0fcef81fd3d26e0271eb2c37955031689dc32b9c WHIRLPOOL 5d5af3cad635c407a1d1c5f15299a95c342d1ef2be5ef64dc681a3beae70fbe84c7663cc6312f661e6093bde725be3be23f727c85f5f84cbb4a6df0a486f7ad4 MISC metadata.xml 310 SHA256 ce59b523e34c6e814368726aeb94bb4d62cef84877b4d28a8075a9e2c7df37be SHA512 d6b5548f443c8eec47878afaa7ba56d70f275e7a70582e6e2578aaac42b2187c7831431ef6b54497dcb074a327a3de3e5ec4a3f95545278b880a09a1f2cadbac WHIRLPOOL 3feb5d2a6eb08bf1df031add09260cceea1c0609265891695f882bba25a85e424e6ef8fb7c3b4e400a2033c36c116a97e6fa827f8f04e98c774cfc1ef9db1b7c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJTJq7TXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirP9AP/A+sKUMcjhVgZagqfYEWPKtg -PjBX+IPgbz1mBMs93rM2jgAJIfGBsc3vYitugjTIBqtxEHlWvG5V9v3b7Rjf/6K3 -OsPFt0C6Kc2HyVmzYNu21RHqWyqgiHtu7nTq5VcKfd0MOrOqzc+DBxnm5QqVrtHV -zPDI+LkhY8bNHAaJB1Gt94fDezNGz3Gv865XHeBek09OLAX9E2CKrwzuc5C55M2W -rWzlXSCLPyNeXj1WvJlkyV4By7Aez4XmmumBryw++PdmOicVFbixZ4TuZ4z3STzc -R11T/JS8GtBLg/jOqn5F319iaTt56CFQ1DP2AfTwPgW/AP7Mp8KIohnN4pfKz7RT -/3+0XTuMaEWBMILxsGadbAQ3c5QJTyFxiLs5raqwjymT9/wy1sRORK9v2zU9Pff2 -VjG6cgTncgAzgnyh1CJGg1/yVh8P1CzrEvZ3tkrHulM4ydfJlnhyXh97GsHs3bPg -O9WKzHJ9vhVQJd3CAwvKz6uFKwN6wwP7PMVGz3VwW6jiUJNJggZHhloKSlFu54zn -cVPG08+dmO+3xUzuxF0YvItFsDfykmAdD5I9OcAYSB9QkZr2HMPz8TjY6ph58H4A -RWdKRohZg/AQtGKbInUBPkZrNwq1dsHQEP+B62fw+5LvjcbziRNVq+AKXlxaCEtY -1xCFEjq/UWaxOXXjFXev -=VdMI +iQJ8BAEBCABmBQJUjD7hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw +RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2OO8P/0IiFkHrTBF8qY6k6zyw+KRJ +XkeZCeZowos1rwk7IfK1s8faf2SUdIyBS9Ua2iz6Qnn8BLQKaU+cTUHIZPYVI8xU +L0S0+dCT1DFm9Nqdb953CC075/ZoiR/Z9oTmrdX905DDgJ7ThdiyCvfGBYzJo4xB +wgqPnqaQ4OciMl05EoUhblcjMBviTHqymukPWtNVxXWu4CeVi5yOw4DW2aU4bLeU +Rf3gHu5BHqg8oVUiZ/Vmbq+LvKEInF16M0FbgXvuFm9PpmtGI5ScJRY3xFVSr/NS +Pw4EcydLC+gcMkjuprgdS9BptE5e92s0iiCkdyhNRC+qhtbIfLasLVneoGzyrQyc +UGzFmMuL2jy1unGasDS2KLg4FpTer57diIh6dtKIqAPAWOP9RGmUEqcxi5SrgADa +kNMGIzZRaFg60tE0SxmD4m+GHmRS/I3lKiFpWm10gcrrXkHuh3902Hgaw1YICuWF +SCSN53d3bj8irvHCnXYOQTBp2gAE1UN36DNDOFTYhcta3gVaX47dJtz9KPuFv/cP +30jpL27bNDGZyyrL07vDfKvM1utS3eW0JjuzX4JtJwrSyKK3j8oDRYCtf6FXVe0h +cGHdSo3y1mZU3uVgk90GskTclGODyDJFtUGsLFs+T7LxJl2Uvs6riaYhSA5Zxf2R +rvIXxylQaAP1qhhUrwxV +=yGvg -----END PGP SIGNATURE----- diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild index 358e6daae8c8..b72a13f2653d 100644 --- a/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild +++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild,v 1.4 2014/03/17 08:14:10 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/fontconfig-infinality-20130404.ebuild,v 1.5 2014/12/13 13:27:55 yngwin Exp $ EAPI=5 inherit readme.gentoo @@ -18,10 +18,10 @@ IUSE="+nyx" DEPEND="" RDEPEND="app-admin/eselect-fontconfig app-admin/eselect-infinality - app-admin/eselect-lcdfilter + app-admin/eselect-lcdfilter" +PDEPEND="media-libs/freetype:2[infinality] >=x11-libs/libXft-2.3.0 nyx? ( media-fonts/croscorefonts )" -PDEPEND="media-libs/freetype:2[infinality]" src_configure() { : diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 6881a6c0eac9..b6758a0a3212 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.408 2014/12/13 12:28:59 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.409 2014/12/13 13:29:03 yngwin Exp $ + + 13 Dec 2014; Ben de Groot freetype-2.5.4.ebuild: + Prevent circular dependencies *freetype-2.5.4 (13 Dec 2014) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index fb8b11b4d538..183bb1cb6f50 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX freetype-2.3.2-enable-valid.patch 624 SHA256 3c26cd8b92510490b4bdbdd12b078e33a4f8607eaee64a800c3ea23097d5d43b SHA512 4dd637fa77b3386cc20fff3e68c64411fdc85a09b5bd61a75647aeff294e037c22cf0b788dae1e90f4cb12b1cb2775d0ac658c82eb998603b070af5f8242cff6 WHIRLPOOL 2c25610f0ecde1d5517c780d6db96abd00bbf04fda9343a3cb1ccaddf6b3263bfb6806d198db110566df1cfd765e1c734f6e303ab81a50e60ce7697ce506162e AUX freetype-2.4.11-sizeof-types.patch 1041 SHA256 b5ed7a7a8c10f3dcfd62a14998e640aeef185b45e291e5e1ce26b77b0509f77e SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc WHIRLPOOL 28db0f881d43c83cc1628f095c24a0c27e9bea322a5973de7640a35559ceed640433da8307d1692c808638b0bce34ebe3cacc46a42f8c6c66bbb6aa675dd06ee DIST freetype-2.5.1-infinality.patch 164325 SHA256 ff7c1760dfbc72675348810b3fd750b626f9d329b63daf7a78fb09d1ddfc4148 SHA512 d9ccc6e7143c901bc170d3d2014b7a0dae2cbc91af01795bb94fbbd56ece90dbc68cda78470e4402c89ea82d482746404d1f199acdf7b206b4129716e13ab2ef WHIRLPOOL d1550cdf2e23718e9642da7edde206b4687961c98153a3b108b1080924d3b72c23e42feffc67cf3527d9eba642c139999ec0c75e59d7ad6fd09b71f3a25b3cf5 @@ -9,6 +12,25 @@ DIST freetype-doc-2.5.4.tar.bz2 109647 SHA256 9fa6fb39a324d0b6b744d3745509c51d10 DIST ft2demos-2.5.3.tar.bz2 186773 SHA256 e6c9d0b344b88ff5ab25f20640cf78e2ec56bb81a89d1cd1716839357f646c8a SHA512 b239d6b7c1f4c0fa4137a97ab27834f296572a1d086247f1cb8ed01c7d1b3f54137ebfce1eea6f4a209079460ae2686d743097be5ab01e5bb108cf0d55361f4d WHIRLPOOL 0ceb42eca210814286a84cf0f066483ada3c7a9f97310051c5dfb1f1f6249608444c5d16400f5ce781073a303f70299226e9e8554882bd65ceb436b2f80ece2c DIST ft2demos-2.5.4.tar.bz2 187225 SHA256 54621937130926235abe05ba08aeb390a983998d2d1173c5fdc9ccb5bda4d96a SHA512 8fc0dd33ce7debc40b2ca696d965df7a72797042c7963aa19a41bc82c20fbc1c1a953535c58ff804a15dddb6f4f58a5d7038abd3949c37a787288720c7712345 WHIRLPOOL 270d8ef5b8d25c7e7c6b77f303eedd85c459b23ac699961637430869f7a3d6d21ee3ce97a34aee6633b25118b1048d7fe65283a26400f2c93eda829f08202602 EBUILD freetype-2.5.3-r1.ebuild 5324 SHA256 9238160476f32980772b6cf54004b8aa20f2f226e51faf959c04adf65223d33a SHA512 ac9d9e3048e78e59a45705b933d255fbdb52ec33bfc8e7ccc24bb6e8ec63871f50c4ecb93fe5c1dda6179375a1c0f34e2bfb3ae1fd2c97bcbd33e641aa11062e WHIRLPOOL 5e0a523f2f0e4c86db6846b9c99a24e6d250ce05f699101a2e4e6a2647b5c562e0822350f01870469f19d32e7d4122a3a9326a3fb26f57195cd711d4a3f000e3 -EBUILD freetype-2.5.4.ebuild 5374 SHA256 833816e894b85f9f81b4a6d61a086a3caa390f3e3c34ab59fbba65ddf1fdf90c SHA512 0214860374241d30a147addbe58ee02bfadd844924ddd137f2b62d95aaf6a90f2d82b0d6968c25e9d78a8f8dd29afce57b97635f9a1263ad8bfe2b267469fe60 WHIRLPOOL ec84a00436590906be011f2af90257e3f431349a7b5c996a70df38448e23a79144bc3d48c6527a3e063ae2f5730cf357306270fd22923eb603e5bfe0b9be694a -MISC ChangeLog 62064 SHA256 70df558bf4d854c8a73759878d3c2f1bd93756736a8991b6278e1dabfc8663a4 SHA512 c754eb19981b3524d5aa8cc506c74f9cd02593cfdcec2538bde4ecb86ee1ba48282c6a4a9f422dd2fad773276fd2f0bad10d64034e6681a25beef09195c9ed6f WHIRLPOOL 55ef049bbee3dcbec9a68da014785107b2c2454cfb3238fa5ccc55ef361319ba0d49f1c68100eba98787c78f02c09a378cc8b69feedf59e0191cc51f50805f95 +EBUILD freetype-2.5.4.ebuild 5383 SHA256 0c46d7298643901883c069bbc4389da64f137cb30362f3aa0baea322cc3596c4 SHA512 053a0e5fa0c35d3030ae183d37eb753ca211460eb86522e04af2a7a4fb0f781e016b3746161a76bf9f34629ae7180e5082d2a9a33d938f3e4a2aca89453a074f WHIRLPOOL f180b2146cf160b28b931fd504044249fc100a1ffd07fd47e288c740ee6cee1193e3951289bb1d0fda0f4362a982ec64261920a8c7c4ccf17a009653dd044f89 +MISC ChangeLog 62168 SHA256 6b048515a7e77c3f01c19f117c6ac0fecbb6aeacb45ada96561307ac907ab788 SHA512 cfd27313ad874dc03b59fc3d714fc17e81a4fe5101e545cfe09dbe14fd34a95a851e08f39d2b7e01ef9e531eaad7da10d1bc2209c27fad630e547ce947535b88 WHIRLPOOL 7a7bce87cf0da4c29b5fff0b6b4dfc13dc944e523de752e0ff14a164b068c6f6ea36cb6a3ae0c018c50086bf55cea1697aed73b24de33ff43679baf5207d3268 MISC metadata.xml 1400 SHA256 65a92662484be603be8adae907f727219ca78e4cb042350d2741c2fa03fde8a7 SHA512 e3052be471b660ff82261b8cf055a2ae20421d51c0ecdbc31a777aabab3708578012682e01b8b7d200cdd53bf980b4515de68196aac5711a2fd4a8799c1051a9 WHIRLPOOL 3bb9331dde6579280d3b673b62d6086f142a23210f40ab2c3a0cedfed39b067c5d2bf5eed3055f03071e650822723ce919d6a938ada5276c38d05265d71dc828 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJUjD8kXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw +RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2MH8QAJkZPt7FRbCZ24EjWe/LAoI2 +hyAeymiMWZtyGXBUR3S5QE+0ZYkULLv9jpLe3QRKiZk64YFDNUY/JFIgpjXGKrCB +gwXfDQRD9PgVCjKD8ql9vtUUJwN8ZzfcuRYLb9Z9jHi7kraRcIeTABDOd4B4gfHf +zP3y8tMSh7s3LX7NOJ590CmjWeEKkbDjCMy7r0P9178ynMo4UO0fPc42hPsA9t3F +RyhMKswyJ8Y5c0bj89QWbwYMHy/84OBvN5n6lvAGgwWFusC6dG9eHrsJJawcYJK5 +M2PQuhUICgH82pOfaL+dPCMQOtjHEne4/stxuYUH/dOu28IrKDgGq+iatZZCglAX +nXdJcSv2W9LZ3TKScIrxAQIGfanrPR3xH2afHCvOYG5GOp59b+RaKObUdvGvOZe5 +7Foh6h+5D719yDSRT7cvscXv2LWh/UYHdEUtzNL0iHTAlfP6tvopgTal4kLCVRps +qUHze72HNPI+fg3ogmUJ1c2zM3Ix4dKsPl46VnQgltDAYf0o6tHiDwBsErVC4lEk +M/o/A+IlsL94maK6JJw3/e84wUbrYN2aSztVNtItNfZ9pOwa/Qkr1b3Ut8UbnNAH +vrB4Tqwz4T9SvP4K1QQs8AMi4uXtYf89eRu4P4XarLtlJKSPYCEaMFmws0G/KRWy +VF6PdEzIGJ/M7PUYsWjL +=wmzN +-----END PGP SIGNATURE----- diff --git a/media-libs/freetype/freetype-2.5.4.ebuild b/media-libs/freetype/freetype-2.5.4.ebuild index b920c31fdf2f..20bb2e437bb3 100644 --- a/media-libs/freetype/freetype-2.5.4.ebuild +++ b/media-libs/freetype/freetype-2.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.1 2014/12/13 12:28:59 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.2 2014/12/13 13:29:03 yngwin Exp $ EAPI=5 inherit autotools-multilib flag-o-matic multilib toolchain-funcs @@ -33,8 +33,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} - infinality? ( media-libs/fontconfig-infinality ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" +PDEPEND="infinality? ( media-libs/fontconfig-infinality )" src_prepare() { enable_option() { -- 2.26.2