update to EAPI 4.

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

diff --git a/mail-filter/scmail/ChangeLog b/mail-filter/scmail/ChangeLog
index 6ed7728e08fdac187187c88ba48b9fc5ea83067b..b963aa095f29b27d01e6d36ec95e27ec88c1fac4 100644 (file)
--- a/mail-filter/scmail/ChangeLog
+++ b/mail-filter/scmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/scmail
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.10 2010/04/11 10:08:49 hattya Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.11 2011/08/23 12:50:39 hattya Exp $
+
+  23 Aug 2011; Akinori Hattori <hattya@gentoo.org> scmail-1.3.ebuild,
+  +files/scmail-doc-encoding.diff:
+  update to EAPI 4.
 
   11 Apr 2010; Akinori Hattori <hattya@gentoo.org>
   +files/scmail-gauche-0.9.diff, scmail-1.3.ebuild:

diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest
index c91fdb93c066666a9b346fbdd83989e0e5a780bc..1ea9a8c2f7e200acf7eaafd31d5dfd24178fa55f 100644 (file)
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scmail-doc-encoding.diff 1294 RMD160 88aeadcaac672cade81a6f24dd2043f4af2b3f4d SHA1 ad7e25a4bc5c52cce9e16b4b1abb97c02c9c76b7 SHA256 7e2222dcef6237f85dbcb07cacfeaa41ef33efcff4977b6c144ccd4da0a33df5
 AUX scmail-gauche-0.9.diff 1318 RMD160 e19bfa22264e53e29f8c5233b341230256cd4129 SHA1 7bf5c2ba0f0acdfdf13211ab9cb18b73de50cb15 SHA256 5d1d27c09d7ffcd9d986f3a0b3b11fb6e3691fc2c4d5f168274859a852f76c47
 DIST scmail-1.3.tar.gz 52744 RMD160 484d8ca291b970dd070680ece1ed155646b5fa96 SHA1 bb1b9cecdaa994b76307162fe2f4e67240c5d13d SHA256 04648e6d9d48e934b2324596d2b0b887cc6d8b324d4d6533e248ba511b6bb525
-EBUILD scmail-1.3.ebuild 830 RMD160 f81fa7450a857ab1a0e3ee041436d89313fe2c58 SHA1 561c0d85c2e93466c860b93d690cc659e0686934 SHA256 14e388b14cbe097d082a0d2a80098ff219577fd60df396c23512f7fdc7f2b1fb
-MISC ChangeLog 2261 RMD160 94fb57cc69e4a2e8b48fda3516dac19b4ee3a6ae SHA1 494642e03d65e46b36de7a5bade7073dc2c054d6 SHA256 fe460bdfc81f7c175bad5d3d58da4c121b787b878fd0c2e2a7ecc3fbc55af9d0
+EBUILD scmail-1.3.ebuild 819 RMD160 3748f1b5cf91d1391cb017f171d3f2f546397fd3 SHA1 9d61290cd21d9bf8902d59f459872ce19ef317a4 SHA256 8130c553c668e3494a6e808ec7e3e236bbfa3245671019676573ada87a4b98c9
+MISC ChangeLog 2387 RMD160 40f1fcd5c7394c52dfa3763f7402b5f175996784 SHA1 9be74174dc34154908cb81903c725977ba2ecf5f SHA256 675a22c80e10414c4159765f9329efbc96f784a8d976f42ef3b63f5cce30cc9a
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5ToigACgkQL46suuyRem2x+gCgnIrnk2IKbNz+M6qzAjGZpzTa
+lLgAn0+myW1rzyG3KnHyvIzMoDgX+f8Y
+=BZ9T
+-----END PGP SIGNATURE-----

diff --git a/mail-filter/scmail/files/scmail-doc-encoding.diff b/mail-filter/scmail/files/scmail-doc-encoding.diff
new file mode 100644 (file)
index 0000000..5ed00a6
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-doc-encoding.diff
@@ -0,0 +1,28 @@
+--- scmail-1.3.orig/doc/embed.scm
++++ scmail-1.3/doc/embed.scm
+@@ -1,3 +1,4 @@
++(use gauche.charconv)
+ (use gauche.regexp)
+ (define (escape str)
+   (set! str (regexp-replace-all #/&/ str "&"))
+@@ -15,12 +16,18 @@
+ (define (main args)
+   (call-with-input-file (cadr args)
+     (lambda (in)
+-      (let* ((content (port->string in))
++      (let* ((content (port->string (open-input-conversion-port in "*jp")))
+              (content (regexp-replace-all #/#\{(.*?)\}/ content
+                                           (lambda (m)
+                                             (string-append 
+                                              "<pre>\n"
+                                              (read-file-and-escape (rxmatch-substring m 1))
+-                                             "</pre>\n")))))
++                                             "</pre>\n"))))
++             (content (regexp-replace #/(encoding=").*?(")/ content
++                                      (lambda (m)
++                                        (string-append
++                                         (rxmatch-substring m 1)
++                                         (ces-guess-from-string content "*jp")
++                                         (rxmatch-substring m 2))))))
+         (display content))))
+   0)

diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index ecd4f7362c1fe5a8f0692f321e75dbde4a8a2401..d3ab8c0fb1e590c8354e218b66f6789b4f6bcbe3 100644 (file)
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -1,43 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.3.ebuild,v 1.6 2010/04/11 10:08:49 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.3.ebuild,v 1.7 2011/08/23 12:50:39 hattya Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils fixheadtails
 
-IUSE=""
-
-HOMEPAGE="http://0xcc.net/scmail/"
 DESCRIPTION="a mail filter written in Scheme"
+HOMEPAGE="http://0xcc.net/scmail/"
 SRC_URI="http://0xcc.net/scmail/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="x86 ~ppc"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-DEPEND="dev-scheme/gauche"
+RDEPEND="dev-scheme/gauche"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-
-       epatch "${FILESDIR}"/${PN}-gauche-0.9.diff
-
+       epatch "${FILESDIR}"/${PN}-*.diff
        ht_fix_file tests/scmail-commands
-
        # replace make -> $(MAKE)
-       sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile || die
-
+       sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile
 }
 
 src_install() {
-
        emake \
-               PREFIX="${D}/usr" \
-               SITELIBDIR="${D}$(gauche-config --sitelibdir)" \
-               DATADIR="${D}/usr/share/doc/${P}" \
-               install \
-               || die
-
+               PREFIX="${ED}/usr" \
+               SITELIBDIR="${ED}$(gauche-config --sitelibdir)" \
+               DATADIR="${ED}/usr/share/doc/${P}" \
+               install
        dohtml doc/*.html
-
 }