Patch makefile to not strip the binary on its own. Suggested by Diego Pettenò <flamee...

Package-Manager: portage-2.1.2.2

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index 891eed338cfc98ce6b728fcc1dd562ef6e6074c8..87b9a038f516013805b0905bbe3b21cd8e7fb913 100644 (file)
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/nail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.52 2007/03/18 02:16:36 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.53 2007/03/29 16:47:52 ticho Exp $
+
+  29 Mar 2007; Andrej Kacian <ticho@gentoo.org> -nail-11.25-r1.ebuild,
+  nail-11.25-r3.ebuild:
+  Patch makefile to not strip the binary on its own. Suggested by Diego
+  Pettenò <flameeyes at gmail.com>.
 
   18 Mar 2007; Marius Mauch <genone@gentoo.org> nail-11.25-r3.ebuild:
   Replacing einfo with elog

diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index aa5084475b9d0d0830673c7fc5db737646249b11..793b3c725bfb53d8c09adff64d8195865eb6ce59 100644 (file)
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -6,32 +6,25 @@ MD5 40398648c9e2e41662ae61caea846c57 files/nail-nosocket.patch 473
 RMD160 1598331c9a0ea4fcaa6682bae9e04cb5d7bb3117 files/nail-nosocket.patch 473
 SHA256 840a0f3f592de84d03c225ccdc6c363b4d372eb605750a0ee7e1b02320547dc9 files/nail-nosocket.patch 473
 DIST nail-11.25.tar.bz2 267959 RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f SHA1 dd15a5bdedb74175763ababa8be70989334963e4 SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
-EBUILD nail-11.25-r1.ebuild 1426 RMD160 de95fa8a00af6951c33a594c953fe41b729fe812 SHA1 0f90ad8e8030352fd819000daba437f127a8a86a SHA256 3260c17ffe21b0f56b268680ceda511e0551e2bf08354df3f3d4ccb5ee978f42
-MD5 eadd4065bdc0e5049170cd1386974525 nail-11.25-r1.ebuild 1426
-RMD160 de95fa8a00af6951c33a594c953fe41b729fe812 nail-11.25-r1.ebuild 1426
-SHA256 3260c17ffe21b0f56b268680ceda511e0551e2bf08354df3f3d4ccb5ee978f42 nail-11.25-r1.ebuild 1426
-EBUILD nail-11.25-r3.ebuild 1882 RMD160 d0e023417b15c1f88cc54bd753fa509a8fda1731 SHA1 9a61b9a522a8f61b69df3efb450c7ae5a2e4c70b SHA256 3252dcb32fb45e072f5d554f7499329495fdc67e8a353492675664e24c9617b9
-MD5 1b13771c9b03f954fc5a7d4983233b82 nail-11.25-r3.ebuild 1882
-RMD160 d0e023417b15c1f88cc54bd753fa509a8fda1731 nail-11.25-r3.ebuild 1882
-SHA256 3252dcb32fb45e072f5d554f7499329495fdc67e8a353492675664e24c9617b9 nail-11.25-r3.ebuild 1882
-MISC ChangeLog 7038 RMD160 0e863b5f0e73b469594adc1e2ffb551c3e1292c2 SHA1 18c59b15320b922014f1b0f5021fd5a007fbaf1f SHA256 0fddff878b1a6cd88ff02f63ecfaa791c3a4d00d47062769d08042375db1bcbe
-MD5 9f282fd2f6c9ad58561290f077c59143 ChangeLog 7038
-RMD160 0e863b5f0e73b469594adc1e2ffb551c3e1292c2 ChangeLog 7038
-SHA256 0fddff878b1a6cd88ff02f63ecfaa791c3a4d00d47062769d08042375db1bcbe ChangeLog 7038
+EBUILD nail-11.25-r3.ebuild 1947 RMD160 6175cc73574cd2e30aa36b3052d1d20049ced20b SHA1 ee46683782a8fb64b07f4dc6de7c30ed946ddc55 SHA256 a7808aa5ae05a421568ab3b3c37a996448c792be9617a7c164ce81b9f7ec476c
+MD5 0446756f45e741370fc80dc82280c3ed nail-11.25-r3.ebuild 1947
+RMD160 6175cc73574cd2e30aa36b3052d1d20049ced20b nail-11.25-r3.ebuild 1947
+SHA256 a7808aa5ae05a421568ab3b3c37a996448c792be9617a7c164ce81b9f7ec476c nail-11.25-r3.ebuild 1947
+MISC ChangeLog 7242 RMD160 a52adf6f460922e73d9043587cfba57f0944ee83 SHA1 22d3c1a9227184e8761bee819848cd1712fb6a99 SHA256 cd9540e0345bea2db43d5139cd7496bebf9f5fd78c4a6c12e36fd9eca38a3ed4
+MD5 7f397747c1bd621c140b8010643107c2 ChangeLog 7242
+RMD160 a52adf6f460922e73d9043587cfba57f0944ee83 ChangeLog 7242
+SHA256 cd9540e0345bea2db43d5139cd7496bebf9f5fd78c4a6c12e36fd9eca38a3ed4 ChangeLog 7242
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 78b342422d07c9456a1f5ff156cfce5e files/digest-nail-11.25-r1 235
-RMD160 90c02c70839fa6edb32bcc049e966492c08cf8a9 files/digest-nail-11.25-r1 235
-SHA256 9357a1e48cc97cbb8ed39ab54a4703dc1d95b7e1bbe9ae695f676123a3729af7 files/digest-nail-11.25-r1 235
 MD5 78b342422d07c9456a1f5ff156cfce5e files/digest-nail-11.25-r3 235
 RMD160 90c02c70839fa6edb32bcc049e966492c08cf8a9 files/digest-nail-11.25-r3 235
 SHA256 9357a1e48cc97cbb8ed39ab54a4703dc1d95b7e1bbe9ae695f676123a3729af7 files/digest-nail-11.25-r3 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF/KIX6J2i8a8J4okRAnq5AJ4pRigP1Xl896MUGQPwCYpYYci8bgCeP0kQ
-36j1wTwqvQDiBeybGmbjrRQ=
-=uulm
+iD8DBQFGC+29QlM6RnzZP+IRAu/8AKCX/zOuCfMCGcP56oEEuN2NIYW0QACbB8gb
+ADdlezC3WqN6nLSlHAIU3oA=
+=VF2Q
 -----END PGP SIGNATURE-----

diff --git a/mail-client/nail/files/digest-nail-11.25-r1 b/mail-client/nail/files/digest-nail-11.25-r1
deleted file mode 100644 (file)
index e72a93b..0000000
--- a/mail-client/nail/files/digest-nail-11.25-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 267959
-RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f nail-11.25.tar.bz2 267959
-SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5 nail-11.25.tar.bz2 267959

diff --git a/mail-client/nail/nail-11.25-r1.ebuild b/mail-client/nail/nail-11.25-r1.ebuild
deleted file mode 100644 (file)
index 7e5e9b7..0000000
--- a/mail-client/nail/nail-11.25-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r1.ebuild,v 1.9 2005/10/03 12:13:01 ticho Exp $
-
-inherit eutils
-DESCRIPTION="Nail is an enhanced mailx-compatible mail client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://nail.sourceforge.net/"
-PROVIDE="virtual/mailx"
-DEPEND="ssl? ( dev-libs/openssl )
-       !virtual/mailx"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
-IUSE="ssl"
-
-src_compile() {
-       # Build config.h and LIBS, neccesary to tweak the config
-       make config.h
-
-       # Hack to remove openssl
-       if ! use ssl ; then
-               sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
-               sed -i -e 's~-lssl~~' -e 's~-lcrypto~~' LIBS
-       fi
-
-       # Now really build it
-       emake PREFIX=/usr MAILSPOOL='~/.maildir' || die "emake failed"
-}
-
-src_install () {
-       # Use /usr/lib/sendmail by default and provide an example
-       cat <<- EOSMTP >> nail.rc
-
-               # Use the local sendmail (/usr/lib/sendmail) binary by default.
-               # (Uncomment the following line to use a SMTP server)
-               #set smtp=localhost
-       EOSMTP
-
-       make DESTDIR=${D} UCBINSTALL=/bin/install PREFIX=/usr install || die "install failed"
-       dodoc AUTHORS INSTALL README
-       dodir /bin
-       dosym /usr/bin/nail /bin/mail
-       dosym /usr/bin/nail /usr/bin/mailx
-       dosym /usr/bin/nail /usr/bin/mail
-       dosym /usr/bin/nail /usr/bin/Mail
-}

diff --git a/mail-client/nail/nail-11.25-r3.ebuild b/mail-client/nail/nail-11.25-r3.ebuild
index 08ec36610801f346deebd07828dcbbde1f415e73..40bebfb51cec847ab003beba3d2e2312792a9efd 100644 (file)
--- a/mail-client/nail/nail-11.25-r3.ebuild
+++ b/mail-client/nail/nail-11.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r3.ebuild,v 1.11 2007/03/18 02:16:36 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-11.25-r3.ebuild,v 1.12 2007/03/29 16:47:52 ticho Exp $
 
 inherit eutils
 DESCRIPTION="Nail is an enhanced mailx-compatible mail client"
@@ -27,6 +27,9 @@ remove_sockets() {
 }
 
 src_compile() {
+       # Do not strip the binary
+       sed -i -e 's:-s nail:nail:' Makefile
+
        # Build config.h and LIBS, neccesary to tweak the config
        make config.h