--- /usr/portage/media-libs/freetype/freetype-2.6.5.ebuild	2016-07-12 22:04:30.000000000 +0300
+++ freetype-2.6.5.ebuild	2016-08-01 18:51:00.000000000 +0300
@@ -21,7 +21,7 @@ LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X +adobe-cff bindist bzip2 cleartype_hinting debug doc fontforge harfbuzz
-	infinality png static-libs utils"
+	infinality png static-libs utils hinting"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
 CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -41,7 +41,7 @@ RDEPEND="${CDEPEND}
 	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
-REQUIRED_USE="?? ( cleartype_hinting infinality )"
+REQUIRED_USE="cleartype_hinting? ( hinting ) infinality? ( hinting )"
 
 PATCHES=(
 	# This is the same as the 01 patch from infinality
@@ -65,14 +65,11 @@ src_prepare() {
 
 	default
 
-	if use infinality; then
-		# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
-	fi
-
-	if use cleartype_hinting; then
-		# Will be the new default for >=freetype-2.7.0
-		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	if use hinting; then
+		local h=0
+		use infinality && h=$((h|1)) && append-cppflags -DTT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
+		use cleartype_hinting && h=$((h|2)) && append-cppflags -DTT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
+		append-cppflags -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=$h
 	fi
 
 	if ! use bindist; then