amd64 stable and cleanup old wrt bug #205996

(Portage version: 2.1.3.19)

3 files changed, 7 insertions, 104 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index f155d5e5d9df..0c1a350015dc 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.138 2008/02/13 10:51:09 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.139 2008/02/13 12:19:49 coldwind Exp $
+
+  13 Feb 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -gpgme-0.3.14-r1.ebuild, gpgme-0.3.14-r2.ebuild:
+  amd64 stable and cleanup old wrt bug #205996
 
   13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
   -files/gpgme-1.1.2-fbsd.patch, -gpgme-1.1.2-r1.ebuild:
diff --git a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild b/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
deleted file mode 100644
index bd1cd4982726..000000000000
--- a/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r1.ebuild,v 1.26 2008/01/02 18:26:44 alonbl Exp $
-
-#
-# NOTE: This revision is used by direct dependency. DO NOT REMOVE!
-#
-
-inherit eutils autotools
-
-DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.3"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-# smime once post gnupg-1.9+ gets unmasked
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc
-	sys-devel/autoconf
-	=sys-devel/automake-1.6*
-	>=sys-apps/sed-4
-	>=app-crypt/gnupg-1.2.0"
-
-#For gnupg-1.9+ gets unmasked
-#       !smime? ( >=app-crypt/gnupg-1.2.5 )
-#       smime? ( >=app-crypt/gnupg-1.9.10 )
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/gpgme3.m4.patch
-	find . -name Makefile -o -name Makefile.in -exec rm {} \;
-	rm doc/gpgme.info-?
-
-	sed -i -e 's:libgpgme:libgpgme3:g' \
-		`find . -name Makefile.am` doc/gpgme.info
-
-	sed -i -e 's:gpgme-config:gpgme3-config:g' \
-		configure.ac gpgme/Makefile.am doc/gpgme.texi \
-		gpgme/gpgme-config.in
-
-	sed -i -e 's:gpgme\.info:gpgme3.info:g' \
-		-e 's:gpgme\.texi:gpgme3\.texi:g' \
-		doc/Makefile.am doc/gpgme.info
-
-	sed -i -e 's:-lgpgme:-lgpgme3:g' \
-		gpgme/gpgme-config.in \
-		doc/gpgme.texi configure.ac
-
-	sed -i -e 's:gpgme\.m4:gpgme3.m4:g' \
-		gpgme/Makefile.am configure.ac doc/gpgme.texi \
-		gpgme/mkerrors \
-		`find . -name \*.c -o -name \*.h`
-
-	sed -i -e 's:gpgme\.info:gpgme3.info:' doc/gpgme.texi
-
-	mv doc/gpgme{,3}.texi
-	mv gpgme/gpgme{,3}-config.in
-	mv gpgme/gpgme{,3}.m4
-	# mv gpgme/gpgme{,3}.h
-	export WANT_AUTOMAKE="1.6"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --enable-maintainer-mode"
-
-	if [ -x ""/usr/bin/gpg2 ]; then
-		myconf="${myconf} --with-gpg=/usr/bin/gpg2"
-	else
-		myconf="${myconf} --with-gpg=/usr/bin/gpg"
-	fi
-
-	# For gnugpg-1.9+
-	# 		$(use_with smime gpgsm /usr/bin/gpgsm)
-	#
-
-	econf \
-		--enable-gpgmeplug \
-		--includedir=/usr/include/gpgme3 \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
-}
diff --git a/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild b/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild
index 4b98e1cf8fdd..9cbd78e3ba3d 100644
--- a/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild,v 1.8 2008/02/06 18:58:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14-r2.ebuild,v 1.9 2008/02/13 12:19:49 coldwind Exp $
 
 #
 # NOTE: This revision is used by direct dependency. DO NOT REMOVE!
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.3"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND=">=app-crypt/gnupg-1.2.0"