Make it compilable on Prefix systems

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index ec0b809b3217846163bc138020b502a9ea264d04..61c13e75f78f0e137b010df4a9a43c5245b70b89 100644 (file)
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/nail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.58 2010/02/02 18:14:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.59 2010/06/20 09:35:44 fauli Exp $
+
+  20 Jun 2010; <fauli@gentoo.org> nail-12.4.ebuild:
+  Make it compilable on Prefix systems
 
   02 Feb 2010; Jeroen Roovers <jer@gentoo.org> nail-12.4.ebuild,
   +files/nail-12.4-debian.patch:

diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index 1e82ebb2124122ff1e00779397583676caf87015..c58b3e8165442d0420103710d3f6cd4cbbf9389b 100644 (file)
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nail-12.4-debian.patch 1060 RMD160 0df7a5654c0cc8b38570cc73fb5e8efcceaab26e SHA1 59066d0220e6ca4d86fc24c87d5f74900e149645 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8
 AUX nail-nosocket.patch 473 RMD160 1598331c9a0ea4fcaa6682bae9e04cb5d7bb3117 SHA1 600c8bb47a17008c992297e28e29c73fb44108ef SHA256 840a0f3f592de84d03c225ccdc6c363b4d372eb605750a0ee7e1b02320547dc9
 DIST mailx-12.4.tar.bz2 271482 RMD160 8244d04d0a0058fdbe9867ca503c7cda8d580154 SHA1 b1e105adf9d36269daf317dedf68b6e4cca404a7 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a
 DIST nail-11.25.tar.bz2 267959 RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f SHA1 dd15a5bdedb74175763ababa8be70989334963e4 SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
 EBUILD nail-11.25-r3.ebuild 1985 RMD160 3f41c625e9647158370245bcee5616befea1fe55 SHA1 251a6b438ba909e733886680ebdb5ed4e1d588a0 SHA256 3b119bc9ac33b7e67017a740f86ea245037349ad1d9351ebeb014039be51a6c2
-EBUILD nail-12.4.ebuild 2176 RMD160 19b0bcbcfb5b14d1c0594c6574407194ea3c6157 SHA1 a45306268762befefca0140dc98b211deba65c3a SHA256 de61eab06046573296b73adfefb29fb85786d2431cc5f2b3dd3b336dcb98f9ed
-MISC ChangeLog 7970 RMD160 648ef80468455face80f580a2e93c05bae9f499d SHA1 d5bbe2a947603af473f8959b497a5a417f72d659 SHA256 b1e879654e042ee5a46c6ec16a85f34b149160f0b3a0850cc9d292c5c9f9e41e
+EBUILD nail-12.4.ebuild 2245 RMD160 f17d5123876ed74888ba97fead9c760982a564ca SHA1 a9ba13e3f51adf970bfa5b8412767dc7bc0f5eed SHA256 bf1b8066b01713aaaba6aa6af0f2e427fe761594a2d41a2875a4ea61e0034e0b
+MISC ChangeLog 8064 RMD160 fac98ab6bf3c51ed7eee5f2c63952268c51e747e SHA1 eb28227d9b1d7017c3c49f2009cd3a1e07f0feb5 SHA256 8689d8e55df09b8d9afb643250002bc987cefb4da9991f3ce289d2997152c57d
 MISC metadata.xml 259 RMD160 7bd304e664ab666fab49794d575652f4a5e1587c SHA1 1f0507ccb185c8f48f26b7ad1cfe4df64ce01ad1 SHA256 2b207df02a39323049a95d476319fcaafda0b918c0c4e1feaab97b61ca1a93c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwd4SkACgkQNQqtfCuFneP08QCcCAVlIa/xPkz6H3E5XewW5FVw
++nEAn2DebIfbK6D1Hkt5Dup+pW34XP7m
+=PNFG
+-----END PGP SIGNATURE-----

diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
index 6739334ec0608ad682c11e6ebad1fe82ec3b2bf5..df8f2cd70c709b454620b8dfd8cab8244916e2c0 100644 (file)
--- a/mail-client/nail/nail-12.4.ebuild
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.3 2010/02/02 18:14:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.4 2010/06/20 09:35:44 fauli Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils toolchain-funcs
 
@@ -64,7 +64,7 @@ src_compile() {
 
        emake \
                CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
-               PREFIX=/usr \
+               PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
                MAILSPOOL='/var/spool/mail' \
                || die "emake failed"
 }
@@ -80,7 +80,8 @@ src_install () {
 
        make DESTDIR="${D}" \
                UCBINSTALL=$(type -p install) \
-               PREFIX=/usr install || die "install failed"
+               PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+               || die
        dodoc AUTHORS INSTALL README
        dodir /bin
        dosym /usr/bin/mailx /bin/mail