Rebase the source on XEmacs cookie package. Remove binary patch file.

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

diff --git a/app-emacs/yow/ChangeLog b/app-emacs/yow/ChangeLog
index 079fc55338118a8019f18eefeacde4b01eb13263..f125c85f66ac32b58e274fc92cfebe2f725d8249 100644 (file)
--- a/app-emacs/yow/ChangeLog
+++ b/app-emacs/yow/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/yow
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/ChangeLog,v 1.7 2011/09/10 10:48:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/ChangeLog,v 1.8 2011/12/27 13:38:35 ulm Exp $
+
+  27 Dec 2011; Ulrich Mueller <ulm@gentoo.org> yow-21.4_p20020329.ebuild,
+  -files/yow-fix-misspellings.patch:
+  Rebase the source on XEmacs cookie package. Remove binary patch file.
 
   10 Sep 2011; Ulrich Mueller <ulm@gentoo.org> yow-21.4_p20020329.ebuild:
   EAPI bump.

diff --git a/app-emacs/yow/Manifest b/app-emacs/yow/Manifest
index f0b693e3c132c2c803c9b7414ca8e7387d67f5a3..55338a4413a1f7fa543a429d5a881c5cdce95b98 100644 (file)
--- a/app-emacs/yow/Manifest
+++ b/app-emacs/yow/Manifest
@@ -2,15 +2,15 @@
 Hash: SHA1
 
 AUX 50yow-gentoo.el 38 RMD160 bc03e7ab0eddcb4f43be4fb18cf1f811d3bdd84c SHA1 9f5b73b848e30e7614f2508f70396283cfd74bdb SHA256 42bfe9e01563d168641c05d1b19c3172e86c474e0ae6b4b715f991833e68e207
-AUX yow-fix-misspellings.patch 660 RMD160 960cd8bbf2fcc45d431154f3ec9f55d85a079bd5 SHA1 72048e39aec008a19b9152a57c276e916b3b265f SHA256 429e114f777b6c56e4755d5ac80c9636d136aaac283290eae7b8703e6090f0a5
-DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
-EBUILD yow-21.4_p20020329.ebuild 1195 RMD160 776679e25d616233753fe93a1b72eee160d71fcd SHA1 561162383dcc7d3a56c5e4e16608d2a844b47acd SHA256 9cb53a9b3c404398265a644814ba7757966de7530f20af8efce11036667fe7ff
-MISC ChangeLog 1069 RMD160 a766a548e6c6508ca24a6eebfbb2a9518236388c SHA1 15e5cb78632b2f327c1bcb4908fe87e93995efff SHA256 630f7758b8d13a6a03ef67338fb02ce29ad6bca55aa7ef7e25c07ca80739134f
+DIST cookie-1.15-pkg.tar.gz 35035 RMD160 2854a70a6ca08582e39488d757af685aa807c4c4 SHA1 64a95a834bb6d3f6c5743fd7407555c347458b62 SHA256 351e8957b59c057842cf591e683ba8ef58ed8f678bfc2e42aeb5ec0c0f8ab59b
+DIST yow-1.15-21.4_p20020329.patch.gz 1930 RMD160 e7e98da69f75071c1eefdbab0f79c835a5cc3cbb SHA1 347f1c56ad74ba2b7cde955500500edc17bd0a29 SHA256 540400c5a4f674137356f36d63c525489f8977b4e2353c3f6fc838d2e2d509dc
+EBUILD yow-21.4_p20020329.ebuild 1255 RMD160 ac9bee3b785260b9daa02f2f2ff24c88854dfd09 SHA1 cfc7643ae6c86dbc8cde6ee9de5f65c840138e0b SHA256 3b56948fccf35d60e11d3da1fda575ef5c3bd71447d72b0f152162a9ac97bea3
+MISC ChangeLog 1253 RMD160 1242c7146fef4edeffeb5cd9153dcfa485571b09 SHA1 f67f7b800450d256b6d2b721dabf05a790e6527a SHA256 a9d828e49219e5affcd0685b8cdb49237eb2c8b3225b5c6f25d6ce0649958692
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5rQfoACgkQOeoy/oIi7uw8KQCfReUvi8Uq1UsebX5J4ceyS8Vq
-HGEAni5TmAh5NhPz2rwxqqJQ1+ptrVcL
-=lSsu
+iEYEARECAAYFAk75zMcACgkQOeoy/oIi7ux3hQCg4nuKxXXzB9ULrROM+Jq+rAQK
+JdkAniRE17VnyB0VdeoeE8cgYY0kIv9O
+=4ks+
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/yow/files/yow-fix-misspellings.patch b/app-emacs/yow/files/yow-fix-misspellings.patch
deleted file mode 100644 (file)
index 314eaa9..0000000
Binary files a/app-emacs/yow/files/yow-fix-misspellings.patch and /dev/null differ

diff --git a/app-emacs/yow/yow-21.4_p20020329.ebuild b/app-emacs/yow/yow-21.4_p20020329.ebuild
index 4cace4c8cecc50f6314f157996bfd8c081feec4e..198c3d0e7a1eca01fdfcb717ba37b3be0648418e 100644 (file)
--- a/app-emacs/yow/yow-21.4_p20020329.ebuild
+++ b/app-emacs/yow/yow-21.4_p20020329.ebuild
@@ -1,33 +1,33 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/yow-21.4_p20020329.ebuild,v 1.8 2011/09/10 10:48:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/yow/yow-21.4_p20020329.ebuild,v 1.9 2011/12/27 13:38:35 ulm Exp $
 
 EAPI=4
 
 inherit elisp
 
-MY_P="emacs-${PV%_p*}"
+XE_PV="1.15"
 DESCRIPTION="Zippy the pinhead data base"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${MY_P}a.tar.gz"
+# We used to take the file from the GNU Emacs 21.4 tarball, but 20 MB for one
+# 53 kB file is wasteful. So we take it from app-xemacs/cookie and patch it.
+SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/cookie-${XE_PV}-pkg.tar.gz
+       mirror://gentoo/${PN}-${XE_PV}-${PV}.patch.gz"
 
-# A slightly different version of yow.lines is also included with
-# app-xemacs/cookie, and also with games-misc/fortune-mod which is
-# under a BSD licence.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}/etc"
-ELISP_PATCHES="${PN}-fix-misspellings.patch"
+S="${WORKDIR}"
+ELISP_PATCHES="${PN}-${XE_PV}-${PV}.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() { :; }
 
 src_install() {
        insinto "${SITEETC}/${PN}"
-       doins yow.lines
+       doins etc/yow.lines
        elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }