summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emacs/filladapt/ChangeLog9
-rw-r--r--app-emacs/filladapt/files/50filladapt-gentoo.el1
-rw-r--r--app-emacs/filladapt/files/51filladapt-gentoo.el4
-rw-r--r--app-emacs/filladapt/filladapt-2.12-r1.ebuild25
4 files changed, 19 insertions, 20 deletions
diff --git a/app-emacs/filladapt/ChangeLog b/app-emacs/filladapt/ChangeLog
index 77ed4f0eafd2..4dcd20628314 100644
--- a/app-emacs/filladapt/ChangeLog
+++ b/app-emacs/filladapt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-emacs/filladapt
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/filladapt/ChangeLog,v 1.11 2008/06/14 23:26:02 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/filladapt/ChangeLog,v 1.12 2014/02/23 12:59:38 ulm Exp $
+
+ 23 Feb 2014; Ulrich Müller <ulm@gentoo.org> filladapt-2.12-r1.ebuild,
+ +files/50filladapt-gentoo.el, -files/51filladapt-gentoo.el:
+ Update ebuild to EAPI 5. Specify LICENSE more precisely. Move site-init file
+ to canonical name.
14 Jun 2008; Ulrich Mueller <ulm@gentoo.org> filladapt-2.12-r1.ebuild:
Do not assign SIMPLE_ELISP since elisp.eclass now detects this case
diff --git a/app-emacs/filladapt/files/50filladapt-gentoo.el b/app-emacs/filladapt/files/50filladapt-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/filladapt/files/50filladapt-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/filladapt/files/51filladapt-gentoo.el b/app-emacs/filladapt/files/51filladapt-gentoo.el
deleted file mode 100644
index af999b4b157a..000000000000
--- a/app-emacs/filladapt/files/51filladapt-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-
-;;; filladapt site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/filladapt/filladapt-2.12-r1.ebuild b/app-emacs/filladapt/filladapt-2.12-r1.ebuild
index 46154e57886b..6b30e49a7123 100644
--- a/app-emacs/filladapt/filladapt-2.12-r1.ebuild
+++ b/app-emacs/filladapt/filladapt-2.12-r1.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2008 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/filladapt/filladapt-2.12-r1.ebuild,v 1.4 2008/06/14 23:26:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/filladapt/filladapt-2.12-r1.ebuild,v 1.5 2014/02/23 12:59:38 ulm Exp $
-inherit elisp
+EAPI=5
+
+inherit readme.gentoo elisp
DESCRIPTION="Filladapt enhances the behavior of Emacs' fill functions"
HOMEPAGE="http://www.wonderworks.com/"
SRC_URI="mirror://gentoo/${P}.el.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SITEFILE=51${PN}-gentoo.el
-pkg_postinst() {
- elisp-site-regen
- elog "Filladapt is no longer enabled as a site default. Add the following"
- elog "lines to your ~/.emacs file to enable adaptive fill by default:"
- elog " (require 'filladapt)"
- elog " (setq-default filladapt-mode t)"
-}
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Filladapt is not enabled as a site default. Add the following
+ lines to your ~/.emacs file to enable adaptive fill by default:
+ \n\t(require 'filladapt)
+ \n\t(setq-default filladapt-mode t)"