fix libgdbm.la with the proper libdir

8 files changed, 18 insertions, 229 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 477c8506c9f0..06dc0c59e09c 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gdbm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.1 2002/02/01 21:53:38 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.2 2002/04/06 20:23:30 woodchip Exp $
+
+*gdbm-1.8.0-r5 (6 Apr 2002)
+
+  6 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Fix libgdbm.la to have the correct libdir;  s:/usr/local/lib:/usr/lib:
 
 *gdbm-1.8.0-r4 (1 Feb 2002)
 
diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r2 b/sys-libs/gdbm/files/digest-gdbm-1.8.0-r2
deleted file mode 100644
index d7e8e257c06a..000000000000
--- a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd543862287f55ad66e62cc9d82cc906 gdbm-1.8.0.tar.gz 135168
diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r4 b/sys-libs/gdbm/files/digest-gdbm-1.8.0-r4
deleted file mode 100644
index 487a5b061df3..000000000000
--- a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd543862287f55ad66e62cc9d82cc906 gdbm-1.8.0.tar.gz 134080
diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r3 b/sys-libs/gdbm/files/digest-gdbm-1.8.0-r5
index 487a5b061df3..487a5b061df3 100644
--- a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r3
+++ b/sys-libs/gdbm/files/digest-gdbm-1.8.0-r5
diff --git a/sys-libs/gdbm/files/gdbm-1.8.0-r4-gentoo.diff b/sys-libs/gdbm/files/gdbm-1.8.0-r4-gentoo.diff
deleted file mode 100644
index c5bdc8a6045b..000000000000
--- a/sys-libs/gdbm/files/gdbm-1.8.0-r4-gentoo.diff
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -r -C2 -P gdbm-1.8.0.orig/gdbm.info gdbm-1.8.0/gdbm.info
-*** gdbm-1.8.0.orig/gdbm.info	Wed May 19 00:15:45 1999
---- gdbm-1.8.0/gdbm.info	Thu Jul 26 23:22:27 2001
-***************
-*** 1,4 ****
-! This is Info file gdbm.info, produced by Makeinfo version 1.68 from the
-! input file ./gdbm.texinfo.
-  
-     This file documents the GNU dbm utility.
---- 1,8 ----
-! This is gdbm.info, produced by makeinfo version 4.0 from gdbm.texinfo.
-! 
-! START-INFO-DIR-ENTRY
-! * gdbm: (gdbm).  library of functions implementing a hashed
-! 				 database on a disk file.
-! END-INFO-DIR-ENTRY
-  
-     This file documents the GNU dbm utility.
-***************
-*** 89,93 ****
-  
-     `gdbm' is currently distributed under the terms of the GNU General
-! Public License, Version 2.  (*NOT* under the GNU General Library Public
-  License.)  A copy the GNU General Public License is included with the
-  distribution of `gdbm'.
---- 93,97 ----
-  
-     `gdbm' is currently distributed under the terms of the GNU General
-! Public License, Version 2.  (_NOT_ under the GNU General Library Public
-  License.)  A copy the GNU General Public License is included with the
-  distribution of `gdbm'.
-***************
-*** 102,106 ****
-  extendible hashing and works similar to the standard UNIX `dbm'
-  functions.  These routines are provided to a programmer needing to
-! create and manipulate a hashed database. (`gdbm' is *NOT* a complete
-  database package for an end user.)
-  
---- 106,110 ----
-  extendible hashing and works similar to the standard UNIX `dbm'
-  functions.  These routines are provided to a programmer needing to
-! create and manipulate a hashed database. (`gdbm' is _NOT_ a complete
-  database package for an end user.)
-  
-***************
-*** 452,456 ****
-  
-     Unless your database was opened with the GDBM_SYNC flag, `gdbm' does
-! not wait for writes to the disk to complete before continuing.  This
-  allows faster writing of databases at the risk of having a corrupted
-  database if the application terminates in an abnormal fashion.  The
---- 456,460 ----
-  
-     Unless your database was opened with the GDBM_SYNC flag, `gdbm' does
-! not wait for writes to be flushed to the disk before continuing.  This
-  allows faster writing of databases at the risk of having a corrupted
-  database if the application terminates in an abnormal fashion.  The
-***************
-*** 522,527 ****
-     GDBM_FASTMODE - Set fast mode to either on or off.  This allows
-  fast mode to be toggled on an already open and active database.
-! value (see below) should be set to either TRUE or FALSE.    *This
-! option is now obsolete.*
-  
-     GDBM_SYNCMODE - Turn on or off file system synchronization
---- 526,531 ----
-     GDBM_FASTMODE - Set fast mode to either on or off.  This allows
-  fast mode to be toggled on an already open and active database.
-! value (see below) should be set to either TRUE or FALSE.    _This
-! option is now obsolete._
-  
-     GDBM_SYNCMODE - Turn on or off file system synchronization
-***************
-*** 532,538 ****
-  The default is off, which is how previous versions of `Gdbm'   handled
-  free blocks.  If set, this option causes all subsequent free   blocks
-! to be placed in the *global* pool, allowing (in theory)   more file
-  space to be reused more quickly.  value (see below) should   be set to
-! either TRUE or FALSE.    *NOTICE: This feature is still under study.*
-  
-     GDBM_COALESCEBLKS - Set free block merging to either on or off.
---- 536,542 ----
-  The default is off, which is how previous versions of `Gdbm'   handled
-  free blocks.  If set, this option causes all subsequent free   blocks
-! to be placed in the _global_ pool, allowing (in theory)   more file
-  space to be reused more quickly.  value (see below) should   be set to
-! either TRUE or FALSE.    _NOTICE: This feature is still under study._
-  
-     GDBM_COALESCEBLKS - Set free block merging to either on or off.
-***************
-*** 541,546 ****
-  merged.  This can become a CPU expensive process with time, though,
-  especially if used in conjunction with GDBM_CENTFREE.  value (see below)
-!  should be set to either TRUE or FALSE.    *NOTICE: This feature is
-! still under study.*
-  
-     The return value will be -1 upon failure, or 0 upon success.  The
---- 545,550 ----
-  merged.  This can become a CPU expensive process with time, though,
-  especially if used in conjunction with GDBM_CENTFREE.  value (see below)
-!  should be set to either TRUE or FALSE.    _NOTICE: This feature is
-! still under study._
-  
-     The return value will be -1 upon failure, or 0 upon success.  The
-***************
-*** 574,577 ****
---- 578,583 ----
-       The pointer returned by `gdbm_open'.
-  
-+    The return value will be the file descriptor of the database.
-+ 
-  
-  File: gdbm.info,  Node: Variables,  Next: Compatibility,  Prev: Locking,  Up: Top
-***************
-*** 586,590 ****
-       (`gdbm.h' has the definitions of the error values).
-  
-! const char * gdbm_version
-       The string containing the version information.
-  
---- 592,596 ----
-       (`gdbm.h' has the definitions of the error values).
-  
-! char * gdbm_version
-       The string containing the version information.
-  
-***************
-*** 727,749 ****
-  
-  Tag Table:
-! Node: Top775
-! Node: Copying2247
-! Node: Intro4029
-! Node: List5445
-! Node: Open6397
-! Node: Close9268
-! Node: Store9703
-! Node: Fetch11498
-! Node: Delete12747
-! Node: Sequential13413
-! Node: Reorganization15096
-! Node: Sync16051
-! Node: Errors17015
-! Node: Options17375
-! Node: Locking19724
-! Node: Variables20246
-! Node: Compatibility20676
-! Node: Conversion23050
-! Node: Bugs23864
-  
-  End Tag Table
---- 733,755 ----
-  
-  Tag Table:
-! Node: Top878
-! Node: Copying2350
-! Node: Intro4132
-! Node: List5548
-! Node: Open6500
-! Node: Close9371
-! Node: Store9806
-! Node: Fetch11601
-! Node: Delete12850
-! Node: Sequential13516
-! Node: Reorganization15199
-! Node: Sync16154
-! Node: Errors17120
-! Node: Options17480
-! Node: Locking19829
-! Node: Variables20417
-! Node: Compatibility20841
-! Node: Conversion23215
-! Node: Bugs24029
-  
-  End Tag Table
diff --git a/sys-libs/gdbm/files/gdbm-1.8.0-r3-gentoo.diff b/sys-libs/gdbm/files/gdbm-1.8.0-r5-gentoo.diff
index c5bdc8a6045b..c5bdc8a6045b 100644
--- a/sys-libs/gdbm/files/gdbm-1.8.0-r3-gentoo.diff
+++ b/sys-libs/gdbm/files/gdbm-1.8.0-r5-gentoo.diff
diff --git a/sys-libs/gdbm/gdbm-1.8.0-r3.ebuild b/sys-libs/gdbm/gdbm-1.8.0-r3.ebuild
deleted file mode 100644
index 89a728c9427e..000000000000
--- a/sys-libs/gdbm/gdbm-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-#        Chad Huneycutt <chad.huneycutt@acm.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r3.ebuild,v 1.4 2001/11/24 18:40:50 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gdbm/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
-
-DEPEND="virtual/glibc
-        berkdb? ( =sys-libs/db-1.85-r1 )"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-
-    try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-    try make CFLAGS="${CFLAGS} -fomit-frame-pointer" ${MAKEOPTS}
-}
-
-src_install() {
-
-    try make prefix=${D}/usr man3dir=${D}/usr/share/man/man3 \
-	    infodir=${D}/usr/share/info install
-	
-    dodoc COPYING ChangeLog NEWS README
-
-}
diff --git a/sys-libs/gdbm/gdbm-1.8.0-r4.ebuild b/sys-libs/gdbm/gdbm-1.8.0-r5.ebuild
index 5b453868b92c..862999fe53a2 100644
--- a/sys-libs/gdbm/gdbm-1.8.0-r4.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.0-r5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
 #        Chad Huneycutt <chad.huneycutt@acm.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r4.ebuild,v 1.1 2002/01/14 17:51:14 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r5.ebuild,v 1.1 2002/04/06 20:23:30 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
@@ -11,39 +11,36 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/gdbm/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
 
 DEPEND="virtual/glibc
-        berkdb? ( =sys-libs/db-1.85-r1 )"
+	berkdb? ( =sys-libs/db-1.85-r1 )"
 
 RDEPEND="virtual/glibc"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${WORKDIR}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-	
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {
-
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info || die
-	emake CFLAGS="${CFLAGS} -fomit-frame-pointer" ${MAKEOPTS} || die
-	
+
+	emake CFLAGS="${CFLAGS} -fomit-frame-pointer" || die
 }
 
 src_install() {
-
-    make prefix=${D}/usr \
+	make prefix=${D}/usr \
 		man3dir=${D}/usr/share/man/man3 \
-	    infodir=${D}/usr/share/info \
+		infodir=${D}/usr/share/info \
 		install || die
 
-    make includedir=${D}/usr/include/gdbm \
+	make includedir=${D}/usr/include/gdbm \
 		install-compat || die
-	
-    dodoc COPYING ChangeLog NEWS README
 
+	dosed "s:/usr/local/lib':/usr/lib':g" /usr/lib/libgdbm.la
+
+	dodoc COPYING ChangeLog NEWS README
 }