Fix building with newer db versions

Package-Manager: portage-2.1_pre6-r3

4 files changed, 54 insertions, 16 deletions

diff --git a/sys-libs/nss-db/ChangeLog b/sys-libs/nss-db/ChangeLog
index 23fd991ee398..801c731e83b6 100644
--- a/sys-libs/nss-db/ChangeLog
+++ b/sys-libs/nss-db/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/nss-db
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.9 2005/07/04 07:45:22 dholm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/ChangeLog,v 1.10 2006/03/16 21:11:11 pauldv Exp $
+
+  16 Mar 2006; <pauldv@gentoo.org> nss-db-2.2.3_pre1-r1.ebuild:
+  Fix building with newer db versions.
 
   04 Jul 2005; David Holm <dholm@gentoo.org> nss-db-2.2.3_pre1-r1.ebuild:
   Added to ~ppc.
diff --git a/sys-libs/nss-db/Manifest b/sys-libs/nss-db/Manifest
index eef8931b5f89..f3f08da52e69 100644
--- a/sys-libs/nss-db/Manifest
+++ b/sys-libs/nss-db/Manifest
@@ -1,11 +1,33 @@
-MD5 5842c62d80f8bdba0e6c242e6b864065 ChangeLog 1623
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 610312df9caa3ff32a3b73dc9430e21f nss-db-2.2-r1.ebuild 1021
-MD5 f16cb958d7aa84151d64918c033ae2c9 nss-db-2.2.3_pre1.ebuild 2658
-MD5 3cba3c7d8be1c8e30d78a19a88d91823 nss-db-2.2.3_pre1-r1.ebuild 2765
+MD5 3b51b4b8f15693298f6cac154b03bd4d ChangeLog 1729
+RMD160 2088e7282c66062c7028b8f38811eef0191436f8 ChangeLog 1729
+SHA256 24725e403ea575836d14aa8ac08f7c846b06051703557715432ad0b7e3c3d1f2 ChangeLog 1729
 MD5 03cdab663eb8542cea7c07707d596740 files/db3.patch 1174
+RMD160 eeac21cb96b84070ddd1cb4975e4c42793711f12 files/db3.patch 1174
+SHA256 2db3285c19657c9dfad4ced22e17d0bf19268c12779e781716cd87db6fac7bf0 files/db3.patch 1174
 MD5 ca50c2850faf4fa26fcf5dd10838aab9 files/digest-nss-db-2.2-r1 62
+RMD160 2b7523f091c4498e3927e311fc6a4447a49a37ba files/digest-nss-db-2.2-r1 62
+SHA256 ac2999eaebdd100bf03f3ab1b7855bdb8784170a7f7b2c0135c61dc86a9a56a8 files/digest-nss-db-2.2-r1 62
 MD5 b5919430d82230e5d31c30d730da9149 files/digest-nss-db-2.2.3_pre1 299
-MD5 597edf0286c0a43308c48b9f7112e798 files/remake-all-db 233
-MD5 b5919430d82230e5d31c30d730da9149 files/digest-nss-db-2.2.3_pre1-r1 299
+RMD160 4849e98844e00b02496811a348542b4a04569052 files/digest-nss-db-2.2.3_pre1 299
+SHA256 6c716732c2f93ff14c25958919d55ef656f0e03e579717282848977c9c4240e5 files/digest-nss-db-2.2.3_pre1 299
+MD5 2c74ff8d4ff5dcae1c0836c63364cd9d files/digest-nss-db-2.2.3_pre1-r1 1081
+RMD160 ce1e4bb506eec03fcfdbb141cd6531b22cf00967 files/digest-nss-db-2.2.3_pre1-r1 1081
+SHA256 966017a89c24f172276f16f3d357b3d1f8cd151f9873dfb235f3f3c14c96fbed files/digest-nss-db-2.2.3_pre1-r1 1081
 MD5 bfa0ad4e21b3a2d1a8ee63b734c67bc0 files/nss-db-2.2.3_pre1-root-upgrade-only.patch 706
+RMD160 e13940f6ff0dc48014a73a245b11ca9086de6a50 files/nss-db-2.2.3_pre1-root-upgrade-only.patch 706
+SHA256 097bb136444f03aebd482a81c6039ef82c8cc3aeee80c6750f3165d7d9a2fef3 files/nss-db-2.2.3_pre1-root-upgrade-only.patch 706
+MD5 597edf0286c0a43308c48b9f7112e798 files/remake-all-db 233
+RMD160 e1a896ad287edf451a68bcdfa4c68e4c0678556e files/remake-all-db 233
+SHA256 16ea89210a3e5d0249665b425ad191244d159639028b1f9cb534d7cc9aef4f7d files/remake-all-db 233
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 610312df9caa3ff32a3b73dc9430e21f nss-db-2.2-r1.ebuild 1021
+RMD160 90c2bd15afaa62f4839c051822bbb86972a0d1c7 nss-db-2.2-r1.ebuild 1021
+SHA256 67f13ba6a5af6cea431f6ad37469849bc631fc66ef6559029b9a68621c011dfd nss-db-2.2-r1.ebuild 1021
+MD5 2819465d5de71505c244e52202b2ab14 nss-db-2.2.3_pre1-r1.ebuild 2865
+RMD160 dc780fff49a605f88462a3258af20ae1d2bb7434 nss-db-2.2.3_pre1-r1.ebuild 2865
+SHA256 f2d63a7297bfd2b0ec8e95c14ad98f516c72e0327b71c36347d4eb2122b2dd8d nss-db-2.2.3_pre1-r1.ebuild 2865
+MD5 f16cb958d7aa84151d64918c033ae2c9 nss-db-2.2.3_pre1.ebuild 2658
+RMD160 3a490e427634266bdb3311a7c34f575482ce2b40 nss-db-2.2.3_pre1.ebuild 2658
+SHA256 5abf4d428ae0c9564210a9ae88308970a00ec9847169cf249528306bc6d45503 nss-db-2.2.3_pre1.ebuild 2658
diff --git a/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r1 b/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r1
index df79771ab5d6..ffeb884650a4 100644
--- a/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r1
+++ b/sys-libs/nss-db/files/digest-nss-db-2.2.3_pre1-r1
@@ -1,4 +1,12 @@
-MD5 b4440ba2865d28e9068e465426c19ede nss_db-2.2.3pre1.tar.gz 235360
-MD5 ec455e427bf7bf4daba3427fd4066db3 nss_db-2.2.3pre1-external.patch.bz2 1870
-MD5 d02a1a231c70e28320ed21e883be4d6a nss_db-2.2.3pre1-dbupgrade.patch.bz2 263
 MD5 e26590083b9f32d2c134d204ba0ad72e nss_db-2.2.3pre1-dbopen.patch.bz2 258
+RMD160 2a7b96393cf3c338c8bc1041e26824dbca74aa57 nss_db-2.2.3pre1-dbopen.patch.bz2 258
+SHA256 9d7bf1ef17ca91c59c234bfa96d4b9e3f866a792c609a02cc6d9daa601dee1d3 nss_db-2.2.3pre1-dbopen.patch.bz2 258
+MD5 d02a1a231c70e28320ed21e883be4d6a nss_db-2.2.3pre1-dbupgrade.patch.bz2 263
+RMD160 90ad8e330a7677f8ebd4a2fd210d258d8ba1e496 nss_db-2.2.3pre1-dbupgrade.patch.bz2 263
+SHA256 31052eb79cc4aa60f639a3a57d9225630327ee6c728d62eda1d9c91ea7d70dc3 nss_db-2.2.3pre1-dbupgrade.patch.bz2 263
+MD5 ec455e427bf7bf4daba3427fd4066db3 nss_db-2.2.3pre1-external.patch.bz2 1870
+RMD160 d85fdb31935c5ab75ed80b1159155f5fa5b8a2e5 nss_db-2.2.3pre1-external.patch.bz2 1870
+SHA256 dbc45a4dc7c977fae2193e0a14fdb862a5f42479ac40da0d4772d5d66e95ade0 nss_db-2.2.3pre1-external.patch.bz2 1870
+MD5 b4440ba2865d28e9068e465426c19ede nss_db-2.2.3pre1.tar.gz 235360
+RMD160 a511fcc1dc7937e13e84ccd125d688463ac52555 nss_db-2.2.3pre1.tar.gz 235360
+SHA256 0c5d677a49c7bf6b9318bf40adf335839a668d1c7509e9b1915bd22a9e0ac694 nss_db-2.2.3pre1.tar.gz 235360
diff --git a/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild b/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild
index d229b8a24862..07d34908b60a 100644
--- a/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild
+++ b/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild,v 1.2 2005/07/04 07:45:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.3_pre1-r1.ebuild,v 1.3 2006/03/16 21:11:11 pauldv Exp $
 
 inherit eutils versionator multilib
 
@@ -43,8 +43,13 @@ db_getversym() {
 	local DBVER DBSYMSUFFIX
 	[ -n "${1}" ] && DBVER="${1}" || DBVER="$(db_getver)"
 	DBVER=($(get_version_components "${DBVER}"))
-	let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
-	echo "_${DBSYMSUFFIX}"
+	if has_version '>=sys-libs/db-4.3'; then
+		DBSYMSUFFIX=""
+	else
+		let DBSYMSUFFIX=(${DBVER[0]}*1000)+${DBVER[1]}
+		DBSYMSUFFIX=_${DBSYMSUFFIX}
+	fi
+	echo "${DBSYMSUFFIX}"
 }
 
 src_unpack() {