--- /usr/portage/app-crypt/gnupg/gnupg-2.0.15.ebuild	2010-07-06 12:05:24.000000000 -0400
+++ gnupg-2.0.15.ebuild	2010-07-19 14:27:15.499556483 -0400
@@ -46,20 +46,36 @@
 	selinux? ( sec-policy/selinux-gnupg )
 	nls? ( virtual/libintl )"
 
+pkg_setup() {
+	if ( use openct || use pcsc-lite ) && ! use smartcard; then
+		ewarn "You have openct or pcsc-lite enabled but do not"
+		ewarn "have smartcard support enabled. This will not affect"
+		ewarn "the building of this package, but it may affect others."
+	fi
+}
+
 src_configure() {
+	local myconf=""
 	# 'USE=static' support was requested:
 	# gnupg1: bug #29299
 	# gnupg2: bug #159623
 	use static && append-ldflags -static
 
+	if use openct || use pcsc-lite || use smartcard; then
+		myconf="--enable-scdaemon"
+	else
+		myconf="--disable-scdaemon"
+	fi
+	
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-gpg \
 		--enable-gpgsm \
 		--enable-agent \
+		${myconf} \
 		$(use_with adns) \
 		$(use_enable bzip2) \
-		$(use_enable smartcard scdaemon) \
 		$(use_enable !elibc_SunOS symcryptrun) \
 		$(use_enable nls) \
 		$(use_enable ldap) \