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

(Portage version: 2.1.10.43/cvs/Linux x86_64)

3 files changed, 14 insertions, 10 deletions

diff --git a/app-emacs/yow/ChangeLog b/app-emacs/yow/ChangeLog
index 079fc5533811..f125c85f66ac 100644
--- 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/files/yow-fix-misspellings.patch b/app-emacs/yow/files/yow-fix-misspellings.patch
deleted file mode 100644
index 314eaa9bbd33..000000000000
--- a/app-emacs/yow/files/yow-fix-misspellings.patch
+++ /dev/null
diff --git a/app-emacs/yow/yow-21.4_p20020329.ebuild b/app-emacs/yow/yow-21.4_p20020329.ebuild
index 4cace4c8cecc..198c3d0e7a1e 100644
--- 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}"
 }