aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2016-08-02 23:25:55 +0100
committerJames Le Cuirot <chewi@gentoo.org>2016-08-02 23:25:55 +0100
commitbcc92c783dd08bac81a2976fb5a7e2fde0acad28 (patch)
tree9d6b91f6cec35759270e2d3238f1fd94cba84f44
parentdev-java/icedtea: Add missing src_compile in 3.1.0 (diff)
downloadjava-bcc92c78.tar.gz
java-bcc92c78.tar.bz2
java-bcc92c78.zip
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
-rw-r--r--dev-java/icedtea/icedtea-3.1.0.ebuild3
1 files changed, 2 insertions, 1 deletions
diff --git a/dev-java/icedtea/icedtea-3.1.0.ebuild b/dev-java/icedtea/icedtea-3.1.0.ebuild
index f2233952..5efcccb9 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 )"