Fix broken test, provide non symlink to configure, cleanup old versions

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

5 files changed, 9 insertions, 134 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index f05b1a3ac169..ada5e96c6536 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.206 2013/08/19 16:28:07 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.207 2014/02/15 20:30:53 alonbl Exp $
+
+  15 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org> -gpgme-1.4.0.ebuild,
+  -gpgme-1.4.1.ebuild, -gpgme-1.4.2.ebuild, gpgme-1.4.3.ebuild:
+  Fix broken test, provide non symlink to configure, cleanup old versions
 
 *gpgme-1.4.3 (19 Aug 2013)
 
diff --git a/app-crypt/gpgme/gpgme-1.4.0.ebuild b/app-crypt/gpgme/gpgme-1.4.0.ebuild
deleted file mode 100644
index 1f2fa86f9f2a..000000000000
--- a/app-crypt/gpgme/gpgme-1.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.4.0.ebuild,v 1.1 2013/03/06 11:34:45 alonbl Exp $
-
-EAPI="4"
-
-inherit eutils libtool
-
-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.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs"
-
-DEPEND="app-crypt/gnupg
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}/usr/include/gpgme" \
-		--with-gpg="${EPREFIX}/usr/bin/gpg" \
-		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use common-lisp; then
-		rm -fr "${ED}usr/share/common-lisp"
-	fi
-}
diff --git a/app-crypt/gpgme/gpgme-1.4.1.ebuild b/app-crypt/gpgme/gpgme-1.4.1.ebuild
deleted file mode 100644
index 74a12a082bf8..000000000000
--- a/app-crypt/gpgme/gpgme-1.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.4.1.ebuild,v 1.1 2013/05/02 04:19:21 radhermit Exp $
-
-EAPI="5"
-
-inherit eutils libtool
-
-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.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs"
-
-DEPEND="app-crypt/gnupg
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}/usr/include/gpgme" \
-		--with-gpg="${EPREFIX}/usr/bin/gpg" \
-		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use common-lisp; then
-		rm -fr "${ED}usr/share/common-lisp"
-	fi
-}
diff --git a/app-crypt/gpgme/gpgme-1.4.2.ebuild b/app-crypt/gpgme/gpgme-1.4.2.ebuild
deleted file mode 100644
index a59e63c67587..000000000000
--- a/app-crypt/gpgme/gpgme-1.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.4.2.ebuild,v 1.1 2013/06/30 08:10:17 radhermit Exp $
-
-EAPI="5"
-
-inherit eutils libtool
-
-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.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs"
-
-DEPEND="app-crypt/gnupg
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}/usr/include/gpgme" \
-		--with-gpg="${EPREFIX}/usr/bin/gpg" \
-		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use common-lisp; then
-		rm -fr "${ED}usr/share/common-lisp"
-	fi
-}
diff --git a/app-crypt/gpgme/gpgme-1.4.3.ebuild b/app-crypt/gpgme/gpgme-1.4.3.ebuild
index 5e085948e852..a7543b52d315 100644
--- a/app-crypt/gpgme/gpgme-1.4.3.ebuild
+++ b/app-crypt/gpgme/gpgme-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.4.3.ebuild,v 1.1 2013/08/19 16:28:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.4.3.ebuild,v 1.2 2014/02/15 20:30:53 alonbl Exp $
 
 EAPI="5"
 
@@ -28,7 +28,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--includedir="${EPREFIX}/usr/include/gpgme" \
-		--with-gpg="${EPREFIX}/usr/bin/gpg" \
+		--with-gpg="$(readlink -f "${EPREFIX}/usr/bin/gpg")" \
 		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
 		$(use_enable static-libs static)
 }