Add patch from upstream so gdbm_compat links against gdbm #383743 by Alexandre Rostovtsev.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

4 files changed, 108 insertions, 5 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 8582a0b7b232..b16554f7593c 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/gdbm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.54 2011/09/19 04:28:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.55 2011/09/20 04:16:42 vapier Exp $
+
+*gdbm-1.9.1-r1 (20 Sep 2011)
+
+  20 Sep 2011; Mike Frysinger <vapier@gentoo.org> +gdbm-1.9.1-r1.ebuild,
+  +files/gdbm-1.9.1-compat-link.patch:
+  Add patch from upstream so gdbm_compat links against gdbm #383743 by
+  Alexandre Rostovtsev.
 
 *gdbm-1.9.1 (19 Sep 2011)
 
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index ad5055f02b20..7229b154847e 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -4,17 +4,19 @@ Hash: SHA256
 AUX gdbm-1.8.3-build.patch 691 RMD160 dc3263c4d96121298353d5957dc71e351bb0e124 SHA1 ef3635a5f9b05fe32ad7e8b61308a60a350d1fd0 SHA256 be5b2a90e85bdfd1c2e24937510f303ed06def19ba074be502a9edc9c3eff4ca
 AUX gdbm-1.8.3-compat-linking.patch 611 RMD160 f144f776f38acb1ea046009b2de0376b5149edb9 SHA1 b8fa52996a9eb24b818b427b5137397b091dcc07 SHA256 832cfffff5d1cb26cf3f2618014e8e1ff4d30153f34abda8db074788abef7dac
 AUX gdbm-1.8.3-fix-install-ownership.patch 1567 RMD160 e058ffe36f57dd421ac70bdbb4ed64cd1e641aa6 SHA1 efdbd776a434ccfd885e2f505e8cb2f8e54f5887 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c
+AUX gdbm-1.9.1-compat-link.patch 915 RMD160 7b04a89018bcf6084ea44b68f23c9e6c0cb08adf SHA1 1d33566daa07658f4b5158d8efba6878d0752259 SHA256 a730f1f17713d1716cd68c20efd2d704b175348213ee322a45e5aab9873e0779
 DIST gdbm-1.8.3.tar.gz 228695 RMD160 0f5741ab32f95db721c5d9f4548447301171e938 SHA1 a0296b1986a99cb9ec0dc3b17ea99aec76e9b760 SHA256 cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
 DIST gdbm-1.9.1.tar.gz 554843 RMD160 512ad1b5c3a3fb7b17094d627b9d6da8215532f2 SHA1 0742a9ed8fc93fb5d5d3984d2acf99821134e2e9 SHA256 6025852637772b0699f2294b5f14fd4a084bca3c8161d29d64d1f30d6d1a9aed
 EBUILD gdbm-1.8.3-r3.ebuild 1171 RMD160 79d544a5fa2691b944cebdad4d65bcc9f471bddf SHA1 d41239ddc97d54a7161813b212c60be33faa2687 SHA256 c9c4fb7821237ae2f6d9a45ebae1b07dd1864cbe8d8077f7690e9c5a5bb19ab0
 EBUILD gdbm-1.8.3-r4.ebuild 1969 RMD160 7a239e0117be74edf3424be094228185f0e62246 SHA1 a41baf9b5c632f8cecea54b07f9a4bbea5b3aff2 SHA256 6a6b0dd702118bd9eb23074aa605f3e5a618a422570bde2d40bf1b6c37c66986
+EBUILD gdbm-1.9.1-r1.ebuild 1726 RMD160 d6a56a7adcbd2803d46bee3553f19444fb4692d1 SHA1 6d9821e8219d2965aeff865821d956280fa0d0ce SHA256 836357727f3c4a9f02ceb65f5cd51ce277247c6fcfc76dcd05acada4c3adc9d1
 EBUILD gdbm-1.9.1.ebuild 1670 RMD160 9329e556449f56b0a28577bf9d58d816c5cb0298 SHA1 3b9f24450261558ada6f8adff9d055d0d3774ea4 SHA256 3cf0223ce4f97366fd7f8a76b13aba97ec60cd2581f35487173f059f8abbfdb6
-MISC ChangeLog 7087 RMD160 84774862ec77f285242de7b0831d22f29848a480 SHA1 d3760c15d5df449f7f7455adb81c3367c2683f3f SHA256 3cd8976272c9ed1e6662faeb9793125bd2ceada82e474ccbe161c88ec3306d0b
+MISC ChangeLog 7325 RMD160 a80565838d76c10206f79552444dbffe1332df59 SHA1 8c359e156ee5c8a0c617d2d59584426aef20dd91 SHA256 10c4783d090baabc9a81a6c814aca23d8867cb58da39cd701dc3f83560783d3e
 MISC metadata.xml 344 RMD160 8e398bea8e7123574e065df595904a4f68bc4beb SHA1 c90c3c7b781f3601dfb78430fdce5aa254475d87 SHA256 f8af8e7dd65943e64ef56c78c2afdc16ec7086590e859156aef6af473a94e7de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk52xN4ACgkQaC/OocHi7JaUoAD/avsdYN2Z7d7FfaQV8DHDmEfC
-kxMljr8f9It3qp9aS6AA/R8KdTkJAB9EAtw/XKz7MDpKxF6JBmfloreTq3qHjO5H
-=kA1B
+iF4EAREIAAYFAk54E7IACgkQaC/OocHi7Jb/cgD+KmYK0Oo5oDTBTtV2dT6I5NEf
+sRURf9OXMxrGEjnLNhoA/2h+zjEhw4W4wVOGrQVze/j5X3iw1nCUnheSQ87onV/a
+=uYSt
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/files/gdbm-1.9.1-compat-link.patch b/sys-libs/gdbm/files/gdbm-1.9.1-compat-link.patch
new file mode 100644
index 000000000000..bc445294eb3a
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.9.1-compat-link.patch
@@ -0,0 +1,24 @@
+fix from upstream
+https://bugs.gentoo.org/383743
+
+From ae9ea0011da4ba01e5639611d61c442af8d42817 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Sun, 14 Aug 2011 20:17:54 +0000
+Subject: * compat/Makefile.am (libgdbm_compat_la_LIBADD): Link against libgdbm.
+
+2011-08-14  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* compat/Makefile.am (libgdbm_compat_la_LIBADD): Link against
+	libgdbm. Suggested by Adam Sampson.
+
+--- a/compat/Makefile.in
++++ b/compat/Makefile.in
+@@ -23,7 +23,7 @@
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libgdbm_compat_la_LIBADD =
++libgdbm_compat_la_LIBADD = ../src/libgdbm.la
+ am__objects_1 = dbminit.lo delete.lo fetch.lo store.lo seq.lo close.lo
+ am__objects_2 = dbmopen.lo dbmdelete.lo dbmerr.lo dbmfetch.lo \
+ 	dbmstore.lo dbmseq.lo dbmclose.lo dbmdirfno.lo dbmpagfno.lo \
diff --git a/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..8072b60d728e
--- /dev/null
+++ b/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild,v 1.1 2011/09/20 04:16:42 vapier Exp $
+
+EAPI="2"
+
+inherit eutils libtool flag-o-matic
+
+EX_P="${PN}-1.8.3"
+DESCRIPTION="Standard GNU database libraries"
+HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
+SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
+	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="berkdb compat exporter static-libs"
+
+DEPEND="berkdb? ( sys-libs/db )"
+RDEPEND="${DEPEND}"
+
+EX_S="${WORKDIR}"/${EX_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-compat-link.patch #383743
+	elibtoolize
+}
+
+src_configure() {
+	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
+
+	if use exporter ; then
+		pushd "${EX_S}" >/dev/null
+		append-lfs-flags
+		econf --disable-shared
+		popd >/dev/null
+	fi
+
+	econf \
+		--includedir=/usr/include/gdbm \
+		--with-gdbm183-libdir="${EX_S}/.libs" \
+		--with-gdbm183-includedir="${EX_S}" \
+		$(use_enable compat libgdbm-compat) \
+		$(use_enable exporter gdbm-export) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	if use exporter ; then
+		emake -C "${WORKDIR}"/${EX_P} libgdbm.la || die
+	fi
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	use static-libs || find "${D}" -name '*.la' -delete
+	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
+	dodoc ChangeLog NEWS README
+}
+
+pkg_preinst() {
+	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
+}