Include <db.h> when checking for db_create

Package-Manager: portage-2.1.2_pre1

4 files changed, 157 insertions, 18 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 0e2419505494..cbe3ea30d899 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.26 2006/07/24 08:47:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.27 2006/09/17 11:09:37 truedfx Exp $
+
+  17 Sep 2006; Harald van Dijk <truedfx@gentoo.org>
+  files/nvi-1.81.5-db4.patch, nvi-1.81.5-r3.ebuild:
+  Include <db.h> when checking for db_create
 
 *nvi-1.81.5-r3 (24 Jul 2006)
 
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 0026569ee05c..2ea5edacdf12 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -9,10 +9,10 @@ AUX nvi-1.81.5-build.patch 6250 RMD160 2ebf4306fb7c936ddb1c6af965b30947577b77a7
 MD5 a4807bf8ab886d59c1376de4b07e9564 files/nvi-1.81.5-build.patch 6250
 RMD160 2ebf4306fb7c936ddb1c6af965b30947577b77a7 files/nvi-1.81.5-build.patch 6250
 SHA256 d10cf388848f873648ec3e072f5197001f7ef811d6d8a530982db97ab3bb1049 files/nvi-1.81.5-build.patch 6250
-AUX nvi-1.81.5-db4.patch 1222 RMD160 00f9d05044fde18c727a079d29d8c649f00c3053 SHA1 4e7c1518b9fe3ec1b7d56cc12df36421ffe77684 SHA256 fa049c4bb53efaff37a14dfb7168234e0d81ca7e376656ede1c373dbf670e3ae
-MD5 2c9bbec126972693a8a40cd4b703e6ca files/nvi-1.81.5-db4.patch 1222
-RMD160 00f9d05044fde18c727a079d29d8c649f00c3053 files/nvi-1.81.5-db4.patch 1222
-SHA256 fa049c4bb53efaff37a14dfb7168234e0d81ca7e376656ede1c373dbf670e3ae files/nvi-1.81.5-db4.patch 1222
+AUX nvi-1.81.5-db4.patch 5746 RMD160 1454b7e0c3ef52310ef5e52a4c97dedffc01803a SHA1 c4b0e1d0c780a85c28ece38905e709d066f74e69 SHA256 f7924c19601992d55a41a503d52aef92ecfed61725c917461c7ff6890381e3fa
+MD5 61b1cde04a63468be2b3b8053859bb31 files/nvi-1.81.5-db4.patch 5746
+RMD160 1454b7e0c3ef52310ef5e52a4c97dedffc01803a files/nvi-1.81.5-db4.patch 5746
+SHA256 f7924c19601992d55a41a503d52aef92ecfed61725c917461c7ff6890381e3fa files/nvi-1.81.5-db4.patch 5746
 AUX nvi-1.81.5-gcc4.patch 4894 RMD160 2f5e790815627a522f4831f55b028e1b1bc86796 SHA1 628e8d5010d6b47f40f3b18aa62dddb5ffefb182 SHA256 04fecc2b41310059708700b52b415ec971076cf98243c78200efa03940c9bb0c
 MD5 b02176fad055feb722d0e56e9f78616c files/nvi-1.81.5-gcc4.patch 4894
 RMD160 2f5e790815627a522f4831f55b028e1b1bc86796 files/nvi-1.81.5-gcc4.patch 4894
@@ -41,18 +41,18 @@ EBUILD nvi-1.81.5-r2.ebuild 1153 RMD160 7b867af7f2e871fb7c008c8b3c344fbfb5b93a6b
 MD5 f11aad7670562e59219d0c56241a3a5d nvi-1.81.5-r2.ebuild 1153
 RMD160 7b867af7f2e871fb7c008c8b3c344fbfb5b93a6b nvi-1.81.5-r2.ebuild 1153
 SHA256 e557749c7eaf3649956d4ef708d65d2ceba33bbbea875bb12029f17d40548bb8 nvi-1.81.5-r2.ebuild 1153
-EBUILD nvi-1.81.5-r3.ebuild 1692 RMD160 cae7a441954821e5577567438ed02e958e4a6ec7 SHA1 8deabbce565f0bdaa15199ad94d628587d563a9e SHA256 3749291d5c3a0b411137e209715be827b28a68f7c36a4117293c55c4b4c9cac1
-MD5 532fa71a599095a26a24e89ce02bb672 nvi-1.81.5-r3.ebuild 1692
-RMD160 cae7a441954821e5577567438ed02e958e4a6ec7 nvi-1.81.5-r3.ebuild 1692
-SHA256 3749291d5c3a0b411137e209715be827b28a68f7c36a4117293c55c4b4c9cac1 nvi-1.81.5-r3.ebuild 1692
+EBUILD nvi-1.81.5-r3.ebuild 1757 RMD160 9579c3812dd6e80fb8002df648a1323aaacac59a SHA1 d333d64f44e1bd0aa2041a57762ab2991949bf16 SHA256 69167e99e808eabccd358cb4695214a9a5076f718ad374dc7d6400f058b07ae7
+MD5 5d5efc0e69f9606bc95b5690a31aa796 nvi-1.81.5-r3.ebuild 1757
+RMD160 9579c3812dd6e80fb8002df648a1323aaacac59a nvi-1.81.5-r3.ebuild 1757
+SHA256 69167e99e808eabccd358cb4695214a9a5076f718ad374dc7d6400f058b07ae7 nvi-1.81.5-r3.ebuild 1757
 EBUILD nvi-1.81.5.ebuild 740 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 SHA1 61b1f847cccadf7b79e09926e078a5701c93079b SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd
 MD5 097be8de63d6000e28275ce4ca15e3b5 nvi-1.81.5.ebuild 740
 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 nvi-1.81.5.ebuild 740
 SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd nvi-1.81.5.ebuild 740
-MISC ChangeLog 4090 RMD160 93e1175ea478530858961001426564739608df3f SHA1 60f6016e38b08e035c0f2912e4bb1a3d5c4efa86 SHA256 501d55325a2b34952323ca8ecd4e2083ff71a790600499ec03ada39d8b0e38f1
-MD5 f8a6a889ebf179c2b61b59301f2645eb ChangeLog 4090
-RMD160 93e1175ea478530858961001426564739608df3f ChangeLog 4090
-SHA256 501d55325a2b34952323ca8ecd4e2083ff71a790600499ec03ada39d8b0e38f1 ChangeLog 4090
+MISC ChangeLog 4240 RMD160 d5fa027844ce56b42892c6b52872136a3b40c709 SHA1 b0e78731f5840011d51d8a38f1284b946756669b SHA256 f15e1a7234995980e6bd049428ff5e8ac3a0d24acabc8016f7ac71097bdd22e2
+MD5 00a8a5ff437dfa47e12386e2779d5171 ChangeLog 4240
+RMD160 d5fa027844ce56b42892c6b52872136a3b40c709 ChangeLog 4240
+SHA256 f15e1a7234995980e6bd049428ff5e8ac3a0d24acabc8016f7ac71097bdd22e2 ChangeLog 4240
 MISC metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 SHA1 e73c39033b0ba91260f9204c2e1671d241ade7f2 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79
 MD5 d2f99257546fd32545332a3cce582cd9 metadata.xml 229
 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 metadata.xml 229
@@ -76,9 +76,9 @@ MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r3 235
 RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r3 235
 SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r3 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFExInjwnQyISwouHwRArosAJwLj2W7cjh3Qx8wBHfPuCnW7FyIGACfVVb9
-kT7IhVITsgt7ZGe8RrL4Pyk=
-=lqOc
+iD8DBQFFDS0UwnQyISwouHwRAoONAJwPvNFV2j1FUDoS97EtvPL5XCABMwCgmd0I
+7OBLAwt3vg2v2HLhj5yVgOk=
+=XWnq
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nvi/files/nvi-1.81.5-db4.patch b/app-editors/nvi/files/nvi-1.81.5-db4.patch
index 38248b6eed39..d6191cb501f2 100644
--- a/app-editors/nvi/files/nvi-1.81.5-db4.patch
+++ b/app-editors/nvi/files/nvi-1.81.5-db4.patch
@@ -1,3 +1,137 @@
+--- nvi-1.81.5/dist/configure.in
++++ nvi-1.81.5/dist/configure.in
+@@ -922,11 +922,14 @@
+ 	CFLAGS="-I$with_db3/include $CFLAGS"
+ fi;
+ 
++saveLIBS="$LIBS"
++LIBS="$LIBS -ldb"
+-AC_CHECK_LIB(db, db_create,
++AC_TRY_LINK([#include <db.h>], [db_create(0, 0, 0)],
+ 	[vi_cv_dbfatal="no"], [vi_cv_dbfatal="yes"])
+ if test "$vi_cv_dbfatal" = "yes"; then
+-	AC_MSG_ERROR([Need DB 3.])
++	AC_MSG_ERROR([Need DB 4.])
+ fi
++LIBS="$saveLIBS"
+ 
+ LDFLAGS="$saveLDFLAGS"
+ 
+--- nvi-1.81.5/dist/configure
++++ nvi-1.81.5/dist/configure
+@@ -10679,56 +10679,36 @@
+ 	CFLAGS="-I$with_db3/include $CFLAGS"
+ fi;
+ 
+-echo $ac_n "checking for db_create in -ldb""... $ac_c" 1>&6
+-echo "configure:10684: checking for db_create in -ldb" >&5
+-ac_lib_var=`echo db'_'db_create | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-ldb  $LIBS"
++saveLIBS="$LIBS"
++LIBS="$LIBS -ldb"
+ cat > conftest.$ac_ext <<EOF
+-#line 10692 "configure"
++#line 10686 "configure"
+ #include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char db_create();
+-
++#include <db.h>
+ int main() {
+-db_create()
++db_create(0, 0, 0)
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
++  vi_cv_dbfatal="no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
++  vi_cv_dbfatal="yes"
+ fi
+ rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  vi_cv_dbfatal="no"
+-else
+-  echo "$ac_t""no" 1>&6
+-vi_cv_dbfatal="yes"
+-fi
+-
+ if test "$vi_cv_dbfatal" = "yes"; then
+-	{ echo "configure: error: Need DB 3." 1>&2; exit 1; }
++	{ echo "configure: error: Need DB 4." 1>&2; exit 1; }
+ fi
++LIBS="$saveLIBS"
+ 
+ LDFLAGS="$saveLDFLAGS"
+ 
+ 
+ echo $ac_n "checking if --enable-dynamic-loading option specified""... $ac_c" 1>&6
+-echo "configure:10732: checking if --enable-dynamic-loading option specified" >&5
++echo "configure:10712: checking if --enable-dynamic-loading option specified" >&5
+ # Check whether --enable-dynamic-loading or --disable-dynamic-loading was given.
+ if test "${enable_dynamic_loading+set}" = set; then
+   enableval="$enable_dynamic_loading"
+@@ -10740,7 +10720,7 @@
+ echo "$ac_t""$vi_cv_dl" 1>&6
+ if test "$vi_cv_dl" = yes; then
+ 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:10744: checking for dlopen in -ldl" >&5
++echo "configure:10724: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -10748,7 +10728,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10752 "configure"
++#line 10732 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -10759,7 +10739,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -10789,7 +10769,7 @@
+ 	# Extract the first word of "libdb-3.so", so it can be a program name with args.
+ set dummy libdb-3.so; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:10793: checking for $ac_word" >&5
++echo "configure:10773: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_db3'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10843,7 +10823,7 @@
+ 
+ 
+ echo $ac_n "checking if --disable-re option specified""... $ac_c" 1>&6
+-echo "configure:10847: checking if --disable-re option specified" >&5
++echo "configure:10827: checking if --disable-re option specified" >&5
+ # Check whether --enable-re or --disable-re was given.
+ if test "${enable_re+set}" = set; then
+   enableval="$enable_re"
 --- nvi-1.81.5/common/exf.c
 +++ nvi-1.81.5/common/exf.c
 @@ -282,7 +282,7 @@
diff --git a/app-editors/nvi/nvi-1.81.5-r3.ebuild b/app-editors/nvi/nvi-1.81.5-r3.ebuild
index ab2c3f11f2e0..5fa5f262a8fd 100644
--- a/app-editors/nvi/nvi-1.81.5-r3.ebuild
+++ b/app-editors/nvi/nvi-1.81.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r3.ebuild,v 1.1 2006/07/24 08:47:27 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r3.ebuild,v 1.2 2006/09/17 11:09:37 truedfx Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-tcsetattr.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${P}-db4.patch
+	touch "${S}"/dist/{configure,aclocal.m4,Makefile.in,stamp-h.in}
 }
 
 src_compile() {