--- app-crypt/gpgme/gpgme-1.1.6.ebuild
+++ app-crypt/gpgme/gpgme-1.1.7.ebuild
@@ -2,34 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.1.6.ebuild,v 1.8 2008/03/24 10:57:00 armin76 Exp $
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
 SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="pth"
 
 DEPEND=">=dev-libs/libgpg-error-1.4
 	>=app-crypt/gnupg-1.9.20-r1
 	pth? ( >=dev-libs/pth-1.2 )"
-
-RDEPEND="${DEPEND}
-	dev-libs/libgcrypt"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-cvs.patch"
-	chmod a+x "tests/gpg/pinentry"
-	AT_M4DIR="m4" eautoreconf
-
-	# We need to call elibtoolize so that we get sane .so versioning on fbsd.
-	#elibtoolize
+	epatch "${FILESDIR}/${P}-_gpgme_cancel_with_err.patch"
 }
 
 src_compile() {
@@ -37,12 +30,11 @@
 		--includedir=/usr/include/gpgme \
 		--with-gpg=/usr/bin/gpg \
 		--with-gpgsm=/usr/bin/gpgsm \
-		$(use_with pth) \
-		|| die
-	emake || die
+		$(use_with pth)
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO VERSION
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }