mail-client/nmh: New Ebuild for bug 336057 (added gdbm use flag) thanks to hwoarang

svn path=/sunrise/; revision=11307

diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
index f937156b12ce155da3b32d38596d10b187a444ee..3b96f1b926ba29b7b1b91c70449f1847c4a453b2 100644 (file)
--- a/mail-client/nmh/ChangeLog
+++ b/mail-client/nmh/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Sep 2010; Seth Robertson (SethRobertson) <in-gentoo@baka.org>
+  nmh-1.3-r2.ebuild:
+  New Ebuild for bug 336057 (added gdbm use flag) thanks to hwoarang
+
   09 Sep 2010; Seth Robertson (SethRobertson) <in-gentoo@baka.org>
   +nmh-1.3-r2.ebuild, +files/nmh-1.3-db5.patch,
   +files/nmh-1.3-inc-login.patch, +files/nmh-1.3-install.patch,

diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index ff159a62f9c664f09be85022e45168769f0430c3..97db82dd7d18243a087773ad112f75bd5ef38a8e 100644 (file)
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -4,6 +4,6 @@ AUX nmh-1.3-install.patch 482 RMD160 db11b277c4c6e8ec124c94935405a035573eff76 SH
 AUX nmh-1.3-m_getfld.patch 624 RMD160 0723829e7a2138529f3e10df270c69e6f5ff6e80 SHA1 b84f27e4c7a84ce6260b0a8c857aff8997d6983d SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5
 AUX nmh-1.3-parallelmake.patch 3121 RMD160 d743b48cb2c5bf7d5da9b2141ef0c0fd17221d54 SHA1 16943bc94e83c290ae9e7b7d2b3078a96c840a1a SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c
 DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
-EBUILD nmh-1.3-r2.ebuild 1706 RMD160 8ec02cc8f44ec60b8069a939bf7745cddfc6dff9 SHA1 2262fa16bfceca645ea4559ae5a2c1ec93cd2ed0 SHA256 732b2bc1027ab87804d0fbfd84d8680524811d7889dd55f264b329e11954c07a
-MISC ChangeLog 454 RMD160 d2bbba8099f6cb9a8598061652acb4ebc432a702 SHA1 0c495e1fcef9326938b4604f0521e874026a7e20 SHA256 a0f65467df56fcc01a207dc4d4ebde80901973d12f81242be18b75cc990a0106
+EBUILD nmh-1.3-r2.ebuild 2064 RMD160 8502b74f34538fd92258d514ba87b2e863514ab3 SHA1 d1f5eab0a941a5fff78c04cb39ee23cd63fd17cc SHA256 20adf22630d9b779880498b0da89cc25f2ed85e39d8ae3a222ad5ce9c1e04148
+MISC ChangeLog 612 RMD160 47882ff3a576411b62915a5b79b411f4710c8371 SHA1 f8ae89368c57c88b0a1d96a14856927700d930bf SHA256 02d9cd433438dc32b09fd21779a5042e539f0aaaf3f0d3e0323380c945a4fefc
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/mail-client/nmh/nmh-1.3-r2.ebuild b/mail-client/nmh/nmh-1.3-r2.ebuild
index 2beef3d6993837db9ffcec42b2970fcdcd506825..a4cc42e6e2fcf1af9dd70f26925a731152dd141d 100644 (file)
--- a/mail-client/nmh/nmh-1.3-r2.ebuild
+++ b/mail-client/nmh/nmh-1.3-r2.ebuild
@@ -13,16 +13,16 @@ SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gdbm"
 
-DEPEND="|| ( sys-libs/gdbm =sys-libs/db-1.85* )
+DEPEND="gdbm? ( sys-libs/gdbm )
+       !gdbm? ( sys-libs/db )
        >=sys-libs/ncurses-5.2
        net-libs/liblockfile
        app-editors/gentoo-editor
        !!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
 RDEPEND="${DEPEND}"
 
-
 src_prepare() {
        # Patches from bug #22173.
        epatch "${FILESDIR}"/${P}-inc-login.patch
@@ -36,26 +36,38 @@ src_prepare() {
 }
 
 src_configure() {
-       [ -z "${EDITOR}" ] && export EDITOR="prompter"
        [ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
 
+       # strip options from ${PAGER} (quoting not good enough) (Bug #262150)
+       PAGER=${PAGER%% *}
+
        # Redefining libdir to be bindir so the support binaries get installed
        # correctly.  Since no libraries are installed with nmh, this does not
        # pose a problem at this time.
+       myconf="--libdir=/usr/bin"
 
-       # strip options from ${PAGER} (quoting not good enough) (Bug #262150)
-       PAGER=${PAGER%% *}
+       # Have gdbm use flag actually control which version of db in use
+       if use gdbm; then
+               myconf="${myconf} --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat"
+       else
+               if has_version ">=sys-libs/db-2"; then
+                       myconf="${myconf} --with-ndbmheader=db.h --with-ndbm=db"
+               else
+                       myconf="${myconf} --with-ndbmheader=db1/ndbm.h --with-ndbm=db1"
+               fi
+       fi
 
        # use gentoo-editor to avoid implicit dependencies (Bug #294762)
+       EDITOR=/usr/libexec/gentoo-editor
 
        econf \
                --prefix=/usr \
                --mandir=/usr/share/man \
-               --with-editor=/usr/libexec/gentoo-editor \
+               --with-editor="${EDITOR}" \
                --with-pager="${PAGER}" \
                --enable-nmh-pop \
                --sysconfdir=/etc/nmh \
-               --libdir=/usr/bin
+               $myconf
 }
 
 src_install() {