diff options
Diffstat (limited to 'app-emacs/calfw')
| -rw-r--r-- | app-emacs/calfw/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emacs/calfw/calfw-1.1.ebuild | 32 | ||||
| -rw-r--r-- | app-emacs/calfw/calfw-1.2.ebuild | 31 | ||||
| -rw-r--r-- | app-emacs/calfw/calfw-1.3.ebuild | 9 | ||||
| -rw-r--r-- | app-emacs/calfw/files/calfw-1.1-calfwel.patch | 58 |
5 files changed, 10 insertions, 128 deletions
diff --git a/app-emacs/calfw/ChangeLog b/app-emacs/calfw/ChangeLog index 21718c53e4ee..bb3755e6284f 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.6 2011/10/10 08:31:25 naota Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/ChangeLog,v 1.7 2014/06/07 10:53:15 ulm Exp $ + + 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -calfw-1.1.ebuild, + -calfw-1.2.ebuild, calfw-1.3.ebuild, -files/calfw-1.1-calfwel.patch: + Remove redundant NEED_EMACS assignment. Update EAPI to 5. Remove old. *calfw-1.3 (10 Oct 2011) diff --git a/app-emacs/calfw/calfw-1.1.ebuild b/app-emacs/calfw/calfw-1.1.ebuild deleted file mode 100644 index 88a6804d78fd..000000000000 --- a/app-emacs/calfw/calfw-1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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.2 2011/07/10 06:27:12 naota Exp $ - -EAPI=3 -NEED_EMACS=22 - -inherit elisp eutils - -DESCRIPTION="A calendar framework for Emacs" -HOMEPAGE="https://github.com/kiwanami/emacs-calfw" -SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="howm" - -DEPEND="howm? ( app-emacs/howm )" -RDEPEND="${DEPEND}" - -SITEFILE="50${PN}-gentoo.el" - -src_unpack() { - unpack ${A} - mv kiwanami-emacs-calfw-* ${P} || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-calfwel.patch - use howm || rm -f calfw-howm.el -} diff --git a/app-emacs/calfw/calfw-1.2.ebuild b/app-emacs/calfw/calfw-1.2.ebuild deleted file mode 100644 index cdeb1c6a7da7..000000000000 --- a/app-emacs/calfw/calfw-1.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# 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.2.ebuild,v 1.1 2011/08/14 10:12:17 naota Exp $ - -EAPI=3 -NEED_EMACS=22 - -inherit elisp eutils - -DESCRIPTION="A calendar framework for Emacs" -HOMEPAGE="https://github.com/kiwanami/emacs-calfw" -SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="howm" - -DEPEND="howm? ( app-emacs/howm )" -RDEPEND="${DEPEND}" - -SITEFILE="50${PN}-gentoo.el" - -src_unpack() { - unpack ${A} - mv kiwanami-emacs-calfw-* ${P} || die -} - -src_prepare() { - use howm || rm -f calfw-howm.el -} diff --git a/app-emacs/calfw/calfw-1.3.ebuild b/app-emacs/calfw/calfw-1.3.ebuild index 410d59314982..9d66d6fe5de6 100644 --- a/app-emacs/calfw/calfw-1.3.ebuild +++ b/app-emacs/calfw/calfw-1.3.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.3.ebuild,v 1.1 2011/10/10 08:31:25 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.3.ebuild,v 1.2 2014/06/07 10:53:15 ulm Exp $ -EAPI=3 -NEED_EMACS=22 +EAPI=5 inherit elisp eutils @@ -11,7 +10,7 @@ DESCRIPTION="A calendar framework for Emacs" HOMEPAGE="https://github.com/kiwanami/emacs-calfw" SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="howm" diff --git a/app-emacs/calfw/files/calfw-1.1-calfwel.patch b/app-emacs/calfw/files/calfw-1.1-calfwel.patch deleted file mode 100644 index cc2658cd9850..000000000000 --- a/app-emacs/calfw/files/calfw-1.1-calfwel.patch +++ /dev/null @@ -1,58 +0,0 @@ -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)))) |