Add fix for calfw.el

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 78 insertions, 4 deletions

diff --git a/app-emacs/calfw/ChangeLog b/app-emacs/calfw/ChangeLog
index 380b65cec8e2..0b5f86b01bdc 100644
--- a/app-emacs/calfw/ChangeLog
+++ b/app-emacs/calfw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/calfw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/ChangeLog,v 1.3 2011/07/10 03:16:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/ChangeLog,v 1.4 2011/07/10 06:27:12 naota Exp $
+
+  10 Jul 2011; Naohiro Aota <naota@gentoo.org> calfw-1.1.ebuild,
+  +files/calfw-1.1-calfwel.patch:
+  Add fix for calfw.el
 
 *calfw-1.1 (10 Jul 2011)
 
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index ec11cae906e0..c850f5cfca61 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50calfw-gentoo.el 118 RMD160 5fd18339830f38911c0dc1c37ffa07480abd11e8 SHA1 8aaeedc732c93a0d4c255c94787ffba12314eecb SHA256 dd7859464cbc823c55ee4b0368eafeee196bd3682a141bfd5615408e62ee0cd2
+AUX calfw-1.1-calfwel.patch 2296 RMD160 cea90ad2270b0f5e26f15d4d4dce38ef9dab1103 SHA1 bc25184aabd8ea69a2efc6b2deb3993384c9a1d7 SHA256 086054929c987aaac572bffd2d7a33978bcd0aa8d1c7c4e49903dc472303974d
 DIST calfw-1.1.tar.gz 53163 RMD160 106468555b980f2adcc448eba01d3d52ed57abf8 SHA1 6282cd733e0bdce7be14fdb7d66a84b2bc2d0261 SHA256 32fdc286f48774bd0882978d0d008ec27bc337afebb91530370d12b42ef01cfd
-EBUILD calfw-1.1.ebuild 702 RMD160 5da1b5b28d96783a80ef5a84fdee5eaf5dea279a SHA1 9073045ee33fece00dab452718ce2a7e82c0def7 SHA256 e3c57426bfcd3b380765daa4ae612561688ae449b88a42e42b693fec52bea2f6
-MISC ChangeLog 838 RMD160 e6a662e6f05c0032863457dcfd4ddc4a4e81ac55 SHA1 35f87b5090540acc1b7be3e48d42d33228d5fb1a SHA256 430f57a0625493dd5872a1c666d92be7603e8c7406a744eeae7884a80c37bcfd
+EBUILD calfw-1.1.ebuild 743 RMD160 bd6c43d5a7c30711559207952c271eab0d7b3555 SHA1 9c4c094f63b867654746dedc2e9a4134dc840d43 SHA256 7e8f7e38180de032a029ac92f7d30798360edfa34bbb94dba44953291d86a9b1
+MISC ChangeLog 961 RMD160 df6318865fa27cb107403ae942d3d44eb3c40435 SHA1 b7598fba7785ef52e7bef563ff30acc19441bf6f SHA256 a105d120f87c2942908a190f2baa58dac7b94b1e5eb4f55e6a6440d96419f4b0
 MISC metadata.xml 326 RMD160 761c944ea07bfdfeeed122aa6e86dfaa796e3649 SHA1 c10fa2ce8c3811f266c6ec9ae0ccfc65a87bdee1 SHA256 92b58f66ba2656e85dd7a69960d02a1b743fa1e8aef9e0091faf0224a5031374
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4ZRj4ACgkQGpDnPLSHuMC6ggCgjHi6/R80oC8YNJHeSdzrazjN
+TA0AnAr65hXm9dDh9RnoYpt2kida6S3Z
+=NhOl
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/calfw/calfw-1.1.ebuild b/app-emacs/calfw/calfw-1.1.ebuild
index 1af737ceadce..88a6804d78fd 100644
--- a/app-emacs/calfw/calfw-1.1.ebuild
+++ b/app-emacs/calfw/calfw-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.1.ebuild,v 1.1 2011/07/10 03:16:06 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.1.ebuild,v 1.2 2011/07/10 06:27:12 naota Exp $
 
 EAPI=3
 NEED_EMACS=22
@@ -27,5 +27,6 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-calfwel.patch
 	use howm || rm -f calfw-howm.el
 }
diff --git a/app-emacs/calfw/files/calfw-1.1-calfwel.patch b/app-emacs/calfw/files/calfw-1.1-calfwel.patch
new file mode 100644
index 000000000000..cc2658cd9850
--- /dev/null
+++ b/app-emacs/calfw/files/calfw-1.1-calfwel.patch
@@ -0,0 +1,58 @@
+diff --git a/calfw.el b/calfw.el
+index 5a72627..2fa2f9e 100644
+--- a/calfw.el
++++ b/calfw.el
+@@ -984,13 +984,16 @@ calling functions `cfw:annotations-functions'."
+    (t
+     (loop for s in sources
+           for f = (cfw:source-data s)
+-          for cnt = (funcall f begin end)
++          for cnts = (funcall f begin end)
+           with annotations = nil
+-          for prv = (cfw:contents-get-internal d annotations)
+-          if prv
+-          do (set-cdr prv (concat (cdr prv) "/" (cdr cnt)))
+-          else
+-          do (push (copy-sequence cnt) annotations)
++          do
++          (loop for c in cnts
++                for (d . line) = c
++                for prv = (cfw:contents-get-internal d annotations)
++                if prv
++                do (setcdr prv (concat (cdr prv) "/" line))
++                else
++                do (push (cons d line) annotations))
+           finally return annotations))))
+ 
+ 
+@@ -2380,7 +2383,7 @@ DATE is initial focus date. If it is nil, today is selected initially."
+                 ((1 14 2011) (1 15 2011) "Stack")
+                 ((1 29 2011) (1 31 2011) "PERIOD W"))
+                ))))
+-         (asource
++         (asource1
+           (make-cfw:source
+            :name "Moon"
+            :data
+@@ -2390,10 +2393,20 @@ DATE is initial focus date. If it is nil, today is selected initially."
+                ((1 20 2011) . "Full Moon")
+                ((1 26 2011) . "Waning Moon")
+                ))))
++         (asource2
++          (make-cfw:source
++           :name "Moon"
++           :data
++           (lambda (b e)
++             '(((1  5 2011) . "AN1")
++               ((1 13 2011) . "AN2")
++               ((1 20 2011) . "AN3")
++               ((1 28 2011) . "AN4")
++               ))))
+          (cp (cfw:create-calendar-component-buffer
+               :view 'month
+               :contents-sources (list source1 source2)
+-              :annotation-sources (list asource))))
++              :annotation-sources (list asource1 asource2))))
+     (cfw:cp-add-update-hook cp (lambda () (message "CFW: UPDATE HOOK")))
+     (cfw:cp-add-click-hook cp (lambda () (message "CFW: CLICK HOOK %S" (cfw:cursor-to-nearest-date))))
+     (cfw:cp-add-selection-change-hook cp (lambda () (message "CFW: SELECT %S" (cfw:cursor-to-nearest-date))))