Removed java gen 1 ebuild, quoted vars

Package-Manager: portage-2.1.3.15

9 files changed, 65 insertions, 235 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 7c065ae41a92..0c6c6dddf8c0 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.226 2007/09/03 17:07:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.227 2007/10/24 07:07:55 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> db-1.85-r1.ebuild,
+  -db-3.2.9-r10.ebuild, db-3.2.9-r11.ebuild, db-4.4.20_p4.ebuild,
+  db-4.5.20_p2.ebuild, db-4.6.19.ebuild:
+  Removed java gen 1 ebuild, quoted vars
 
   03 Sep 2007; Caleb Tennis <caleb@gentoo.org> db-3.2.9-r11.ebuild:
   Changing java dep per bug #181832
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 8d6c9595b6ef..09533fecae0e 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -117,22 +117,18 @@ DIST patch.4.4.20.3 1366 RMD160 668c8e88f6fde2c028a9a3ad1d6917a28e7b3e85 SHA1 58
 DIST patch.4.4.20.4 837 RMD160 46cf2177aee1ce00c0044817610231541722c4d3 SHA1 8875add3312fdc0548fbd4dedb71b4f8637dc6c9 SHA256 7018f74e5184451809f6864172132472e91d95e2bec97ce6124afb67f0d65e59
 DIST patch.4.5.20.1 984 RMD160 52093e6c3d952cb8193db35e45aa4462ba0772be SHA1 0d55d4d7357b896bde91e096b40bfc100bb27d9d SHA256 f0749a6780cd260fed20b6e961a0d354889ffe84505129d5c81925a4a4dcf6cb
 DIST patch.4.5.20.2 1752 RMD160 d35069e8267f02e64e6f1be046d6cb9e75e9e720 SHA1 a3fcbc023489c059659f789d9473ac25d6d3a477 SHA256 232a93565ab1bf34db10f7513b612867bb61e0c012def7f63715800a05d07e6a
-EBUILD db-1.85-r1.ebuild 1422 RMD160 4b16405d85e82559df539ca518c08d65c4f74a74 SHA1 b867e730ee980d5fbc12f7111ecee7194ded4717 SHA256 78b9112a82df52121fe5ce448840d5353fbc2ceb66f5172128c487d5b2197437
-MD5 1c0d88c2289bd987447061e22b345e5e db-1.85-r1.ebuild 1422
-RMD160 4b16405d85e82559df539ca518c08d65c4f74a74 db-1.85-r1.ebuild 1422
-SHA256 78b9112a82df52121fe5ce448840d5353fbc2ceb66f5172128c487d5b2197437 db-1.85-r1.ebuild 1422
+EBUILD db-1.85-r1.ebuild 1430 RMD160 f3aea6863179125dcf307d4d91d16d0695d5dba5 SHA1 84f2748d45073119a9a6bee32aa7ef9b7e2c44b6 SHA256 0e22ffc8fe20072f24f893e4cc0088e8ebb16c30820572635b69d3b8b626527a
+MD5 29d8d13925b5be3ccf1b53a1781e921a db-1.85-r1.ebuild 1430
+RMD160 f3aea6863179125dcf307d4d91d16d0695d5dba5 db-1.85-r1.ebuild 1430
+SHA256 0e22ffc8fe20072f24f893e4cc0088e8ebb16c30820572635b69d3b8b626527a db-1.85-r1.ebuild 1430
 EBUILD db-1.85-r3.ebuild 1210 RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 SHA1 0ba678ba26693061c5d33b93be468072769a4ba4 SHA256 ab969a566111ab49c561bfa9a8f2fdfa3e7c4d13a4b942d821eaf10a5c40b1a0
 MD5 23051304aff15d3991c617f97daa67b4 db-1.85-r3.ebuild 1210
 RMD160 78f28bf46f4adde0df02f9ebe7e4dfbbebb293e9 db-1.85-r3.ebuild 1210
 SHA256 ab969a566111ab49c561bfa9a8f2fdfa3e7c4d13a4b942d821eaf10a5c40b1a0 db-1.85-r3.ebuild 1210
-EBUILD db-3.2.9-r10.ebuild 4393 RMD160 388f43d74bef9a314c2419588838aed3ea9b0d73 SHA1 89cdce4b3b41f482011afe9c3473cc4bfe0fb0d0 SHA256 f38bba3f3f0da5c318653325902a76c1fc589038af0cf2dddb98451bcc14174a
-MD5 3709f0a14d7cb7a67acbeb259442d5d2 db-3.2.9-r10.ebuild 4393
-RMD160 388f43d74bef9a314c2419588838aed3ea9b0d73 db-3.2.9-r10.ebuild 4393
-SHA256 f38bba3f3f0da5c318653325902a76c1fc589038af0cf2dddb98451bcc14174a db-3.2.9-r10.ebuild 4393
-EBUILD db-3.2.9-r11.ebuild 4626 RMD160 a4d5ec418941f60ed656da5dce458611aad54e4d SHA1 3942bd029a78739cd937c72b55f1b95e9013838c SHA256 a2efe45bcf4c2b007d180ac50dcc16c5b0e6a6bf628a5c294c4e627c612e9889
-MD5 1f394ae2fb1abf950629e3b5ef21e076 db-3.2.9-r11.ebuild 4626
-RMD160 a4d5ec418941f60ed656da5dce458611aad54e4d db-3.2.9-r11.ebuild 4626
-SHA256 a2efe45bcf4c2b007d180ac50dcc16c5b0e6a6bf628a5c294c4e627c612e9889 db-3.2.9-r11.ebuild 4626
+EBUILD db-3.2.9-r11.ebuild 4675 RMD160 cd13a428ea355cf18ef5539cbd278967cf81f644 SHA1 cbb9b1d95c4ef006cf4498077de192afa4adc461 SHA256 723c6a83a595f4d2b04a4eb96276483d253fab788aa3fdc2fa0f4769bd87939e
+MD5 eaefe810be2473738bd221b65f3490a2 db-3.2.9-r11.ebuild 4675
+RMD160 cd13a428ea355cf18ef5539cbd278967cf81f644 db-3.2.9-r11.ebuild 4675
+SHA256 723c6a83a595f4d2b04a4eb96276483d253fab788aa3fdc2fa0f4769bd87939e db-3.2.9-r11.ebuild 4675
 EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 44cc9d42c0a9fa881add37c72a006f8013317d82 SHA1 b61e53bf1a4ca1cdacc9305d3183d42cb995b1d8 SHA256 0cdd68173cdb1a1b719675b99b050b533077674a860183c038a0cb55211e1387
 MD5 e37044a07039e46b260bb83b9d6ea22b db-4.2.52_p4-r2.ebuild 3486
 RMD160 44cc9d42c0a9fa881add37c72a006f8013317d82 db-4.2.52_p4-r2.ebuild 3486
@@ -141,22 +137,22 @@ EBUILD db-4.3.29-r2.ebuild 3709 RMD160 3b93e73fbf2b205c24a41dcb35b8af025a2e0499
 MD5 125634657952e49dfe7eae0d50f52bd6 db-4.3.29-r2.ebuild 3709
 RMD160 3b93e73fbf2b205c24a41dcb35b8af025a2e0499 db-4.3.29-r2.ebuild 3709
 SHA256 c4655c0df54f5b38a83de67c12b5c5f01e9cde125fdc54ecb5d119ad7578bddf db-4.3.29-r2.ebuild 3709
-EBUILD db-4.4.20_p4.ebuild 3674 RMD160 504f9b60bfb80673b9a8602b0087c2fe1cb6fd61 SHA1 94bf96cc210fea0e2fbc2d1dba02bf3c38128651 SHA256 9e95db6fc040ab8e5aec3610e00a8bcb1b756c94707508251e937db18219b9d2
-MD5 08870c5ea80136222cd8066297479813 db-4.4.20_p4.ebuild 3674
-RMD160 504f9b60bfb80673b9a8602b0087c2fe1cb6fd61 db-4.4.20_p4.ebuild 3674
-SHA256 9e95db6fc040ab8e5aec3610e00a8bcb1b756c94707508251e937db18219b9d2 db-4.4.20_p4.ebuild 3674
-EBUILD db-4.5.20_p2.ebuild 3923 RMD160 cb8dcb3877f063de0fb44bdfed38ecf4283a15f7 SHA1 5979a5a0a467d39151bc3aafc0b8dd326d03ee81 SHA256 279da37697c4c143d2ba184b16f8b4c02e0e3c02c8c9b57f54c0131a40898526
-MD5 74e269b062c7f8975ef3497ade25699a db-4.5.20_p2.ebuild 3923
-RMD160 cb8dcb3877f063de0fb44bdfed38ecf4283a15f7 db-4.5.20_p2.ebuild 3923
-SHA256 279da37697c4c143d2ba184b16f8b4c02e0e3c02c8c9b57f54c0131a40898526 db-4.5.20_p2.ebuild 3923
-EBUILD db-4.6.19.ebuild 3936 RMD160 a51c3af8bc6dcfdfdb4eac4b4f4b4e69eb4679c7 SHA1 85b77be76bf2af8f461ae5c79d2dad5f736541c4 SHA256 2222dab222834bc08d9e8e70f1a3d14b63a9f237f0fb7e69ba124d9d8cd3080d
-MD5 56f0981066096039d969a0d0faa5fb50 db-4.6.19.ebuild 3936
-RMD160 a51c3af8bc6dcfdfdb4eac4b4f4b4e69eb4679c7 db-4.6.19.ebuild 3936
-SHA256 2222dab222834bc08d9e8e70f1a3d14b63a9f237f0fb7e69ba124d9d8cd3080d db-4.6.19.ebuild 3936
-MISC ChangeLog 34413 RMD160 daf33b88a2cbe10a808c08119ae1aad79f9666ec SHA1 2b459ec74a2a6d2dd7f786c3c119b6f948de9685 SHA256 77e996b9b53aea99abf602610f5caa713374ef61424ede6371af29f8f09f3c7a
-MD5 0c007f5a4965ef402e8063290179e909 ChangeLog 34413
-RMD160 daf33b88a2cbe10a808c08119ae1aad79f9666ec ChangeLog 34413
-SHA256 77e996b9b53aea99abf602610f5caa713374ef61424ede6371af29f8f09f3c7a ChangeLog 34413
+EBUILD db-4.4.20_p4.ebuild 3676 RMD160 7b63df1a310b1f7ee375298855fd5cc2bab6151f SHA1 a746d67be608c033b24bc8c5dd1b23dbf1ff9807 SHA256 4dd5dc3e2462970a0bd19ff601607181ed203a089dca9bcabb45b60baa516fd2
+MD5 708d24f2a19b3c235de742aca7c08828 db-4.4.20_p4.ebuild 3676
+RMD160 7b63df1a310b1f7ee375298855fd5cc2bab6151f db-4.4.20_p4.ebuild 3676
+SHA256 4dd5dc3e2462970a0bd19ff601607181ed203a089dca9bcabb45b60baa516fd2 db-4.4.20_p4.ebuild 3676
+EBUILD db-4.5.20_p2.ebuild 3925 RMD160 fcd3e822554999ec483801256a8bd604800e9ec2 SHA1 141edd2e8ef34da7d2284e6226e1bdc579f0d247 SHA256 dc8c46df080130953702cbe59a473bc178c0c192ca6d2de01566b8c02891bccd
+MD5 ec83361f70d1d924b165bbae1d8c1da2 db-4.5.20_p2.ebuild 3925
+RMD160 fcd3e822554999ec483801256a8bd604800e9ec2 db-4.5.20_p2.ebuild 3925
+SHA256 dc8c46df080130953702cbe59a473bc178c0c192ca6d2de01566b8c02891bccd db-4.5.20_p2.ebuild 3925
+EBUILD db-4.6.19.ebuild 3938 RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 SHA1 1b989d2ef22b29ff24de0466438be027d4627ed5 SHA256 b02f92bf555c84949b219db80bca55b35d7a66952c2a6f728dc74898672c865a
+MD5 120bd6f54a46b00d13fa5b6fa055c30c db-4.6.19.ebuild 3938
+RMD160 9fc00d58a793ba388a84b91f423e84a9d7dbdee5 db-4.6.19.ebuild 3938
+SHA256 b02f92bf555c84949b219db80bca55b35d7a66952c2a6f728dc74898672c865a db-4.6.19.ebuild 3938
+MISC ChangeLog 34638 RMD160 5c72537fa682bd328db7323f85e92c452cdc9361 SHA1 1c143a69f614225e76e73934874acf843bd8532b SHA256 1510cf8e4e9def42b0a719122dda5b94103a6072a3acc6c6051a772ff74ab0e3
+MD5 8257cb01ff0b9f49b03815230797c5f2 ChangeLog 34638
+RMD160 5c72537fa682bd328db7323f85e92c452cdc9361 ChangeLog 34638
+SHA256 1510cf8e4e9def42b0a719122dda5b94103a6072a3acc6c6051a772ff74ab0e3 ChangeLog 34638
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
 MD5 71519f9e67010bd7b9d8aff6b19b8c15 metadata.xml 1651
 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 metadata.xml 1651
@@ -167,9 +163,6 @@ SHA256 e1baf331d288a2846ebbe548b213350829b3459770b07becc689467cf901a010 files/di
 MD5 04b5da67912f6436d6cd018c7535c6e0 files/digest-db-1.85-r3 467
 RMD160 fe68aa9fe1523a966db10488d535592b1f80bb7a files/digest-db-1.85-r3 467
 SHA256 81fea98145a964fea76ca023055f58b30212245bbb3ddf0efeef81299fc68041 files/digest-db-1.85-r3 467
-MD5 89d5c6e9ecc4225d5936a1e05274799d files/digest-db-3.2.9-r10 229
-RMD160 e6aedcada1a91187c51de26ab254a6d3aa411181 files/digest-db-3.2.9-r10 229
-SHA256 829ef6dcac63c8d01a6173e02aad48203ef45dcf4bb27aaa770c520625fc4903 files/digest-db-3.2.9-r10 229
 MD5 89d5c6e9ecc4225d5936a1e05274799d files/digest-db-3.2.9-r11 229
 RMD160 e6aedcada1a91187c51de26ab254a6d3aa411181 files/digest-db-3.2.9-r11 229
 SHA256 829ef6dcac63c8d01a6173e02aad48203ef45dcf4bb27aaa770c520625fc4903 files/digest-db-3.2.9-r11 229
diff --git a/sys-libs/db/db-1.85-r1.ebuild b/sys-libs/db/db-1.85-r1.ebuild
index f118b79454ea..87612a137fe9 100644
--- a/sys-libs/db/db-1.85-r1.ebuild
+++ b/sys-libs/db/db-1.85-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.33 2007/08/20 11:40:20 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85-r1.ebuild,v 1.34 2007/10/24 07:07:55 wltjr Exp $
 
 inherit eutils
 
@@ -20,17 +20,17 @@ S=${WORKDIR}/db.${PV}
 
 src_unpack() {
 	unpack db.${PV}.tar.gz
-	cd ${S}
+	cd "${S}"
 	epatch ${DISTDIR}/db.${PV}.patch
 }
 
 src_compile() {
-	cd ${S}/PORT/linux
+	cd "${S}"/PORT/linux
 	make ${MAKEOPTS} OORG="${CFLAGS} -fomit-frame-pointer" prefix=/usr || die
 }
 
 src_install () {
-	cd ${S}/PORT/linux
+	cd "${S}"/PORT/linux
 
 	newlib.a libdb.a libdb1.a || die "newlib.a failed"
 	newlib.so libdb.so.2 libdb1.so.2 || die "newlib.so failed"
@@ -49,7 +49,7 @@ src_install () {
 	dosym db1/ndbm.h /usr/include/ndbm.h
 	newbin db_dump185 db1_dump185
 
-	cd ${S}
+	cd "${S}"
 	dodoc changelog README
 	docinto ps
 	dodoc docs/*.ps
diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild
deleted file mode 100644
index dfaf99a1cc6f..000000000000
--- a/sys-libs/db/db-3.2.9-r10.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.28 2007/08/15 12:17:11 caleb Exp $
-
-inherit gnuconfig libtool eutils db java-pkg
-
-DESCRIPTION="Berkeley DB for transaction support in MySQL"
-HOMEPAGE="http://www.sleepycat.com/"
-SRC_URI="ftp://ftp.sleepycat.com/releases/${P}.tar.gz"
-
-LICENSE="DB"
-SLOT="3"
-# This ebuild is to be the compatibility ebuild for when db4 is put
-# in the tree.
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc java"
-
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	=sys-libs/db-1.85*
-	sys-devel/libtool
-	sys-devel/m4
-	java? ( virtual/jdk )"
-# We need m4 too else build fails without config.guess
-
-# This doesn't build without exceptions
-export CXXFLAGS="${CXXFLAGS/-fno-exceptions/-fexceptions}"
-
-pkg_setup() {
-	use java && java-pkg_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	chmod -R ug+w *
-
-	cd ${WORKDIR}/${P}
-	epatch ${FILESDIR}/patch.3.2.9.1
-	epatch ${FILESDIR}/patch.3.2.9.2
-
-	# Get db to link libdb* to correct dependencies ... for example if we use
-	# NPTL or NGPT, db detects usable mutexes, and should link against
-	# libpthread, but does not do so ...
-	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/${P}-fix-dep-link.patch
-
-	# We should get dump185 to link against system db1 ..
-	# <azarah@gentoo.org> (23 Feb 2003)
-	mv ${S}/dist/Makefile.in ${S}/dist/Makefile.in.orig
-	sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
-		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
-		${S}/dist/Makefile.in.orig > ${S}/dist/Makefile.in || die "Failed to sed"
-
-	# Fix invalid .la files
-	cd ${WORKDIR}/${P}/dist
-	rm -f ltversion.sh
-	# remove config.guess else we have problems with gcc-3.2
-	rm -f config.guess
-	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-jarlocation.patch
-	epatch ${FILESDIR}/db-3.2.9-java15.patch
-	gnuconfig_update
-}
-
-src_compile() {
-	local conf=
-	local conf_shared=
-	local conf_static=
-
-	use java && export JAVACABS="${JAVAC}"
-
-	conf="${conf}
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--enable-cxx \
-		--enable-compat185 \
-		--enable-dump185 \
-		--prefix=/usr"
-
-	# --enable-rpc DOES NOT BUILD
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-
-	conf_shared="${conf_shared}
-		`use_enable java`
-		--enable-dynamic"
-
-	# TCL support is also broken
-	# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
-	# conf_shared="${conf_shared}
-	#	`use_enable tcl tcl`
-	#	`use_with tcl tcl /usr/lib`"
-
-	# NOTE: we should not build both shared and static versions
-	#       of the libraries in the same build root!
-
-	einfo "Configuring ${P} (static)..."
-	mkdir -p ${S}/build-static
-	cd ${S}/build-static
-	../dist/configure ${conf} ${conf_static} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-static || die
-
-	einfo "Configuring ${P} (shared)..."
-	mkdir -p ${S}/build-shared
-	cd ${S}/build-shared
-	../dist/configure ${conf} ${conf_shared} \
-		--libdir=/usr/$(get_libdir) \
-		--enable-shared || die
-
-	# Parallel make does not work
-	MAKEOPTS="${MAKEOPTS} -j1"
-	einfo "Building ${P} (static)..."
-	cd ${S}/build-static
-	emake || die "Static build failed"
-	einfo "Building ${P} (shared)..."
-	cd ${S}/build-shared
-	emake || die "Shared build failed"
-}
-
-src_install () {
-	cd ${S}/build-shared
-	make libdb=libdb-3.2.a \
-		libcxx=libcxx_3.2.a \
-		prefix=${D}/usr \
-		libdir=${D}/usr/$(get_libdir) \
-		install || die
-
-	cd ${S}/build-static
-	newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
-	newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
-
-	db_src_install_headerslot || die "db_src_install_headerslot failed!"
-
-	# this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
-	#cd ${D}/usr/lib
-	#ln -s libdb-3.2.so libdb.so.3
-
-	# For some reason, db.so's are *not* readable by group or others,
-	# resulting in no one but root being able to use them!!!
-	# This fixes it -- DR 15 Jun 2001
-	cd ${D}/usr/$(get_libdir)
-	chmod go+rx *.so
-	# The .la's aren't readable either
-	chmod go+r *.la
-
-	cd ${S}
-	dodoc README LICENSE
-
-	db_src_install_doc || die "db_src_install_doc failed!"
-
-	db_src_install_usrbinslot || die "db_src_install_usrbinslot failed!"
-
-	db_src_install_usrlibcleanup || die "db_src_install_usrlibcleanup failed!"
-}
-
-pkg_postinst () {
-	db_fix_so
-}
-
-pkg_postrm () {
-	db_fix_so
-}
diff --git a/sys-libs/db/db-3.2.9-r11.ebuild b/sys-libs/db/db-3.2.9-r11.ebuild
index 61e02b4a7d53..73517280802c 100644
--- a/sys-libs/db/db-3.2.9-r11.ebuild
+++ b/sys-libs/db/db-3.2.9-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.12 2007/09/03 17:07:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.13 2007/10/24 07:07:55 wltjr Exp $
 
 inherit gnuconfig libtool eutils db java-pkg-opt-2
 
@@ -33,33 +33,33 @@ src_unpack() {
 
 	chmod -R ug+w *
 
-	cd ${WORKDIR}/${P}
-	epatch ${FILESDIR}/patch.3.2.9.1
-	epatch ${FILESDIR}/patch.3.2.9.2
+	cd "${WORKDIR}"/${P}
+	epatch "${FILESDIR}"/patch.3.2.9.1
+	epatch "${FILESDIR}"/patch.3.2.9.2
 
 	# Get db to link libdb* to correct dependencies ... for example if we use
 	# NPTL or NGPT, db detects usable mutexes, and should link against
 	# libpthread, but does not do so ...
 	# <azarah@gentoo.org> (23 Feb 2003)
-	epatch ${FILESDIR}/${P}-fix-dep-link.patch
+	epatch "${FILESDIR}"/${P}-fix-dep-link.patch
 
 	# We should get dump185 to link against system db1 ..
 	# <azarah@gentoo.org> (23 Feb 2003)
-	mv ${S}/dist/Makefile.in ${S}/dist/Makefile.in.orig
+	mv "${S}"/dist/Makefile.in "${S}"/dist/Makefile.in.orig
 	sed -e 's:DB185INC=:DB185INC= -I/usr/include/db1:' \
 		-e 's:DB185LIB=:DB185LIB= -ldb1:' \
-		${S}/dist/Makefile.in.orig > ${S}/dist/Makefile.in || die "Failed to sed"
+		"${S}/dist/Makefile.in.orig > "${S}"/dist/Makefile.in || die "Failed to sed"
 
 	# Fix invalid .la files
-	cd ${WORKDIR}/${P}/dist
+	cd "${WORKDIR}"/${P}/dist
 	rm -f ltversion.sh
 	# remove config.guess else we have problems with gcc-3.2
 	rm -f config.guess
 	sed -i "s,\(-D_GNU_SOURCE\),\1 ${CFLAGS}," configure
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-jarlocation.patch
-	epatch ${FILESDIR}/db-3.2.9-java15.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-jarlocation.patch
+	epatch "${FILESDIR}"/db-3.2.9-java15.patch
 	gnuconfig_update
 }
 
@@ -93,16 +93,16 @@ src_compile() {
 	#       of the libraries in the same build root!
 
 	einfo "Configuring ${P} (static)..."
-	mkdir -p ${S}/build-static
-	cd ${S}/build-static
+	mkdir -p "${S}"/build-static
+	cd "${S}"/build-static
 	strip=/bin/true \
 	../dist/configure ${conf} ${conf_static} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-static || die
 
 	einfo "Configuring ${P} (shared)..."
-	mkdir -p ${S}/build-shared
-	cd ${S}/build-shared
+	mkdir -p "${S}"/build-shared
+	cd "${S}"/build-shared
 	strip=/bin/true \
 	../dist/configure ${conf} ${conf_shared} \
 		--libdir=/usr/$(get_libdir) \
@@ -111,41 +111,41 @@ src_compile() {
 	# Parallel make does not work
 	MAKEOPTS="${MAKEOPTS} -j1"
 	einfo "Building ${P} (static)..."
-	cd ${S}/build-static
+	cd "${S}"/build-static
 	emake strip=/bin/true || die "Static build failed"
 	einfo "Building ${P} (shared)..."
-	cd ${S}/build-shared
+	cd "${S}"/build-shared
 	emake strip=/bin/true || die "Shared build failed"
 }
 
 src_install () {
-	cd ${S}/build-shared
+	cd "${S}"/build-shared
 	make libdb=libdb-3.2.a \
 		libcxx=libcxx_3.2.a \
-		prefix=${D}/usr \
-		libdir=${D}/usr/$(get_libdir) \
+		prefix="${D}"/usr \
+		libdir="${D}"/usr/$(get_libdir) \
 		strip=/bin/true \
 		install || die
 
-	cd ${S}/build-static
+	cd "${S}"/build-static
 	newlib.a libdb.a libdb-3.2.a || die "failed to package static libraries!"
 	newlib.a libdb_cxx.a libdb_cxx-3.2.a || die "failed to package static libraries!"
 
 	db_src_install_headerslot || die "db_src_install_headerslot failed!"
 
 	# this is now done in the db eclass, function db_fix_so and db_src_install_usrlibcleanup
-	#cd ${D}/usr/lib
+	#cd "${D}"/usr/lib
 	#ln -s libdb-3.2.so libdb.so.3
 
 	# For some reason, db.so's are *not* readable by group or others,
 	# resulting in no one but root being able to use them!!!
 	# This fixes it -- DR 15 Jun 2001
-	cd ${D}/usr/$(get_libdir)
+	cd "${D}"/usr/$(get_libdir)
 	chmod go+rx *.so
 	# The .la's aren't readable either
 	chmod go+r *.la
 
-	cd ${S}
+	cd "${S}"
 	dodoc README LICENSE
 
 	db_src_install_doc || die "db_src_install_doc failed!"
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index 7d387fded979..b2d4540c5270 100644
--- a/sys-libs/db/db-4.4.20_p4.ebuild
+++ b/sys-libs/db/db-4.4.20_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.3 2007/03/02 17:27:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.4 2007/10/24 07:07:55 wltjr Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -89,7 +89,7 @@ src_compile() {
 		append-ldflags -Wl,--default-symver
 	fi
 
-	cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
+	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index ab2ef5d26230..cff37baf7f85 100644
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.20 2007/08/27 17:16:58 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.21 2007/10/24 07:07:55 wltjr Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -95,7 +95,7 @@ src_compile() {
 		append-ldflags -Wl,--default-symver
 	fi
 
-	cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
+	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/sys-libs/db/db-4.6.19.ebuild b/sys-libs/db/db-4.6.19.ebuild
index ef51427823b4..0a425668522f 100644
--- a/sys-libs/db/db-4.6.19.ebuild
+++ b/sys-libs/db/db-4.6.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.19.ebuild,v 1.1 2007/08/19 12:08:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.19.ebuild,v 1.2 2007/10/24 07:07:55 wltjr Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -95,7 +95,7 @@ src_compile() {
 		append-ldflags -Wl,--default-symver
 	fi
 
-	cd ${S} && ECONF_SOURCE="${S}"/../dist econf \
+	cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/sys-libs/db/files/digest-db-3.2.9-r10 b/sys-libs/db/files/digest-db-3.2.9-r10
deleted file mode 100644
index 94bf83c2428a..000000000000
--- a/sys-libs/db/files/digest-db-3.2.9-r10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4df5c7051b11411e0a970f6c91613942 db-3.2.9.tar.gz 2085238
-RMD160 c2c5cdb3ec0e99e5687c0861dfbf76b8878f27cb db-3.2.9.tar.gz 2085238
-SHA256 3eccaec87bca4ca0f5728cf4579650da9d12e331187f1e98321e5c9e9e04b108 db-3.2.9.tar.gz 2085238