[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     bcc92c783dd08bac81a2976fb5a7e2fde0acad28
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 22:25:55 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 22:25:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=bcc92c78

dev-java/icedtea: Deal with Infinality issue, fixes bug #590068

I feel this story isn't over but for now, let's peg Infinality support
back to FreeType versions before 2.6.4.

Package-Manager: portage-2.3.0

 dev-java/icedtea/icedtea-3.1.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild 
b/dev-java/icedtea/icedtea-3.1.0.ebuild
index f223395..5efcccb 100644
--- a/dev-java/icedtea/icedtea-3.1.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.1.0.ebuild
@@ -101,10 +101,11 @@ COMMON_DEP="
        >=dev-libs/glib-2.26:2
        >=dev-util/systemtap-1
        media-libs/fontconfig
-       >=media-libs/freetype-2.5.3:2=[infinality?]
        >=media-libs/lcms-2.5
        >=sys-libs/zlib-1.2.3:=
        virtual/jpeg:0=
+       !infinality? ( >=media-libs/freetype-2.5.3:2= )
+       infinality? ( <media-libs/freetype-2.6.4:2=[infinality] )
        sctp? ( net-misc/lksctp-tools )
        smartcard? ( sys-apps/pcsc-lite )
        sunec? ( >=dev-libs/nss-3.16.1-r1 )"