Clean up leading whitespaces, add additional quoting, and drop the virtual/libc dep

Package-Manager: portage-2.1_pre4-r1

3 files changed, 59 insertions, 55 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index e84ea6b8be5b..8ee7014d6a86 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/botan
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.16 2006/02/20 08:15:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.17 2006/02/20 22:11:11 halcy0n Exp $
+
+  20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> botan-1.5.5.ebuild:
+  Clean up leading whitespaces, add additional quoting, and drop the
+  virtual/libc dep
 
 *botan-1.5.5 (20 Feb 2006)
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 2e8744d4c0a0..8095f0e9d8cf 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7c4cf6f8c282d258e929c59531ac032d ChangeLog 2848
-RMD160 5e21f22321192feb8255a9f9da44720ad7005d29 ChangeLog 2848
-SHA256 0b0cdb4a19e66d61d24498c0c685c00abb8d107e78c7748d855c2a9338cad3ce ChangeLog 2848
+MD5 600746ab0a906fee75f3dc94b89faf40 ChangeLog 3001
+RMD160 8aff6e9641cfe4d01a00a8df406ea852a8ac4bc8 ChangeLog 3001
+SHA256 2f8e2d50fe020e792c6fcb269b52c66904796c900083ac259ed4416e843dc5ec ChangeLog 3001
 MD5 c7ad182eb1036a405d6fdf92cfc0d4d1 botan-1.4.11.ebuild 2466
 RMD160 553c07d469e4f91d5d70d8e9fc895878fa6d80a8 botan-1.4.11.ebuild 2466
 SHA256 d08badd0ace9d7367934d51b204c2aea5c3442c9ce59741df5460729109ceab9 botan-1.4.11.ebuild 2466
@@ -16,9 +16,9 @@ SHA256 f1d1eee56c0271b3b103a966812f5974ddbd7888cac25a09ca313086d2144dc8 botan-1.
 MD5 cc8e69ca2141787b033cbbacac2fac2b botan-1.4.9.ebuild 2550
 RMD160 8f867a05ca9925e5e642d26d40e368379db84f53 botan-1.4.9.ebuild 2550
 SHA256 6b090ffa03a4363704ebe0eb0e05a897b428d32bb4d809842a50002dbe6afb9a botan-1.4.9.ebuild 2550
-MD5 76fb77334a0fe58bc8110ecec0742756 botan-1.5.5.ebuild 2771
-RMD160 1faa31d27bdf5d0d51a29d6c9a55f84c0534ea92 botan-1.5.5.ebuild 2771
-SHA256 b018e35f652e7a17366f83d849c8802b3a5e6c4f3e7c5d362d940189fe950011 botan-1.5.5.ebuild 2771
+MD5 56a7dc3097e53c8690cf322bcd303093 botan-1.5.5.ebuild 2428
+RMD160 327106e67ba995b1603c51ffda48c0c2f9348866 botan-1.5.5.ebuild 2428
+SHA256 e04ab3431107edab5be3e1f0cce53b09ba7323a3cffa9fb5727d9e371d2683fd botan-1.5.5.ebuild 2428
 MD5 2214700974b810ad0c871ae2110ff054 files/botan-1.4.4-gcc34.patch 479
 RMD160 6ed6b8890650ccd391df188419c56a0ec27bfb3b files/botan-1.4.4-gcc34.patch 479
 SHA256 4df4e37ecca2dfbd841106f1207a95a3658ebc17419e4a58fe6ff93b9d410ba4 files/botan-1.4.4-gcc34.patch 479
@@ -44,9 +44,9 @@ MD5 d769a7ef93cd04ed5de9f468af0979cd metadata.xml 463
 RMD160 a50421a9df0c4f6f8ded9568525613993bd03f46 metadata.xml 463
 SHA256 a5cb191344e60da7f987220e591ee31c12b6c4ca898a03dc83745e51f56c2715 metadata.xml 463
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD+X2RmdTrptrqvGERAvT/AJ4q6rVLh967ugcSWIIXf1Q/ScAWcgCdFjxG
-6UpPlUslGv75pVmlAiylF68=
-=4yep
+iD8DBQFD+j6JCRZPokWLroQRAnOaAJ48kSfX/USriz5BYynal44zuWCLlQCeKAtS
+EneBLL3nQEGE3DZkYvqUIG0=
+=DKzj
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.5.5.ebuild b/dev-libs/botan/botan-1.5.5.ebuild
index 7ebccf907ffb..85a56a764409 100644
--- a/dev-libs/botan/botan-1.5.5.ebuild
+++ b/dev-libs/botan/botan-1.5.5.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header $
 
 # Comments/fixes to lloyd@randombit.net (author)
 
@@ -14,66 +15,65 @@ IUSE="bzip2 gmp ssl zlib"
 
 S="${WORKDIR}/Botan-${PV}"
 
-RDEPEND="virtual/libc
-        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 )"
+RDEPEND="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 )"
 
 # configure.pl requires DirHandle, Getopt::Long, File::Spec, and File::Copy;
 # all seem included in dev-lang/perl ATM.
 DEPEND="${RDEPEND}
-        dev-lang/perl"
+	dev-lang/perl"
 
 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,tm_posix,mux_pthr"
+	# 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,tm_posix,mux_pthr"
 
-        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
+	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
 
-        # This is also supported on i586+ - hope this is correct.
-        # documention says sparc though not enables because of
-        # http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
-        if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
-                [ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
-                modules="$modules,tm_hard"
-        fi
+	# This is also supported on i586+ - hope this is correct.
+	# documention says sparc though not enables because of
+	# http://bugs.gentoo.org/show_bug.cgi?id=71760#c11
+	if [ ${ARCH} = 'alpha' -o ${ARCH} = 'amd64' ] || \
+			[ ${ARCH} = 'x86' -a ${CHOST:0:4} != "i386" -a ${CHOST:0:4} != "i486" ]; then
+			modules="$modules,tm_hard"
+	fi
 
-        # If we have assembly code for this machine, use it
-        if [ "${ARCH}" = 'x86' ]; then
-           modules="$modules,mp_ia32"
-        elif [ "${ARCH}" = 'amd64' ]; then
-           modules="$modules,mp_amd64"
-        elif [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64'
-                -o "${PROFILE_ARCH}" = 'mips64'  ]; then
-                modules="$modules,mp_asm64"
-        fi
+	# If we have assembly code for this machine, use it
+	if [ "${ARCH}" = 'x86' ]; then
+		modules="$modules,mp_ia32"
+	elif [ "${ARCH}" = 'amd64' ]; then
+		modules="$modules,mp_amd64"
+	elif [ "${ARCH}" = 'alpha' -o "${ARCH}" = 'ia64' -o "${ARCH}" = 'ppc64'
+			-o "${PROFILE_ARCH}" = 'mips64'  ]; then
+			modules="$modules,mp_asm64"
+	fi
 
-        # Enable v9 instructions for sparc64
-        if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-                CHOSTARCH='sparc32-v9'
-        else
-                CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
-        fi
+	# Enable v9 instructions for sparc64
+	if [ "${PROFILE_ARCH}" = "sparc64" ]; then
+			CHOSTARCH='sparc32-v9'
+	else
+			CHOSTARCH=$(echo ${CHOST} | cut -d - -f 1)
+	fi
 
-        cd ${S}
-        einfo "Enabling modules: " ${modules}
+	cd "${S}"
+	einfo "Enabling modules: " ${modules}
 
-        # FIXME: We might actually be on *BSD or OS X...
-        ./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
-                die "configure.pl failed"
-        emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
+	# FIXME: We might actually be on *BSD or OS X...
+	./configure.pl --noauto gcc-linux-${CHOSTARCH} --modules=$modules ||
+			die "configure.pl failed"
+	emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed"
 }
 
 src_test() {
-        chmod -R ugo+rX ${S}
-        emake check || die "emake check failed"
-        env LD_LIBRARY_PATH=${S} ./check --validate || die "validation tests failed"
+	chmod -R ugo+rX "${S}"
+	emake check || die "emake check failed"
+	env LD_LIBRARY_PATH="${S}" ./check --validate || die "validation tests failed"
 }
 
 src_install() {
-        make INSTALLROOT="${D}/usr" install || die "make install failed"
+	make INSTALLROOT="${D}/usr" install || die "make install failed"
 }