--- /usr/portage/mail-client/trojita/trojita-0.3.ebuild	2012-03-30 12:34:00.000000000 +0200
+++ trojita-0.3.ebuild	2012-11-23 02:18:37.904717157 +0100
@@ -27,11 +27,8 @@
 	>=x11-libs/qt-gui-${QT_REQUIRED}:4
 	>=x11-libs/qt-sql-${QT_REQUIRED}:4[sqlite]
 	>=x11-libs/qt-webkit-${QT_REQUIRED}:4
+	>=x11-libs/qt-test-${QT_REQUIRED}:4
 "
-DEPEND="${RDEPEND}
-	test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 )
-"
-
 src_configure() {
 	eqmake4 PREFIX=/usr
 }
--- /usr/portage/mail-client/trojita/trojita-9999.ebuild	2012-03-30 13:01:17.000000000 +0200
+++ trojita-9999.ebuild	2012-11-23 02:50:47.733930756 +0100
@@ -21,7 +21,7 @@
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug test"
+IUSE="debug test +zlib"
 
 RDEPEND="
 	>=x11-libs/qt-gui-${QT_REQUIRED}:4
@@ -30,8 +30,16 @@
 "
 DEPEND="${RDEPEND}
 	test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 )
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
 "
 
 src_configure() {
-	eqmake4 PREFIX=/usr
+	local myopts=""
+	use debug && myopts="$myopts CONFIG+=debug"
+	use test || myopts="$myopts CONFIG+=disable_tests"
+	use zlib || myopts="$myopts CONFIG+=disable_zlib"
+	eqmake4 PREFIX=/usr $myopts
 }