Marking gnome2 stable on amd64, added db4 fix for gnome-libs-1.4.2

4 files changed, 412 insertions, 7 deletions

diff --git a/gnome-base/gnome-libs/ChangeLog b/gnome-base/gnome-libs/ChangeLog
index cecd3d1f9872..261f07a2aa34 100644
--- a/gnome-base/gnome-libs/ChangeLog
+++ b/gnome-base/gnome-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-libs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.19 2003/07/12 17:17:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/ChangeLog,v 1.20 2003/07/19 23:22:43 tester Exp $
+
+  19 Jul 2003; Olivier Crete <tester@gentoo.org> gnome-libs-1.4.2.ebuild,
+  files/no-libdb-check.diff:
+  Added patch to removed libdb check, it was broken for db4
 
   08 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnome-libs-1.4.1.6.ebuild,
   gnome-libs-1.4.1.7.ebuild, gnome-libs-1.4.2.ebuild:
diff --git a/gnome-base/gnome-libs/Manifest b/gnome-base/gnome-libs/Manifest
index 7a7c8d27f795..99b47a225398 100644
--- a/gnome-base/gnome-libs/Manifest
+++ b/gnome-base/gnome-libs/Manifest
@@ -1,8 +1,9 @@
-MD5 4c9600585a245d98771685aa6c0047c0 ChangeLog 2379
 MD5 71f7c2223a2633a1dba49df54f1e6a34 gnome-libs-1.4.1.6.ebuild 1962
 MD5 3118464f36f5a5a8f66220477fe7d162 gnome-libs-1.4.1.7.ebuild 1608
-MD5 fa43360dbfc3f83b10dfeb89019418ce gnome-libs-1.4.2.ebuild 1808
+MD5 a03680ae9d9b0edca1b14c0e2e3ce301 ChangeLog 2542
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 963e9d039a7e61c8567b027e0c8f6fc4 gnome-libs-1.4.2.ebuild 1989
+MD5 275bc3267f2d6a2ba6f02b7db3cf28de files/no-libdb-check.diff 11481
+MD5 e0991b18209dfd87a7d6f2ed771dc00b files/digest-gnome-libs-1.4.2 70
 MD5 3a9b07232c2e27a44a8b3b3a83a9d696 files/digest-gnome-libs-1.4.1.6 72
 MD5 f699a38c77fa9c8d30de6e1c9d4ba7c0 files/digest-gnome-libs-1.4.1.7 72
-MD5 e0991b18209dfd87a7d6f2ed771dc00b files/digest-gnome-libs-1.4.2 70
diff --git a/gnome-base/gnome-libs/files/no-libdb-check.diff b/gnome-base/gnome-libs/files/no-libdb-check.diff
new file mode 100644
index 000000000000..9f442361248b
--- /dev/null
+++ b/gnome-base/gnome-libs/files/no-libdb-check.diff
@@ -0,0 +1,392 @@
+--- gnome-libs-1.4.2/configure.orig	2003-07-17 17:26:38.000000000 -0400
++++ gnome-libs-1.4.2/configure	2003-07-17 17:27:01.000000000 -0400
+@@ -11326,389 +11326,7 @@
+   prefer_db1=no
+ fi
+ 
+-DB_LIB=
+-echo $ac_n "checking for dbopen""... $ac_c" 1>&6
+-echo "configure:11332: checking for dbopen" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 11337 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dbopen(); below.  */
+-#include <assert.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 dbopen();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dbopen) || defined (__stub___dbopen)
+-choke me
+-#else
+-dbopen();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:11360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_dbopen=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_dbopen=no"
+-fi
+-rm -f conftest*
+-fi
+-
+-if eval "test \"`echo '$ac_cv_func_'dbopen`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  :
+-else
+-  echo "$ac_t""no" 1>&6
+-if test "$prefer_db1" = "yes"; then
+- echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6
+-echo "configure:11379: checking for dbopen in -ldb1" >&5
+-ac_lib_var=`echo db1'_'dbopen | 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="-ldb1  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11387 "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 dbopen();
+-
+-int main() {
+-dbopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11398: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb1"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:11417: checking for dbopen in -ldb" >&5
+-ac_lib_var=`echo db'_'dbopen | 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"
+-cat > conftest.$ac_ext <<EOF
+-#line 11425 "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 dbopen();
+-
+-int main() {
+-dbopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11436: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6
+-echo "configure:11455: checking for __db185_open in -ldb-3" >&5
+-ac_lib_var=`echo db-3'_'__db185_open | 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-3  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11463 "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 __db185_open();
+-
+-int main() {
+-__db185_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11474: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb-3"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for __db185_open in -ldb-4""... $ac_c" 1>&6
+-echo "configure:11493: checking for __db185_open in -ldb-4" >&5
+-ac_lib_var=`echo db-4'_'__db185_open | 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-4  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11501 "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 __db185_open();
+-
+-int main() {
+-__db185_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11512: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb-4"
+-else
+-  echo "$ac_t""no" 1>&6
+-{ echo "configure: error: Your db library is missing db 1.85 compatibility mode" 1>&2; exit 1; }
+-    
+-fi
+-
+-   
+-fi
+-
+-  
+-fi
+-
+- 
+-fi
+-
+-else
+- echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+-echo "configure:11545: checking for dbopen in -ldb" >&5
+-ac_lib_var=`echo db'_'dbopen | 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"
+-cat > conftest.$ac_ext <<EOF
+-#line 11553 "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 dbopen();
+-
+-int main() {
+-dbopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11564: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6
+-echo "configure:11583: checking for dbopen in -ldb1" >&5
+-ac_lib_var=`echo db1'_'dbopen | 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="-ldb1  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11591 "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 dbopen();
+-
+-int main() {
+-dbopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11602: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb1"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6
+-echo "configure:11621: checking for __db185_open in -ldb-3" >&5
+-ac_lib_var=`echo db-3'_'__db185_open | 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-3  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11629 "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 __db185_open();
+-
+-int main() {
+-__db185_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11640: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb-3"
+-else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for __db185_open in -ldb-4""... $ac_c" 1>&6
+-echo "configure:11659: checking for __db185_open in -ldb-4" >&5
+-ac_lib_var=`echo db-4'_'__db185_open | 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-4  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 11667 "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 __db185_open();
+-
+-int main() {
+-__db185_open()
+-; return 0; }
+-EOF
+-if { (eval echo configure:11678: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-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
+-  DB_LIB="-ldb-4"
+-else
+-  echo "$ac_t""no" 1>&6
+-{ echo "configure: error: Your db library is missing db 1.85 compatibility mode" 1>&2; exit 1; }
+-    
+-fi
+-
+-   
+-fi
+-
+-  
+-fi
+-
+- 
+-fi
+-
+-fi
+-
+-fi
+-
+ 
+ if test "$prefer_db1" = "yes"; then
+ 	for ac_hdr in db_185.h db1/db.h
diff --git a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
index 4aebf0d7bb67..f3ce0c21aafb 100644
--- a/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
+++ b/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.10 2003/07/12 17:17:22 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-libs/gnome-libs-1.4.2.ebuild,v 1.11 2003/07/19 23:22:43 tester Exp $
 
 IUSE="doc nls kde"
 
@@ -12,14 +12,14 @@ DESCRIPTION="GNOME Core Libraries"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.4/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha hppa"
+KEYWORDS="x86 alpha hppa amd64"
 #  ppc sparc sparc64"
 
 RDEPEND=">=media-libs/imlib-1.9.10
 		>=media-sound/esound-0.2.23
 		>=gnome-base/ORBit-0.5.12
 		=x11-libs/gtk+-1.2*
-		<sys-libs/db-2
+		amd64? sys-libs/db : <sys-libs/db-2 
 		doc? ( app-text/docbook-sgml 
 		       dev-util/gtk-doc )"
 
@@ -28,6 +28,14 @@ DEPEND="nls? ( >=sys-devel/gettext-0.10.40
 		${RDEPEND}"
 SLOT="1"
 
+src_unpack() {
+	unpack ${A}
+
+	# This patch isnt actually amd64 related at all and it a db4 issue
+	use amd64 && epatch ${FILESDIR}/no-libdb-check.diff
+
+}
+
 src_compile() {                           
 	CFLAGS="$CFLAGS -I/usr/include/db1"