Make sure berkdb support is turned on for newer versions of gdbm. Fixes bug 383587...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index b519bcb5ee3002f5ee3e7b32e8243947d1cc4faf..023104add10c3008c1114b3da0beac530317f788 100644 (file)
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.152 2011/10/09 13:54:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.153 2011/10/10 19:11:29 graaff Exp $
+
+  10 Oct 2011; Hans de Graaff <graaff@gentoo.org> xemacs-21.5.31.ebuild:
+  Make sure berkdb support is turned on for newer versions of gdbm. Fixes bug
+  383587, thanks to Martin von Gagern for diagnosing the issue.
 
   09 Oct 2011; Markos Chandras <hwoarang@gentoo.org> xemacs-21.4.22-r2.ebuild:
   Stable on amd64 wrt bug #385207

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index d2666d4d561c3fa7648c79c83e301fec9ce65d95..ce3d59ca710a1f8fc14396f35e80a1bb185d424a 100644 (file)
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92
 AUX xemacs-21.4.19-db.patch 3157 RMD160 354d4b70dce5313ecd8732336b2562f66153c351 SHA1 f83a0870a07a10ec5f177c0e0292607463ff095a SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022
@@ -21,23 +21,13 @@ EBUILD xemacs-21.4.22-r1.ebuild 6585 RMD160 b8a446c2ca25dbc81f1d4603b36db9101a11
 EBUILD xemacs-21.4.22-r2.ebuild 6849 RMD160 264f1c78c89388178a3e740865eaaf6bc70b0b41 SHA1 3021db72658286e0db2cd9f4603b3f9f7ec50608 SHA256 6608982f4d9e619e7be4d72b396022741fd5afc690521732835617d2151bb213
 EBUILD xemacs-21.5.29-r2.ebuild 7075 RMD160 07dddc9e10b3f07b1aa433e98ae0164914efb0f9 SHA1 b11e1d4cbc1c807d5fdf47a56cd2759dd953335f SHA256 77ede56e5b56eeced999ba5d62f5f60c7709cf55d3b1c5427e2735936e4322f9
 EBUILD xemacs-21.5.30.ebuild 6901 RMD160 da6c96e45195221a05ac54a75dfefd4f943cf036 SHA1 0bd73250dad141d7cc54ac48be9ca45a1c4a9cea SHA256 557f2fcfb1720ca1da0d57c9480313f6062590e339f4596e0b9efe6754a4e34b
-EBUILD xemacs-21.5.31.ebuild 6806 RMD160 1dcc83a8c5e1ff99e3ddb103daf318234973ab0b SHA1 9f0240a512ccc66d011f1e6d43659ca0b806d910 SHA256 a03ed69371291c131991fff9160ae754f895f7d45c322b3c0e5a1eb8d6fb6eb8
-MISC ChangeLog 26301 RMD160 70ac1190535c2797ef55a4701a76753c994b28dc SHA1 93ec969920261116d4e9de19e80e3db390490c79 SHA256 73353f8339827c9d6a52f7c717026b72e71dbab7823ee155d3013255f468a7c3
+EBUILD xemacs-21.5.31.ebuild 6813 RMD160 cd542be0210699edb969e71619afb166169d385a SHA1 23beed0dc05fdf9e819ad09cb4a9c17a5ba54868 SHA256 3203e40b3c73a918aafd8fd54b28ca629a0e71d43453a0a2c1bad3d1cb700488
+MISC ChangeLog 26515 RMD160 23f485fb75162010f51f59bf0b87f273fcc4fa98 SHA1 6597798ae6ebc64bdc2bcc5842aec9d3fec74832 SHA256 ab3486714aa6ffcbacdf36188e0a6fdfc4606ea49b97c55d52b034cec50da174
 MISC metadata.xml 711 RMD160 fc8a32ef389e34f90c14f2c26d75ac3cdc7e28a0 SHA1 b56f6ef2c44d658e3505f97c1686e52a40e4ee00 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOkaewAAoJEPqDWhW0r/LC0HEP/3ZKfGKUesB8AjxgmjsUUeEp
-65u9RYc7skKlQTD7temxPEBo7mSwle/vxV0uK01CfN2wH+t5Y4z6bedx7C4FzUoo
-Mxhuqmasawj2U18xqjeg/5QFSF/cZu2O8LAXpWzzxui9BaGaZG9ADbDKB+/jXftG
-5lELGre9fe/JDI60hq4IRYIP+YO1S0hD2xWJWPdb08EY/YerBC2RWOZHqETu7hnl
-WuL+UZJP3+vorpwZGDUbgHI3tfKogTdG2Z3jq3ijz+E9Bsr1hTuAeyy07gqV7TNb
-LBY5slYLjiTnrv5psFrEF9TgcpmfvWf894peYuSghovABQB6yYwzY8Ff3v/20dkt
-oTpW60syN+MSz3tRC7cx4KTw9jKxg7aQrRGV9ShV+wArTgHkUSEEYFr6klripTTn
-uB0XoEp1CIH9Usiw6f+F+cbZtWwcEEVIYfYlc78CnnBe7+LqlZYJInBZGt3n1Ldh
-NfLlpD3aMC46k/J/CBls8+IoWNsMZeof2rXGKSxrHPjFIozz5zzpWrhZs6u43KnW
-RVbZhPwxDwLayZXQNe88q/7VAF/xMmm3ng+vvXKeAL8w4Vtng0VP+DMkaClMtOtH
-Hrc2yuXtFKves9VV73supSGoqJ/L51Fe8rMWMkibKpJx3vXrrVc1SkUCnW9edbLP
-s/13RTS0bECZhWsCJeYb
-=XgkE
+iF4EAREIAAYFAk6TQ2YACgkQiIP6VqMIqNeJ3gD/QsTdRB+C/TsEoD4X1GGlTXHn
+Kptc/DloQUvfn6W0khQA/1tDMXTlMT3ZRqTqRabMY35TugPMfbqgol+id6b8MgH9
+=MGTG
 -----END PGP SIGNATURE-----

diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild b/app-editors/xemacs/xemacs-21.5.31.ebuild
index b2e97bdf415002837c29e623c6e3d6c3a28b46d0..3cc8c19d8c96e16375d1359e2c74cbaf60241c1a 100644 (file)
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.31.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.5 2011/08/02 05:43:01 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.6 2011/10/10 19:11:29 graaff Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
 # -nopie flag in CFLAGS or help fix bug #75028.
 
-EAPI="2"
+EAPI=4
 
 export WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib
@@ -25,7 +25,7 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
        berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3 )
+       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
        >=sys-libs/zlib-1.1.4
        >=dev-libs/openssl-0.9.6
        >=media-libs/audiofile-0.2.3