Delete older ebuild.

Package-Manager: portage-2.2.0_alpha25_p10/cvs/Linux x86_64

5 files changed, 7 insertions, 141 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index cbc37a59ac8b..5b5b164eeacb 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.68 2011/02/28 01:02:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.69 2011/02/28 15:31:34 arfrever Exp $
+
+  28 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/botan-1.8.8-darwin-install_name-fix.patch,
+  -files/botan-1.8.8-use_negative_lea_displacement.patch, -botan-1.8.10.ebuild:
+  Delete.
 
   28 Feb 2011; Brent Baude <ranger@gentoo.org> botan-1.8.11.ebuild:
   stable ppc, bug 353858
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 1c4c69cb54b8..33057de89781 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,8 +1,4 @@
-AUX botan-1.8.8-darwin-install_name-fix.patch 511 RMD160 40f5e7361f991de21ca0599b2e51954b6b10f573 SHA1 ad7afc7d13cdd90d72437e160a94568f8cedf48b SHA256 fca8d469d78ae2ec7e26dbef9732e4a73223173565135e48678d0d3f81785e17
-AUX botan-1.8.8-use_negative_lea_displacement.patch 884 RMD160 c259f4d51f3c25df93d2cf99f9f29d6f2f92ea5d SHA1 d5b3deec6fadaea2b2fc41e3b62ca38c8c007f16 SHA256 b88d8a5af5a849e7a0ecbce70d63f5348cb15fd156440080e6f8e6d569084784
-DIST Botan-1.8.10.tbz 2828431 RMD160 fff0f22e768da4e6f0afca434602a4a76f78a006 SHA1 9da4809ba408e98b65f818ebf6aec4fbb61d9b59 SHA256 e9da2d0f6a107f2a2032a5a1dcd27091f4a6ed428d896def5c91b4908be5fb6d
 DIST Botan-1.8.11.tbz 2808114 RMD160 24489cac55d486897aebd18cab1939f3c4ee9340 SHA1 c2d3728a9103e28ef4d6d20a66ba48276ce1a106 SHA256 c3b60a2c3dfcbe7b21626e8459e5134d3cbabe45b6d94f454860b99798739ba4
-EBUILD botan-1.8.10.ebuild 2418 RMD160 d6bcc2f866b068fb8c67c3a36487b0632743f22b SHA1 731f3c0f85432b7702aedb0730b5a606ce8ef2af SHA256 d81005fffc0c2a370e0f0795fe4f741622e11181751d57afa3198cc3346a2e6f
 EBUILD botan-1.8.11.ebuild 2459 RMD160 1ffdab54ab6eccab7a04367516959bd5e0149973 SHA1 fefb55d18a47639e8a4a8cd58978c110b47dbdc9 SHA256 b795958d83d29cc85d5b192e35e8c5c6870c41cb666eca934bb21aef0b2790ae
-MISC ChangeLog 10347 RMD160 25141d3d22ec951e0983cb16bb74afe91127451e SHA1 854117f49e3ebf228592325905d82137e1278bda SHA256 a97d75430b2ad0ddc4aa976c5b3da814726ec908e73b831007a209d196223395
+MISC ChangeLog 10565 RMD160 7c1fcc6a3ab54da4dfeb7fbf934efbf3224e2b7c SHA1 578b493cd21370c2674c61d1d6d6b0ae31056b2e SHA256 36929cff049cfb91512560774dffa393bc823e4ef3b7851360d5d8930f6fb7e1
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
diff --git a/dev-libs/botan/botan-1.8.10.ebuild b/dev-libs/botan/botan-1.8.10.ebuild
deleted file mode 100644
index 97015299a9c7..000000000000
--- a/dev-libs/botan/botan-1.8.10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.10.ebuild,v 1.4 2011/01/06 23:03:18 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit eutils multilib python toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz"
-
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bzip2 gmp ssl threads zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	gmp? ( >=dev-libs/gmp-4.2.2 )
-	ssl? ( >=dev-libs/openssl-0.9.8g )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Install documentation in /usr/share/doc/${PF}.
-	sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed"
-}
-
-src_configure() {
-	local disable_modules="proc_walk,unix_procs,cpu_counter"
-
-	if ! useq threads; then
-		disable_modules="${disable_modules},pthreads"
-	fi
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	cd "${S}"
-	elog "Disabling modules: ${disable_modules}"
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*)   myos=darwin ;;
-		*)           myos=linux  ;;
-	esac
-
-	# foobared buildsystem, --prefix translates into DESTDIR, see also make
-	# install in src_install, we need the correct live-system prefix here on
-	# Darwin for a shared lib with correct install_name
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--with-tr1=system \
-		$(use_with bzip2) \
-		$(use_with gmp gnump) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		--disable-modules=${disable_modules} \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed"
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed"
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}usr" install || die "emake install failed"
-}
diff --git a/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch b/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch
deleted file mode 100644
index d749ea08e5d2..000000000000
--- a/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-install_names (sonames) on Darwin are absolute
-
---- src/build-data/cc/gcc.txt
-+++ src/build-data/cc/gcc.txt
-@@ -31,7 +31,7 @@
- # AIX doesn't seem to have soname support (weird...)
- aix     -> "$(CXX) -shared -fPIC"
- 
--darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)"
-+darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
- hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
- solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
- # Gotta use ld directly on BeOS, their GCC is busted
diff --git a/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch b/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch
deleted file mode 100644
index 50faa56bdca3..000000000000
--- a/dev-libs/botan/files/botan-1.8.8-use_negative_lea_displacement.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# old_revision [a101c8c86b755a666c72baf03154230e09e0667e]
-#
-# patch "src/hash/sha1_amd64/sha1_amd64_imp.S"
-#  from [dd263db10309950dec501dd9257a8df43cf6c6aa]
-#    to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962]
-#
-============================================================
---- src/hash/sha1_amd64/sha1_amd64_imp.S	dd263db10309950dec501dd9257a8df43cf6c6aa
-+++ src/hash/sha1_amd64/sha1_amd64_imp.S	ab1db7a394b41a1d3b9a63a6e8e1571e4671b962
-@@ -103,10 +103,16 @@ ALIGN;
- 
-    subq $320, W
- 
-+/*
-+* Using negative values for SHA-1 constants > 2^31 to work around
-+* a bug in binutils not accepting large lea displacements.
-+*   -0x70E44324 == 0x8F1BBCDC
-+*   -0x359D3E2A == 0xCA62C1D6
-+*/
- #define MAGIC1 0x5A827999
- #define MAGIC2 0x6ED9EBA1
--#define MAGIC3 0x8F1BBCDC
--#define MAGIC4 0xCA62C1D6
-+#define MAGIC3 -0x70E44324
-+#define MAGIC4 -0x359D3E2A
- 
- #define T %esi
- #define T2 %eax