Change USE=bzlib to USE=bzip2.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 19 insertions, 25 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index 3ec1bf417ffc..a7dad1584983 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/botan
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.4 2004/12/09 14:16:52 gustavoz Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.5 2005/06/01 00:53:16 vapier Exp $
+
+  01 Jun 2005; Mike Frysinger <vapier@gentoo.org> botan-1.4.3.ebuild,
+  botan-1.4.4.ebuild:
+  Change USE=bzlib to USE=bzip2.
 
   09 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> botan-1.4.4.ebuild:
   Stable on sparc wrt #71760, fixed the whole sparc mess too
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 73dcf15e46a0..32070c9733f9 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6d4d146e44ebe17d57cb296c2f710e2 ChangeLog 1152
-MD5 dafb88a2409eb5d64eb1a86ede848b06 botan-1.4.3.ebuild 2221
+MD5 51a2ce695a86d1c47151753d61d8ba1b ChangeLog 1276
+MD5 64c36f71d888b4d8ebb9c8a98e3d1013 botan-1.4.3.ebuild 2216
 MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
-MD5 83ddf69b4b7d6703ef347d9a6eee6be3 botan-1.4.4.ebuild 2417
+MD5 900732622b9efbe290d7ec59c338acde botan-1.4.4.ebuild 2415
 MD5 c9748b2c6a670b1f0b8cbcb3ca74b8bb files/digest-botan-1.4.3 61
 MD5 010820c4ff5b87a3b62ea84bee465eed files/digest-botan-1.4.4 61
 MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBuF5SKRy60XGEcJIRAr09AJ497NSceWXc3p3CPU21/YgAW5sO0gCgmh3i
-3rmHQFdM9CNYvrEjBQSzCk4=
-=4Ggm
------END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.4.3.ebuild b/dev-libs/botan/botan-1.4.3.ebuild
index 5c42ffddc43a..c45ee0cbe791 100644
--- a/dev-libs/botan/botan-1.4.3.ebuild
+++ b/dev-libs/botan/botan-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.3.ebuild,v 1.2 2004/12/04 05:26:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.3.ebuild,v 1.3 2005/06/01 00:53:16 vapier Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -11,13 +11,13 @@ SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 KEYWORDS="x86"
 SLOT="0"
 LICENSE="BSD"
-IUSE="bzlib zlib gmp ssl debug"
+IUSE="bzip2 zlib gmp ssl debug"
 
 S="${WORKDIR}/Botan-${PV}"
 
 # FIXME: libstdc++ here?
 RDEPEND="virtual/libc
-	bzlib? ( >=app-arch/bzip2-1.0.1 )
+	bzip2? ( >=app-arch/bzip2-1.0.1 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
@@ -31,7 +31,7 @@ src_compile() {
 	# Modules that should work under any semi-recent Unix
 	modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,mux_pthr"
 
-	if useq bzlib; then modules="$modules,comp_bzip2"; fi
+	if useq bzip2; then modules="$modules,comp_bzip2"; fi
 	if use zlib; then modules="$modules,comp_zlib"; fi
 	if use gmp; then modules="$modules,eng_gmp"; fi
 	if use ssl; then modules="$modules,eng_ossl"; fi
diff --git a/dev-libs/botan/botan-1.4.4.ebuild b/dev-libs/botan/botan-1.4.4.ebuild
index 12b27f05a50d..fc6a34f8c6e4 100644
--- a/dev-libs/botan/botan-1.4.4.ebuild
+++ b/dev-libs/botan/botan-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.4.ebuild,v 1.3 2004/12/09 14:16:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.4.4.ebuild,v 1.4 2005/06/01 00:53:16 vapier Exp $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -13,13 +13,13 @@ SRC_URI="http://botan.randombit.net/files/Botan-${PV}.tgz"
 KEYWORDS="x86 ppc sparc"
 SLOT="0"
 LICENSE="BSD"
-IUSE="bzlib zlib gmp ssl debug"
+IUSE="bzip2 zlib gmp ssl debug"
 
 S="${WORKDIR}/Botan-${PV}"
 
 # FIXME: libstdc++ here?
 RDEPEND="virtual/libc
-	bzlib? ( >=app-arch/bzip2-1.0.1 )
+	bzip2? ( >=app-arch/bzip2-1.0.1 )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
 	gmp? ( >=dev-libs/gmp-4.1.2 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
@@ -39,7 +39,7 @@ src_compile() {
 	# Modules that should work under any semi-recent Unix
 	local modules="alloc_mmap,es_egd,es_ftw,es_unix,fd_unix,ml_unix,tm_unix,mux_pthr"
 
-	if useq bzlib; then modules="$modules,comp_bzip2"; fi
+	if useq bzip2; then modules="$modules,comp_bzip2"; fi
 	if useq zlib; then modules="$modules,comp_zlib"; fi
 	if useq gmp; then modules="$modules,eng_gmp"; fi
 	if useq ssl; then modules="$modules,eng_ossl"; fi