Cleanup

Package-Manager: portage-2.1.4.4

4 files changed, 6 insertions, 95 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 8504f9b4a1c4..f155d5e5d9df 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.137 2008/02/06 18:58:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.138 2008/02/13 10:51:09 alonbl Exp $
+
+  13 Feb 2008; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gpgme-1.1.2-fbsd.patch, -gpgme-1.1.2-r1.ebuild:
+  Cleanup
 
   06 Feb 2008; nixnut <nixnut@gentoo.org> gpgme-0.3.14-r2.ebuild:
   stable on ppc wrt bug #205996
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index aae1ff58dba0..7120afc7f9dd 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,14 +1,11 @@
-AUX gpgme-1.1.2-fbsd.patch 984 RMD160 dfe4d16c5b8c4256fef9344d0616cf2111a0d3ac SHA1 c9ee5603134610c7d5a04225fe2418acd32a1440 SHA256 3da2df975c1dc3d26cb7927489d9c5c610a953864b7cb3be6bebbf410eeeab58
 AUX gpgme-1.1.6-cvs.patch 6683 RMD160 81247a6a691aac302d10c469805a4a1c15401739 SHA1 7f3a01a31c0708bd7df473173904f7bc47050897 SHA256 2a47856e3164ce107c7e6c7c8a835abf5864995d2f9ce8bc6d16f6c0fbff4ddd
 AUX gpgme3.m4.patch 482 RMD160 bab51943a422da3e9eeeacfc6536e8480cb11afc SHA1 2a42c91ea4636fab5b1087ba5542e9c79ca143b0 SHA256 8e71df251cbbed19cfb2e929c0781adb92b02fb32759349c62408ab108bcc2c3
 DIST gpgme-0.3.14.tar.gz 655474 RMD160 96d1db35441611d0ddc3e2e8824e2b1d673b9837 SHA1 c97a4fdca455acc70c6b3a106da07389db4d50ed SHA256 4e822b5bb4f8d3269ab9d205e714ed9463b951c77e8ac0ffc0cf8ba7667bdc88
-DIST gpgme-1.1.2.tar.gz 881432 RMD160 ae30dc9a3e1f482206cf7cf76aae7c9b9e25b4a8 SHA1 336d94e3bf2facedd06c52bd016bce647667c347 SHA256 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
 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-1.1.2-r1.ebuild 1197 RMD160 897a7f87da69686759f47bd321347fdf93ad6e75 SHA1 9b24225bb2887d09c0a19a2d9e7b84c0ce19458b SHA256 79bef0e4c54d6f139e5cba660e7879727234a07b30b22bde63c9588a62edf754
 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 20158 RMD160 381a8f637ac62d1a457739982e2203608e007a8b SHA1 a6643c0757046c6a0d65299f6b37677b72bcda95 SHA256 27a5092f074c94bb41f490406954b70b6d4e33bb9a43c1e61f7893d2a8c24bd3
+MISC ChangeLog 20274 RMD160 95963ffada36e4b2a400a59492857cff29966e73 SHA1 af53f0a9f56cbba7492c33375b337a436d8213ed SHA256 d5b93d940e31fbb015144efc45814d9778d3fce74c65cd66b798d5eabb11411c
 MISC metadata.xml 314 RMD160 594e5dcc88b300efe20b11d117449d1bec5e826a SHA1 ac00fbb2fc2f2de37d5dda93c775ef53f979eb28 SHA256 e80fd4c62ac2351fda3e7d6322e17edcb04fa5001d55e7b55bc19ece8ca89649
diff --git a/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch b/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch
deleted file mode 100644
index 564e6ac4cb5a..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.1.2-fbsd.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: gpgme-1.1.2/assuan/assuan.h
-===================================================================
---- gpgme-1.1.2.orig/assuan/assuan.h
-+++ gpgme-1.1.2/assuan/assuan.h
-@@ -23,6 +23,7 @@
- 
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <unistd.h>
- 
- 
-Index: gpgme-1.1.2/assuan/funopen.c
-===================================================================
---- gpgme-1.1.2.orig/assuan/funopen.c
-+++ gpgme-1.1.2/assuan/funopen.c
-@@ -38,7 +38,7 @@
-   cookie instead of the fiel descripor.
- */
- 
--
-+#ifndef HAVE_FUNOPEN
- #ifdef HAVE_FOPENCOOKIE
- FILE *
- _assuan_funopen(void *cookie,
-@@ -61,3 +61,4 @@ _assuan_funopen(void *cookie,
- #else
- #error No known way to implement funopen.
- #endif
-+#endif
-Index: gpgme-1.1.2/assuan/mkerrors
-===================================================================
---- gpgme-1.1.2.orig/assuan/mkerrors
-+++ gpgme-1.1.2/assuan/mkerrors
-@@ -83,4 +83,4 @@ cat <<EOF
-   return s;
- }
- 
--EOF
-\ No newline at end of file
-+EOF
diff --git a/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild b/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild
deleted file mode 100644
index 22fa10a1f1c4..000000000000
--- a/app-crypt/gpgme/gpgme-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,49 +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-1.1.2-r1.ebuild,v 1.14 2008/02/02 10:51:46 alonbl Exp $
-
-inherit libtool 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"
-SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-libs/libgpg-error-0.5
-	dev-libs/pth
-	>=app-crypt/gnupg-1.9.20-r1"
-
-RDEPEND="${DEPEND}
-	dev-libs/libgcrypt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-
-	elibtoolize
-}
-
-src_compile() {
-	if use selinux; then
-		sed -i -e "s:tests = tests:tests = :" Makefile.in || die "sed failed"
-	fi
-
-	econf \
-		--includedir=/usr/include/gpgme \
-		--with-gpg=/usr/bin/gpg \
-		--with-pth=yes \
-		--with-gpgsm=/usr/bin/gpgsm \
-		|| die "econf failed"
-	emake CFLAGS="${CFLAGS} -I../assuan/"  || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO VERSION
-}