--- libafterimage-1.20.ebuild	2016-01-12 11:22:44.315121846 -0200
+++ libafterimage-1.20-r1.ebuild	2016-01-12 16:27:24.396609733 -0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples gif jpeg cpu_flags_x86_mmx nls png static-libs svg tiff truetype"
 
 RDEPEND="
@@ -21,8 +21,7 @@
 	x11-libs/libXext
 	x11-libs/libXrender
 	png?  ( >=media-libs/libpng-1.4:0 )
-	jpeg? ( virtual/jpeg )
-	gif?  ( media-libs/giflib )
+	jpeg? ( virtual/jpeg:0 )
 	svg? ( gnome-base/librsvg )
 	tiff? ( media-libs/tiff:0 )
 	truetype? ( media-libs/freetype )"
@@ -42,8 +41,6 @@
 	epatch "${FILESDIR}"/${PN}-gif.patch
 	# fix for libpng15 compability
 	epatch "${FILESDIR}"/${PN}-libpng15.patch
-	# fix for gif library bug  #486804
-	epatch "${FILESDIR}"/${PN}-giflib42.patch
 	# do not build examples
 	sed -i \
 		-e '/^all:/s/apps//' \
@@ -64,7 +61,7 @@
 		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
 		$(use_with png) \
 		$(use_with jpeg) \
-		$(use_with gif) \
+		$(use_with gif builtin-gif) \
 		$(use_with svg) \
 		$(use_with tiff) \
 		$(use_with truetype ttf) \
@@ -72,7 +69,6 @@
 		--enable-sharedlibs \
 		--with-x \
 		--with-xpm \
-		--without-builtin-gif \
 		--without-builtin-jpeg \
 		--without-builtin-png \
 		--without-builtin-zlib \