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

[James Le Cuirot]

commit:     eb5de053d2d09fc83826bc62820002cff466ef88
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 20:44:48 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 20:44:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=eb5de053

dev-java/icedtea: Apply earlier Infinality fix to 7, fixes bug #590068

Package-Manager: portage-2.3.0

 dev-java/icedtea/icedtea-7.2.6.7.ebuild       | 3 ++-
 dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-java/icedtea/icedtea-7.2.6.7.ebuild 
b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
index fe9ade9..b15601f 100644
--- a/dev-java/icedtea/icedtea-7.2.6.7.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.7.ebuild
@@ -94,7 +94,6 @@ 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=
@@ -105,6 +104,8 @@ COMMON_DEP="
                >=x11-libs/gtk+-2.8:2=
                >=x11-libs/pango-1.24.5
        )
+       !infinality? ( >=media-libs/freetype-2.5.3:2= )
+       infinality? ( <media-libs/freetype-2.6.4:2=[infinality] )
        javascript? ( dev-java/rhino:1.6 )
        kerberos? ( virtual/krb5 )
        nss? ( >=dev-libs/nss-3.12.5-r1 )

diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild 
b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
index a425040..d1b397c 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre05.ebuild
@@ -94,7 +94,6 @@ 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=
@@ -105,6 +104,8 @@ COMMON_DEP="
                >=x11-libs/gtk+-2.8:2=
                >=x11-libs/pango-1.24.5
        )
+       !infinality? ( >=media-libs/freetype-2.5.3:2= )
+       infinality? ( <media-libs/freetype-2.6.4:2=[infinality] )
        javascript? ( dev-java/rhino:1.6 )
        kerberos? ( virtual/krb5 )
        nss? ( >=dev-libs/nss-3.12.5-r1 )