5 files changed, 9 insertions, 69 deletions
diff --git a/app-emacs/calfw/ChangeLog b/app-emacs/calfw/ChangeLog
index 74f920003efe..380b65cec8e2 100644
--- a/app-emacs/calfw/ChangeLog
+++ b/app-emacs/calfw/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2011/04/12 05:40:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/ChangeLog,v 1.3 2011/07/10 03:16:06 naota Exp $
+
+*calfw-1.1 (10 Jul 2011)
+
+  10 Jul 2011; Naohiro Aota <naota@gentoo.org> -calfw-0.1.ebuild,
+  -calfw-0.1-r1.ebuild, -files/calfw-0.1-cl.patch,
+  -files/calfw-0.1-howm-menu.patch, +calfw-1.1.ebuild:
+  version bumped
 
 *calfw-0.1-r1 (12 Apr 2011)
 
diff --git a/app-emacs/calfw/calfw-0.1.ebuild b/app-emacs/calfw/calfw-0.1.ebuild
deleted file mode 100644
index c23bc2da0160..000000000000
--- a/app-emacs/calfw/calfw-0.1.ebuild
+++ /dev/null
@@ -1,39 +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-0.1.ebuild,v 1.1 2011/04/10 16:47:10 naota Exp $
-
-EAPI=3
-
-inherit elisp-common 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}"
-
-COMMON_ELISPS="calfw.el
-calfw-ical.el"
-
-src_prepare() {
-	mv kiwanami-emacs-calfw-* "${P}"
-	cd "${P}"
-	epatch "${FILESDIR}"/${PN}-0.1-cl.patch
-	use howm && epatch "${FILESDIR}"/${PN}-0.1-howm-menu.patch
-}
-
-src_compile() {
-	use howm && (elisp-compile calfw-howm.el || die)
-	for x in ${COMMON_ELISPS}; do elisp-compile $x || die; done
-}
-
-src_install() {
-	use howm && elisp-install ${PN} calfw-howm.el calfw-howm.elc
-	for x in ${COMMON_ELISPS}; do elisp-install ${x} ${x}; done
-}
diff --git a/app-emacs/calfw/calfw-0.1-r1.ebuild b/app-emacs/calfw/calfw-1.1.ebuild
index 2dc8f41817e9..1af737ceadce 100644
--- a/app-emacs/calfw/calfw-0.1-r1.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-0.1-r1.ebuild,v 1.1 2011/04/12 05:40:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/calfw/calfw-1.1.ebuild,v 1.1 2011/07/10 03:16:06 naota Exp $
 
 EAPI=3
 NEED_EMACS=22
@@ -27,7 +27,5 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.1-cl.patch
-	epatch "${FILESDIR}"/${PN}-0.1-howm-menu.patch
 	use howm || rm -f calfw-howm.el
 }
diff --git a/app-emacs/calfw/files/calfw-0.1-cl.patch b/app-emacs/calfw/files/calfw-0.1-cl.patch
deleted file mode 100644
index 373f0be664cb..000000000000
--- a/app-emacs/calfw/files/calfw-0.1-cl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/calfw-ical.el b/calfw-ical.el
-index d95db06..6eba94a 100644
---- a/calfw-ical.el
-+++ b/calfw-ical.el
-@@ -39,6 +39,8 @@
- (require 'icalendar)
- (require 'url)
- 
-+(eval-when-compile (require 'cl))
-+
- (defun cfw:decode-to-calendar (dec)
-   (cfw:date
-    (nth 4 dec) (nth 3 dec) (nth 5 dec)))
diff --git a/app-emacs/calfw/files/calfw-0.1-howm-menu.patch b/app-emacs/calfw/files/calfw-0.1-howm-menu.patch
deleted file mode 100644
index 486d60564aef..000000000000
--- a/app-emacs/calfw/files/calfw-0.1-howm-menu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/calfw-howm.el b/calfw-howm.el
-index 9624baa..d34aea8 100644
---- a/calfw-howm.el
-+++ b/calfw-howm.el
-@@ -34,7 +34,7 @@
- 
- ;;; Code:
- 
--(require 'howm-menu)
-+(require 'howm)
- (require 'calfw)
- 
- (defvar cfw:howm-schedule-cache nil "howmのスケジュールデータのキャッシュ")