amd64 stable and cleanup old wrt bug #205996

Package-Manager: portage-2.1.3.19

4 files changed, 9 insertions, 107 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/Manifest b/app-crypt/gpgme/Manifest
index 7120afc7f9dd..b6e33f6cf3d2 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,9 +3,8 @@ AUX gpgme3.m4.patch 482 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc SHA1 2a4
 DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA1 c97a4fdca455acc70c6b3a106da07389db4d50ed SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88
 DIST gpgme-1.1.5.tar.gz 929270 RMD160 54520e0bcacecc337e33b92e6dac6d1ced8a30af SHA1 428d0faee47509e69ce95620d5075579296cb884 SHA256 4ffb19d69b7cf9179252fa7f0a5f0db9064417024da260770d959dcf7bc3492a
 DIST gpgme-1.1.6.tar.gz 961286 RMD160 b761fed5ad88ef4b467c981bcc0ef95317c11ac1 SHA1 8dee551f362fc428c25c9bd542ce944ac916347d SHA256 7cf6cd9dfc1f02488eab8cb8a64d3904c71df9a04b1e9614beeec72dbde3f49f
-EBUILD gpgme-0.3.14-r1.ebuild 2456 RMD160 b947885da17faed5c8f0628dc5c2e6f0a9aacefc SHA1 3e9ff2a0df2e6ac3235c4726e2564c579781abb2 SHA256 ff38cd88268167da541376588b69a9b40f9d869003d5e4d299b6543d7f22ae0b
-EBUILD gpgme-0.3.14-r2.ebuild 2147 RMD160 f91c3836bbd130c3df31e65e3c5f306f3e46c321 SHA1 082a1cd53372c41e49f60ccc5bde3a46e7f0795d SHA256 d6783d18bc4a52ba0e092b14f92fb9c56d1c80456f1cc4cb1e04b814c3f20e8b
+EBUILD gpgme-0.3.14-r2.ebuild 2148 RMD160 75ac4f25d1ea59cc3234c9fee8a5095687202bfd SHA1 432d7d21aa9f4f10912d3e4d64c2fe9c3cf8069a SHA256 e242f535faed2cd16f2e019001c26598cde3deb78f23d7699295d63108bc6e28
 EBUILD gpgme-1.1.5.ebuild 1100 RMD160 46d5bf59729e2e61c5f1b529384d4def34036d7f SHA1 8afba454be212ad404e1c4e763e46a9b91e7b35a SHA256 f73a3c61431f03b4d5b08c3fa363de84a0d867b92b95b8bec6669280bade8f38
 EBUILD gpgme-1.1.6.ebuild 1200 RMD160 bc111af2bb0b8e082254bd86dfc46dac164741a5 SHA1 9e726216e5f7f2d94a684b5951bb8483d91b7499 SHA256 e7e3ebd35dbec5751d5a97cff70f01aa638851db2200851d81bebdd6a26e0ff3
-MISC ChangeLog 20274 RMD160 95963ffada36e4b2a400a59492857cff29966e73 SHA1 af53f0a9f56cbba7492c33375b337a436d8213ed SHA256 d5b93d940e31fbb015144efc45814d9778d3fce74c65cd66b798d5eabb11411c
+MISC ChangeLog 20429 RMD160 7eebf66f0656777ef5ac79a2d1f41df6e128be05 SHA1 055adaac7d82a776f0fdddca287ea2c346b53b48 SHA256 8ec07acf94676f74497182e8a5301fd42b7add3d6e5e9ef7d028ee8c5f2a1c71
 MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649
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"