Cleanup

Package-Manager: portage-2.1.3_rc5

5 files changed, 9 insertions, 254 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index d66a648eae35..6a94e474f6b6 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.295 2007/06/22 16:55:27 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.296 2007/06/25 05:37:00 alonbl Exp $
+
+  25 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gnupg-1.4.6-ecc-helper.patch, -gnupg-1.4.6.ebuild:
+  Cleanup
 
   22 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org> -gnupg-1.4.6-r1.ebuild,
   -gnupg-1.4.7.ebuild, -gnupg-2.0.2.ebuild, -gnupg-2.0.3.ebuild,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5dcfb806eb6f..d31dbae775e7 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnupg-1.4.3-keyserver.patch 455 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775aa9e SHA1 48818a3a333a4a8a7175f8c21ec2e811b3fd20c3 SHA256 242a8497230a75e2f4c9a34a91aef73560052925eff822d1e5e566faee8b27ec
 MD5 72be0b19653d4f2b1d1719046db9c18a files/gnupg-1.4.3-keyserver.patch 455
 RMD160 c7eec6bd5ea73cde4d084cffcc1623bea775aa9e files/gnupg-1.4.3-keyserver.patch 455
@@ -13,10 +10,6 @@ AUX gnupg-1.4.6-badruman.patch 534 RMD160 7789da4ceafcc9f1bec778b9b7986359f15131
 MD5 0e2449e22416d4ef22158a2baa72a494 files/gnupg-1.4.6-badruman.patch 534
 RMD160 7789da4ceafcc9f1bec778b9b7986359f1513178 files/gnupg-1.4.6-badruman.patch 534
 SHA256 3fef6d7306823db7a8912f4454b05aef8cff035e36065097d9406f57098018e5 files/gnupg-1.4.6-badruman.patch 534
-AUX gnupg-1.4.6-ecc-helper.patch 387 RMD160 ac30049a669d5b65255c0f30986995bba9398103 SHA1 ddabfc78f1905ed9b023d48c7f06c1cea746904a SHA256 73f1acb0681b2ecb8112d772da7204a7451b286b28369f0ffd2741af7e63a3f2
-MD5 623a5168503b7aae21c95ee6caf69bb5 files/gnupg-1.4.6-ecc-helper.patch 387
-RMD160 ac30049a669d5b65255c0f30986995bba9398103 files/gnupg-1.4.6-ecc-helper.patch 387
-SHA256 73f1acb0681b2ecb8112d772da7204a7451b286b28369f0ffd2741af7e63a3f2 files/gnupg-1.4.6-ecc-helper.patch 387
 AUX gnupg-1.9.20-fbsd-gcc41.patch 462 RMD160 a15e134cf05134b9b1113b162c6e957ca11860aa SHA1 ad3ae023524feb58e5350759dd42509bafde7468 SHA256 c8d37aed71c5659d93f9a73f563abc59159a33990fda8a12a74f2bbfe07a961e
 MD5 2c895d4068081e568eec78426f1476af files/gnupg-1.9.20-fbsd-gcc41.patch 462
 RMD160 a15e134cf05134b9b1113b162c6e957ca11860aa files/gnupg-1.9.20-fbsd-gcc41.patch 462
@@ -37,8 +30,6 @@ AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b S
 MD5 55421c980c3f87eb781b2a0d57e1b5b9 files/gnupg-2.0.4-idea.patch 906
 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b files/gnupg-2.0.4-idea.patch 906
 SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976 files/gnupg-2.0.4-idea.patch 906
-DIST gnupg-1.4.5-ecc0.1.6.diff.bz2 16926 RMD160 1f80d5137f47e48bda96dd59506c452a3833e4e4 SHA1 be330df0b9907a151cd2b97659b93e4fa21fe491 SHA256 3263d8bd2bea6807445f9592b705ae4fca6bb89e8483613a53d553947424c51a
-DIST gnupg-1.4.6.tar.bz2 3149454 RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 SHA1 9cbbef5c94f793867ff3ae4941816962311a0563 SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
@@ -46,10 +37,6 @@ DIST gnupg-1.9.22.tar.bz2 1908546 RMD160 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c
 DIST gnupg-1.9.94.tar.bz2 3870728 RMD160 eee1af2d2c5fea01010979a81e426cac2d288192 SHA1 3dae940f596690a047620685ee3148ad4320e666 SHA256 0647fe9599a43019b4afbd0c63dc6f44546b8475890cc36012f353288693d487
 DIST gnupg-2.0.4.tar.bz2 3575021 RMD160 7d31526012e32c2fe39fea62c01b5c17d16118ad SHA1 cc230636bb4226f6d7ac2db9b259d8e7f5529f84 SHA256 3872d7280e5a12a947509c73b70c3024521c29ff4427c8fb4caa17dde2f4248c
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
-EBUILD gnupg-1.4.6.ebuild 5834 RMD160 1d6accc691815d02028b3f9e9460336da145f1f5 SHA1 87fb2e9a3b7ef275fcaf8c94d4d2f3bdd7062d77 SHA256 32acc4a9c6c755df57d5dc8098b9765d523828664e249dbf99ed9188ce3753f6
-MD5 87338bf29981a8e0fd297bbfa5f9a6a5 gnupg-1.4.6.ebuild 5834
-RMD160 1d6accc691815d02028b3f9e9460336da145f1f5 gnupg-1.4.6.ebuild 5834
-SHA256 32acc4a9c6c755df57d5dc8098b9765d523828664e249dbf99ed9188ce3753f6 gnupg-1.4.6.ebuild 5834
 EBUILD gnupg-1.4.7-r1.ebuild 6112 RMD160 33bb947e21195a8e9656fb7ea56b83baaeb5f52e SHA1 15927ed926b3f9bd8acfc3950cc1c857c3a941a8 SHA256 14f8e95c76e183343dcfdfd2c75c65fcaa2084ed804fb81ef3e06f4ba6f82556
 MD5 6e48455ec8a4e7a5a1ae031d0961a29e gnupg-1.4.7-r1.ebuild 6112
 RMD160 33bb947e21195a8e9656fb7ea56b83baaeb5f52e gnupg-1.4.7-r1.ebuild 6112
@@ -74,17 +61,14 @@ EBUILD gnupg-2.0.4-r1.ebuild 2117 RMD160 0e58f01f9a09e6a82178f40b158011eb60b52ba
 MD5 de02e171a90ded06469495ad4c29a3d3 gnupg-2.0.4-r1.ebuild 2117
 RMD160 0e58f01f9a09e6a82178f40b158011eb60b52baa gnupg-2.0.4-r1.ebuild 2117
 SHA256 d722bebea7fe2d7ed8f8efed84a0a0a00f1049b9e67a05fa8c4549aa4fb686f3 gnupg-2.0.4-r1.ebuild 2117
-MISC ChangeLog 45722 RMD160 4233e411462a5aba0d02687d5099fee94ceae0b0 SHA1 5ba66c5ad3ca4a31d95e9c0f27add29548493510 SHA256 9cc6aea834d0fea95adaf5a4034b05233bb340429c0e6509790b7a7edf4575cd
-MD5 7730c0233e9e3f4b5a25c3b64bb37c29 ChangeLog 45722
-RMD160 4233e411462a5aba0d02687d5099fee94ceae0b0 ChangeLog 45722
-SHA256 9cc6aea834d0fea95adaf5a4034b05233bb340429c0e6509790b7a7edf4575cd ChangeLog 45722
+MISC ChangeLog 45841 RMD160 4df5bfa136f721954d0ed221cee249c9fed6fd14 SHA1 e067d4a374f3c3af410dc41aabd0b636da0bc9ca SHA256 6ac87d753fd75e720b65219f7342822d346ddd206eb38254d7e2dd3b0d92fd81
+MD5 d8c33e5d515494c40314379968d8325f ChangeLog 45841
+RMD160 4df5bfa136f721954d0ed221cee249c9fed6fd14 ChangeLog 45841
+SHA256 6ac87d753fd75e720b65219f7342822d346ddd206eb38254d7e2dd3b0d92fd81 ChangeLog 45841
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672 metadata.xml 481
-MD5 5c3fa7ed67452d1f8d07729de1dbf3d3 files/digest-gnupg-1.4.6 708
-RMD160 851f04c7257989afb7d059f3a8eed38ec7b89487 files/digest-gnupg-1.4.6 708
-SHA256 923e5f60f1905c9a960016e5cfcc8e6979710c867e40c5b0fb2f22adf3931fad files/digest-gnupg-1.4.6 708
 MD5 86dd165d088b67a019b76b7da0cf4a48 files/digest-gnupg-1.4.7-r1 708
 RMD160 dada10775841b227a433d3c2c0f7a9556bca5772 files/digest-gnupg-1.4.7-r1 708
 SHA256 59ec1edd1c0bac754b898f777d4b32a2ff7272aea738413ac7b356335a199b63 files/digest-gnupg-1.4.7-r1 708
@@ -103,10 +87,3 @@ SHA256 8648c6ff6070284e92d5ab95911132a7f84a89ad2afdd32e09e972708d576b17 files/di
 MD5 e2740702463406f1a248abee906844b7 files/digest-gnupg-2.0.4-r1 241
 RMD160 72f9693f41723e7df744a4e5e985dca2f66e6e90 files/digest-gnupg-2.0.4-r1 241
 SHA256 1f0addc001280deeff4efcc6f287a447e945826607cd99f9eb5deac2b5a158fe files/digest-gnupg-2.0.4-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfvsip/wUKkr7RBoRArBTAJ4wJB3VQyO+vwjX502UqjYTmGGGfwCfem4V
-tXDFzWYK9llQq+/LvB3RNfM=
-=PFMo
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.6 b/app-crypt/gnupg/files/digest-gnupg-1.4.6
deleted file mode 100644
index a9271b8f6a66..000000000000
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2964c69bb7e5c1da0c1d74f1aeba38ec gnupg-1.4.5-ecc0.1.6.diff.bz2 16926
-RMD160 1f80d5137f47e48bda96dd59506c452a3833e4e4 gnupg-1.4.5-ecc0.1.6.diff.bz2 16926
-SHA256 3263d8bd2bea6807445f9592b705ae4fca6bb89e8483613a53d553947424c51a gnupg-1.4.5-ecc0.1.6.diff.bz2 16926
-MD5 ec8dc6df1bd83c1d7e1a1ea10653f9f4 gnupg-1.4.6.tar.bz2 3149454
-RMD160 c7e7409358aaaaf7f3bb202aa86f6121749b97e3 gnupg-1.4.6.tar.bz2 3149454
-SHA256 fd5a72418e55669b88076c2a6f11c3a59bf92a2071008567e65ae12b7372008e gnupg-1.4.6.tar.bz2 3149454
-MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-RMD160 e35be5a031d10d52341ac5f029d28f811edd908d idea.c.gz 5216
-SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844 idea.c.gz 5216
diff --git a/app-crypt/gnupg/files/gnupg-1.4.6-ecc-helper.patch b/app-crypt/gnupg/files/gnupg-1.4.6-ecc-helper.patch
deleted file mode 100644
index 4e105218efdd..000000000000
--- a/app-crypt/gnupg/files/gnupg-1.4.6-ecc-helper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnupg-1.4.5-ecc0.1.6.diff.org	2006-12-06 23:03:01.000000000 +0200
-+++ gnupg-1.4.5-ecc0.1.6.diff	2006-12-06 23:03:21.000000000 +0200
-@@ -1961,8 +1961,8 @@ diff -Nru gnupg-1.4.5/configure gnupg-1.
-  
-  # Define the identity of the package.
-   PACKAGE='gnupg'
--- VERSION='1.4.5'
--+ VERSION='1.4.5-ecc01.6'
-+- VERSION='1.4.6'
-++ VERSION='1.4.6-ecc01.6'
-  
-  
-  cat >>confdefs.h <<_ACEOF
diff --git a/app-crypt/gnupg/gnupg-1.4.6.ebuild b/app-crypt/gnupg/gnupg-1.4.6.ebuild
deleted file mode 100644
index 7ab04d4db992..000000000000
--- a/app-crypt/gnupg/gnupg-1.4.6.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.6.ebuild,v 1.12 2007/02/11 10:20:27 vapier Exp $
-
-inherit eutils flag-o-matic
-
-ECCVER=0.1.6
-ECCVER_GNUPG=1.4.5
-MY_P=${P/_/}
-
-DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	!bindist? (
-		idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )
-		ecc? ( http://alumnes.eps.udl.es/%7Ed4372211/src/${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff.bz2 )
-		)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib X linguas_ru"
-
-COMMON_DEPEND="
-	ldap? ( net-nds/openldap )
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl )
-	virtual/mta
-	readline? ( sys-libs/readline )
-	smartcard? ( dev-libs/libusb )
-	usb? ( dev-libs/libusb )"
-
-RDEPEND="!static? (
-		${COMMON_DEPEND}
-		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
-	)
-	selinux? ( sec-policy/selinux-gnupg )
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	if use idea; then
-		if use bindist; then
-			einfo "Skipping IDEA support to comply with binary distribution (bug #148907)."
-		else
-			ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html"
-			mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-		fi
-	fi
-
-	if use ecc; then
-		if use bindist; then
-			einfo "Skipping ECC patch to comply with binary distribution (bug #148907)."
-		else
-			epatch "${FILESDIR}"/${P}-ecc-helper.patch
-			EPATCH_OPTS="-p1 -d ${S}" epatch ${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff
-		fi
-	fi
-
-	# maketest fix
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.4.3-selftest.patch
-
-	# install RU man page in right location
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-badruman.patch
-
-	# keyserver fix
-	EPATCH_OPTS="-p1 -d ${S}"  epatch "${FILESDIR}"/${PN}-1.4.3-keyserver.patch
-
-	cd "${S}"
-	# Fix PIC definitions
-	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
-	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
-}
-
-src_compile() {
-	# Certain sparc32 machines seem to have trouble building correctly with
-	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-	# fix until the gcc problem can be tracked down.
-	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-	fi
-
-	# 'USE=static' support was requested in #29299
-	use static &&append-ldflags -static
-
-	append-ldflags $(bindnow-flags)
-
-	# fix compile problem on ppc64
-	use ppc64 && myconf="${myconf} --disable-asm"
-
-	econf \
-		$(use_enable ldap) \
-		--enable-mailto \
-		--enable-hkp \
-		--enable-finger \
-		$(use_with !zlib included-zlib) \
-		$(use_with curl libcurl /usr) \
-		$(use_enable nls) \
-		$(use_enable bzip2) \
-		$(use_enable smartcard card-support) \
-		$(use_enable selinux selinux-support) \
-		--disable-capabilities \
-		$(use_with readline) \
-		$(use_with usb libusb /usr) \
-		$(use_enable static) \
-		$(use_enable X photo-viewers) \
-		--enable-static-rnd=linux \
-		--libexecdir=/usr/libexec \
-		--enable-noexecstack \
-		${myconf} || die
-	# this is because it will run some tests directly
-	gnupg_fixcheckperms
-	emake || die
-}
-
-src_install() {
-	gnupg_fixcheckperms
-	make DESTDIR="${D}" install || die
-
-	# keep the documentation in /usr/share/doc/...
-	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
-		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP,faq.raw}
-
-	docinto sgml
-	dodoc doc/*.sgml
-
-	dohtml doc/faq.html
-
-	exeinto /usr/libexec/gnupg
-	doexe tools/make-dns-cert
-
-	# install RU documentation in right location
-	if use linguas_ru
-	then
-		cp doc/gpg.ru.1 ${T}/gpg.1
-		doman -i18n=ru ${T}/gpg.1
-	fi
-}
-
-gnupg_fixcheckperms() {
-	# GnuPG does weird things for testing that it build correctly
-	# as we as for the additional tests. It WILL fail with perms 770 :-(.
-	# See bug #80044
-	if has userpriv ${FEATURES}; then
-		einfo "Fixing permissions in check directory"
-		chown -R portage:portage ${S}/checks
-		chmod -R ugo+rw ${S}/checks
-		chmod ugo+rw ${S}/checks
-	fi
-}
-
-src_test() {
-	gnupg_fixcheckperms
-	einfo "Running tests"
-	emake check
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		die "Some tests failed! Please report to the Gentoo Bugzilla"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
-	ewarn "you MUST make the gpg binary setuid."
-	echo
-	if use !bindist && use idea; then
-		elog
-		elog "IDEA"
-		elog "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		elog "is distributed under the GPL in countries where it is permitted to do so"
-		elog "by law."
-		elog
-		elog "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
-		elog
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		ewarn
-		ewarn "Countries where the patent applies are listed here"
-		ewarn "http://www.mediacrypt.com/_contents/10_idea/101030_ea_pi.asp"
-		ewarn
-		ewarn "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		ewarn
-	fi
-	if use !bindist && use ecc; then
-		ewarn
-		ewarn "The elliptical curves patch is experimental"
-		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
-	fi
-	elog
-	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
-	elog
-}