--- gd-2.0.35-r1.ebuild	2010-03-31 04:36:03.000000000 +0200
+++ gd-2.0.35-r2.ebuild	2010-04-10 17:51:04.000000000 +0200
@@ -11,7 +11,7 @@
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="fontconfig jpeg png truetype xpm"
+IUSE="fontconfig jpeg png test truetype xpm"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
 	jpeg? ( >=media-libs/jpeg-6b )
@@ -26,12 +26,16 @@
 	epatch "${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-maxcolors.patch
 
-	eautoconf
+	# do not build tests if they are not run, see #226239
+	epatch "${FILESDIR}/${P}-cond-tests.patch"
+
+	eautoreconf
 	find . -type f -print0 | xargs -0 touch -r configure
 }
 
 src_compile() {
 	econf \
+		$(use_enable test) \
 		$(use_with fontconfig) \
 		$(use_with png) \
 		$(use_with truetype freetype) \