diff options
| -rw-r--r-- | sys-libs/gdbm/ChangeLog | 12 | ||||
| -rw-r--r-- | sys-libs/gdbm/files/digest-gdbm-1.8.3-r3 (renamed from sys-libs/gdbm/files/digest-gdbm-1.8.3-r2) | 0 | ||||
| -rw-r--r-- | sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch | 15 | ||||
| -rw-r--r-- | sys-libs/gdbm/gdbm-1.8.3-r3.ebuild (renamed from sys-libs/gdbm/gdbm-1.8.3-r2.ebuild) | 20 |
4 files changed, 32 insertions, 15 deletions
diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog index 14afbf292694..25d6329c47d6 100644 --- a/sys-libs/gdbm/ChangeLog +++ b/sys-libs/gdbm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-libs/gdbm -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.39 2006/10/17 08:29:30 uberlord Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.40 2007/02/04 23:10:12 vapier Exp $ + +*gdbm-1.8.3-r3 (04 Feb 2007) + + 04 Feb 2007; Mike Frysinger <vapier@gentoo.org> + +files/gdbm-1.8.3-compat-linking.patch, -gdbm-1.8.3-r2.ebuild, + +gdbm-1.8.3-r3.ebuild: + Cleanup ebuild and link the compat module against gdbm #165263 by Gergan + Penkov. 17 Oct 2006; Roy Marples <uberlord@gentoo.org> gdbm-1.8.3-r2.ebuild: Added ~sparc-fbsd keyword. diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r2 b/sys-libs/gdbm/files/digest-gdbm-1.8.3-r3 index 440f9dd971ae..440f9dd971ae 100644 --- a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r2 +++ b/sys-libs/gdbm/files/digest-gdbm-1.8.3-r3 diff --git a/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch new file mode 100644 index 000000000000..6a77e3f64fbd --- /dev/null +++ b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch @@ -0,0 +1,15 @@ +Taken from Debian + +http://bugs.gentoo.org/165263 + +--- gdbm-1.8.3/Makefile.in ++++ gdbm-1.8.3/Makefile.in +@@ -161,7 +161,7 @@ + libgdbm_compat.la: $(C_LOBJS) gdbm.h + rm -f libgdbm_compat.la + $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ +- -version-info $(SHLIB_VER) $(C_LOBJS) ++ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm + + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 + rm -f gdbm.h diff --git a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild index f923326cf80d..a41cbe763f1f 100644 --- a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild +++ b/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild,v 1.6 2006/10/17 08:29:30 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild,v 1.1 2007/02/04 23:10:12 vapier Exp $ inherit eutils libtool multilib -DESCRIPTION="Standard GNU database libraries included for compatibility with Perl" +DESCRIPTION="Standard GNU database libraries" HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html" SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" @@ -19,6 +19,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-fix-install-ownership.patch #24178 + epatch "${FILESDIR}"/${P}-compat-linking.patch #165263 elibtoolize } @@ -29,22 +30,15 @@ src_compile() { } src_install() { - make INSTALL_ROOT="${D}" install install-compat || die + emake INSTALL_ROOT="${D}" install install-compat || die mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die dodoc ChangeLog NEWS README } pkg_preinst() { - # temp backwards support #32510 - if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then - touch "${ROOT}"/usr/$(get_libdir)/libgdbm.so.2 - fi + preserve_old_lib libgdbm.so.2 #32510 } pkg_postinst() { - if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then - ewarn "Please run revdep-rebuild --library libgdbm.so.2" - ewarn "After that completes, it will be safe to remove the old" - ewarn "library (${ROOT}usr/$(get_libdir)/libgdbm.so.2)." - fi + preserve_old_lib_notify libgdbm.so.2 #32510 } |