summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-05-09 18:15:16 +0000
committerHans de Graaff <graaff@gentoo.org>2011-05-09 18:15:16 +0000
commitf744a6e6cadca104c5718c2bb8ceeb7cbddeee2e (patch)
tree2e0b2ca4453fe7cec323c68111b3faf26c6e0ecf /app-editors
parentShining up checking of CIFS kernel parameter, thanks to Jeremy Olexa <darksid... (diff)
downloadhistorical-f744a6e6cadca104c5718c2bb8ceeb7cbddeee2e.tar.gz
historical-f744a6e6cadca104c5718c2bb8ceeb7cbddeee2e.tar.bz2
historical-f744a6e6cadca104c5718c2bb8ceeb7cbddeee2e.zip
Tweak sys-libs/db requirements to avoid incompatible versions. Should fix bug 365831.
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/xemacs/ChangeLog6
-rw-r--r--app-editors/xemacs/Manifest10
-rw-r--r--app-editors/xemacs/xemacs-21.5.31.ebuild4
3 files changed, 12 insertions, 8 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index a96a8522109f..b73f75709622 100644
--- 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.145 2011/04/30 08:12:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.146 2011/05/09 18:15:16 graaff Exp $
+
+ 09 May 2011; Hans de Graaff <graaff@gentoo.org> xemacs-21.5.31.ebuild:
+ Tweak sys-libs/db requirements to avoid incompatible versions. Should fix bug
+ 365831.
30 Apr 2011; Hans de Graaff <graaff@gentoo.org> xemacs-21.5.31.ebuild:
Fix USE=debug for changed configure options.
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index f649cebf298b..c10274995f31 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -20,13 +20,13 @@ EBUILD xemacs-21.4.22-r1.ebuild 6580 RMD160 15346e733445c92fd5fee6905aaacbf5989e
EBUILD xemacs-21.4.22-r2.ebuild 6713 RMD160 33c045f05568d54fd9d4a61c02e9926a77ea6c79 SHA1 3db56a012c9a592811b219a7766f7b844c2bf040 SHA256 3d73184fadd999071bbdb1c08d7e4b7a22cbd8661c757073109c0fe037301daa
EBUILD xemacs-21.5.29-r2.ebuild 7070 RMD160 1b2df3401a94b3e8b58344d0995d976b785b5b35 SHA1 859185214924b587b88bc23d91787669848420b6 SHA256 846a6f733db597d85f5f88f7bc1ac7c2af607c7533a284d19c0e3f53ff1fa32a
EBUILD xemacs-21.5.30.ebuild 6896 RMD160 f7629a51ab84c8f68022d63e30a2142697ebd2fc SHA1 d5fd77c46ff92be063b97fca7bc9a7452cb2fc7e SHA256 535e811f7780eb31731932d95138882c9509b7ef4a1755a097f17bd05ecb1b94
-EBUILD xemacs-21.5.31.ebuild 6780 RMD160 cc3ef41c78b6ec14c5d672287952c0073ef466b2 SHA1 1ecebf2a1c4a0bb9fae3e633858ef145fb464e50 SHA256 d46fe599784096dbd740af3e4d2bc3da82e2a27d3f767ce1089376ac1e70f119
-MISC ChangeLog 25155 RMD160 67a12da3188a4480c9a0073683d15060a300a3e1 SHA1 d784e61bb600b6c8de87356c47af87fbf880a447 SHA256 d890747969a63ba94988208a6b25f136db98c70ab8567b03b4f94474ed4074e7
+EBUILD xemacs-21.5.31.ebuild 6800 RMD160 1fae5261803e1beb83dc1c342000504dbf079dbd SHA1 181dbc97acc7ed525a29179ad5bd2450bcc746ca SHA256 b68e7c0c78d5991ac34e8dd43c69fa3b23afb2d3287a31ea0ce5e83f6671147c
+MISC ChangeLog 25319 RMD160 bde9af59674cb60bfe509fe55983d5cd753e396a SHA1 cc58e0dda0dba3c8bbef4d8ed599f0a8008d6166 SHA256 df471d32ee8149b84680f4e3dd72f0997d683c94b1a6a94059d0053eeca52c82
MISC metadata.xml 711 RMD160 fc8a32ef389e34f90c14f2c26d75ac3cdc7e28a0 SHA1 b56f6ef2c44d658e3505f97c1686e52a40e4ee00 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk27xGAACgkQrnu0mw69JkpppAEAhlpj46bVA2N+KF6gGlc1LFeC
-zIuZBUCFszd7aLUtIv8A/33cEfNddDacDaS9dRUcQO3jMFUMusicE87oJvY967h5
-=ltSg
+iF4EAREIAAYFAk3ILz8ACgkQrnu0mw69JkoZlQEAjPBM5hgqSnp3f6K+THQchyZN
+sobhRcj5+z2xg7pPOR4A/0Ngz/ui/c4sAV09UmHfNaNSpUM7jnvIZb2Zsc65Mxk4
+=4az1
-----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild b/app-editors/xemacs/xemacs-21.5.31.ebuild
index 12c29432291d..fce9c92086fd 100644
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.31.ebuild
@@ -1,6 +1,6 @@
# 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.2 2011/04/30 08:12:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.3 2011/05/09 18:15:16 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
@@ -24,7 +24,7 @@ IUSE="alsa debug eolconv esd gif gpm pop postgres ldap xface nas dnd X jpeg tiff
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
RDEPEND="
- berkdb? ( sys-libs/db )
+ berkdb? ( >=sys-libs/db-4 !<sys-libs/db-4 )
gdbm? ( >=sys-libs/gdbm-1.8.3 )
>=sys-libs/zlib-1.1.4
>=dev-libs/openssl-0.9.6