Update ebuild to EAPI 5. Specify LICENSE more precisely. Move site-init file to canonical name.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 34 insertions, 38 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/Manifest b/app-emacs/filladapt/Manifest
index 7bba5539669c..d7ab90e0fad3 100644
--- a/app-emacs/filladapt/Manifest
+++ b/app-emacs/filladapt/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 51filladapt-gentoo.el 78 SHA256 f963fd3d8bac6808e73103e4c9ddf0faec1dc8e62290c9ec2a1f714aa9dadfab SHA512 5dac3faa9737e276babc577b94fb7f614ce38d2eb1a6df4c4e3d10c0261248184a2e76660f669745e6748218d9fdb017986ec222e59e77192cdea6d9e2543db9 WHIRLPOOL 3fdf06c8abc748c00cba36b0c39f9bbd78daaebaa9de71d6e61285f3fae41114856ab8d0c14296b0f7d4f7e7b4877f397fbf04c5eff53d99d863c1fefbc6547d
+AUX 50filladapt-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 DIST filladapt-2.12.el.gz 9267 SHA256 5d96051b605ea05d89372dc032d1e33ba8f4dcb82c89a178a9fb62bc8feb261c SHA512 31bf3dca48129cc25653827678215eb4c62ff777cfbdf0d71142c0cc3111a078b1af316e121b27be2a47c317cfa440ac00e7fbc2bdf3e8ac7d54748297249328 WHIRLPOOL bd591375a15e35468a78b595c8b073d63879aaa766803017c1087a762affe3d7bd83d5f8f2f4370ad67293169dabf0eac765f55f9556fc60d900daba3bc9bfe5
-EBUILD filladapt-2.12-r1.ebuild 732 SHA256 f0de1f3863e9acc04a45401037eee50a0c422026aa44d62ccfac431b59d03123 SHA512 1b6be4c964d5ad96c341b8c69a8467b347dd5349ae1369a1952f2883d870345b76ddb5c5a761edd50140a53a2a28d637a36817afc0880563f1e7c3171f914432 WHIRLPOOL 9229086fe73d6f9f5df02a67b6da53c5860aadc32b55673b44cc9a1566fc08448554db1f31328192fd17a75d994bb0f681a174e5df8128fb4d4d1f264c50cc92
-MISC ChangeLog 1500 SHA256 2110f3a866b494a5cf1a3497aa793e382a65b7315c64fa49b2d0159110b1a1d1 SHA512 943e4206ace513d143ee73a970bc3042044b36e9402d2da5041f16cbdffb97fcee068638f32cfd680d18cda3ede17e93e5dbce9faeb4d69caf19f2d1fe88d434 WHIRLPOOL 683fa9d69efe584489c9c7079777d6906f0977a6bca7d25272a0c7440e3b0809b56a47cb901278fc1bb3d043cfeb932f999b0c1a55e77a1b29ca0043309a8b9e
+EBUILD filladapt-2.12-r1.ebuild 695 SHA256 dcbb1746d114026809780b0ffc4ce4360b893cdc42030667140b88743364d2fd SHA512 5b5426c08b55946df46f254d7f47bf93ddfeecc7ccec28e58cc440f04b0281dfb457750eb77ad6f00df626b8ec3f47081f5a534d2826cd15ca1512ffd88f7f07 WHIRLPOOL 6d29c862109d1825ceb432527d1dc1efca93ffb63a3541e08f9f8c300eaeb65be789fa9f3e3a8734c409f1515d924f402f6b2c1cf38633a6c7082c43d76036d8
+MISC ChangeLog 1736 SHA256 c5f4a5250e6ba2641dd2a2aaf80a8fab092d814815a1590530cbe363dac55c23 SHA512 17a114019997cd822845d5ee6d45de85d6472417fabf61bf705679376e1ea4c9540e17a7fc6bf3e9c048aede8753b325ef5777e66e6abb539598638e499c6e1c WHIRLPOOL 013dc9e21f899e72748630c46fa94bfe5671b0e6fab579e130dcc0d41a5c3575fc2db7c7aee87d407e45bd9f6f5fa4504bce9ad7eab98179867c271afee7dad5
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e5eAAoJEDxpGckxwJCB9c4P/RObIiQdxo6eJenL0rZ6Ftae
-GkhFKVl+33dg3rQKk8Mglu4qnAgvGE+Z/tAgCCtgDT50I/ZJh+yMeg8dPDFVjzd6
-9KqxJsBzByElU7rIdoGyg3UO5p1OlpWqtE3Y8dmHS/oDhBbMcboBrnLXWmXqy4IH
-/D1YnX+aV5G5+v1+lEEblRozebdKoEqCuGzxjcimSJtbPm/dTTJigpgvY1RN1/Gy
-w0dF/wCZqiD/H519aHxbsTRJmEvKs0cppo5pwoZfJZ0Eyi3b6vfxXEcmy82FPAw6
-dPwFqTv2CC6gLgs9qw0CZ6w9/GfIoria3saees/yXVI2J/LUpGh9bb4EuOrGqRVw
-w4Pj8cIbR/Qt1vUaGp/xZwyK3QCbc5pqFs0pRQvYm3voU1zGGoyeVKtPK2OnVeMC
-IQR6BFzIssd6tKCdPCjo+Yywvhn8n/nM7vpl/22p5R6H2u5euhj+LF1oQKclS3UY
-u6fl2YgHXXiWFzfOp2S3sVK+OjslxgiIgV5KJI/mmAetnMz/VB1ICteugqFInwtK
-aTDY3tGjyqURAIhh06NNrHzmbPjpojC7j4eLLjjVjYksUlj2rdRc3T3+E2ne3lYT
-0KfdRXm5c+cYOXwEkNFMeeoIY6/VS7834j0gIuzrQxNn6skttsHB1qppPZ6gVRxg
-VRmArapV9ev/XHbk/zt0
-=I6u9
+iQGcBAEBCAAGBQJTCfDSAAoJEJQzkH1pP7W4o4UL/2ooXKrtWxJJ+A4NoW3YZBWD
+cKkXejnEbjJvIK4dvuLtf3xmOGg6DsFBU64c/m6MB0NATio/MlE/NIpT6Ct8B99j
+Ez+ZdSYS/kj7KeZ1IH8PvPxR0l6E5ZLj/0L0CLJ/Gma1RsaLUfTcxZiBjyE0KQtO
+ZpQfWgAU7QqQ9ftDr2qSVruwG7LiU83g+qb+BOLM8qxjTfy2t+OoYLjFtLgmqx3d
+Ix1DAkKMC/LxbT1fC6gKVrtO5ALuFxRzwaLTqYe8ceSKMOYpYy87/jAgzxDhlPEb
+Xl9hOo9k+5hQnn7AIjp3eAtX8PN9XukxVXGW/brFCEVVP/x8bHVpXJb1cg6Popmz
+HLM+8n5McjZTgXQBtDu3nCEreCULYP1v+97PpAan0WHNOO+BC7s7ZX/5kDDSjSVO
+PT2niTXWH3rwmx6aj4EiNLgHdMIuozlSGOpRFXcdL6N+Kj5YX2sl4hewm+lTMr4S
+OHhggUtUPPJISYxribmx7dMtfNVFXtdopeva6x/Cwg==
+=OSpf
 -----END PGP SIGNATURE-----
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)"