Update ebuild to EAPI 5. Specify LICENSE more precisely.

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

4 files changed, 29 insertions, 29 deletions

diff --git a/app-emacs/httpd/ChangeLog b/app-emacs/httpd/ChangeLog
index afee1b8ecf19..37c5fb6c0813 100644
--- a/app-emacs/httpd/ChangeLog
+++ b/app-emacs/httpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/httpd
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/ChangeLog,v 1.13 2007/02/21 21:32:17 peper Exp $
+# Copyright 2002-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/ChangeLog,v 1.14 2014/02/21 19:00:54 ulm Exp $
+
+  21 Feb 2014; Ulrich Müller <ulm@gentoo.org> httpd-1.1.ebuild:
+  Update ebuild to EAPI 5. Specify LICENSE more precisely.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-emacs/httpd/Manifest b/app-emacs/httpd/Manifest
index 60a271f6e471..9f4151056f3c 100644
--- a/app-emacs/httpd/Manifest
+++ b/app-emacs/httpd/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50httpd-gentoo.el 74 SHA256 29c0f6b0d249e0cccb204bfaf9952b35b16771887fadedda0ae3e5e7b4d3fcd6 SHA512 705c01df9836cc40616394ea2f514ccf2a9edffa7322b568a9dc17d9b844efd0e3ec0e4d6eca082a5863bc47f5926abf78f6d0cd98d3f8cc8c4309be248a6459 WHIRLPOOL 0f4f8b0831399dede9d2c3625770d5d3b696a9c37312de26dcf3f2b60ce992a40f5e3b361a84322f1905ab1d8a894287321d96ae58ca9df4aa04e2030981468e
+AUX 50httpd-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 DIST httpd-1.1.tar.gz 3770 SHA256 e94aa61dada1a289eec2ea5d3d7e5056aee34064fdafdf6cbea1d5b279f2ff81 SHA512 b6078e8dd79ed4bcdabc85640ce14f556b14f82efb1429382ff75aefcd19ce586978ac79c59c4a20865fc67e103451937bc1e49dcca64dbdab4364c4e29510a2 WHIRLPOOL a6ab9b72a6cdb704333c6b73a66fec6ae279ebf6e37b0d0305f63a98a86545ed59d9becfafcdf7b713a739798499a64998b35c32345ed71e460494f248886fe8
-EBUILD httpd-1.1.ebuild 474 SHA256 4a09364b9e3d945f5b5ba2ae681c7b168a7cc3bbd4f9d1411a6726234dae404b SHA512 e5f3c3b5521bc22a24ed30261569d36d7d6018f0ea1b01f53cab8639b003fae83a097e78147e7a6b2b1c9dc1dd6b3bb705d391070bd50202843a34bd6ab83e50 WHIRLPOOL fb0339b0e40fa8160e628b44067dc9c3c0888dc82d302b1a0dc81d6ce62c45c051f677255fb355988f50dbb58ad4385d9c2239e4117ced556261d3e2cce2f81e
-MISC ChangeLog 1589 SHA256 e9ccdb4a41187d4d9d5b7e1c4019384ea9eb4773af5cdb6bc1f225891e69d878 SHA512 3000d04f632affd09f06215d513230065fcce899fe256316bcee6a2cfd40732f685c402f10e6b8dfaba6027e3e952c39b52d0745263b999b50366d5463b8caf2 WHIRLPOOL 49f516b1fd6a9f115f85431576e66c6efb6f83485e38fc586dce9a301a1731deb3cf19b5e6c06f814477066421757d6dfcb41881b6f9a7ca98d7a67ffff9c29e
+EBUILD httpd-1.1.ebuild 514 SHA256 9601e92872ee41cf3dbabddf7a1e5c4050e3b0586130269330e870268a24c6b7 SHA512 844fc63ccd863c53a12dc9570f4f9872e143cdd4f13cde040247a68a48f7a8c046f71d451060b0438cd04d7b3ce41667e440a55fb4442c20501f7642fb3373a4 WHIRLPOOL ce8712dec399b3dba60c84e1773c67c8975169a83e8bb695dd3c3c727c58782b4b06013356eff59d04fdc33dbc97a6dec4212497b773b03fd9f9d8b6190693b7
+MISC ChangeLog 1712 SHA256 f994bae4f1d493b7fb30764ef3426c78c358bbd57510f955ef9a236fe81d1d51 SHA512 ecaa722ca799609e5eba02f2a72e54259b0f3dc413883d67d5e6c3741c77f994e7efbfe74fe053f0176e48f893cda5309ef8ae89431d78fe4fc1d2df38716055 WHIRLPOOL 6e385786a87ee7721f42b0622308ab8c66f6d91a9e75fccb872fa46f2992f55c0134346a0eafba5b68af094a9a4eb0d65a147cef3918ba606847ba81906d0a65
 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)
 
-iQIcBAEBAgAGBQJP9e94AAoJEDxpGckxwJCB4IEP/Awr64AbolDV2oq2o0luq2tj
-obPM0tOyhsf31A9dG24eri9ljkZ0L0XfAizsHvYSf8k1i08jGXmhhajFXi/sCB/e
-30Kaxx6vdSVb4P4bCMzY973t7DiUcwtA2KefWQZZwkUWDOsrm3aS6wr+E3Y3CWVW
-YNVnSlyrDxOLO7Rj/xed6BqtRO9IoNylLpRWm4nFR5PgK7I5LuaGG5jQz4GsK8YP
-Q5RYZ1+1v8GVM9PhxHYLA5ntLw3lWZAArdPt9CTGpi1kiPeGz0GdlFcj6RlpDS9n
-pR1a3E49Fcuj1lAyC4OJexfWk5HJ2qsEJqbB3D2TUvUL2fPCL574hUUj0w/BFF8U
-9kBk/XP5DiIUxqnWSyRpS1SZpiZ+ddiRzcHC5CbMLFTOAiR6t5fWm1knZSVsHvk8
-/cPgIgYN5IR8TFSkCFn5mb8O/7gFHoWx9Lvk/H9oDvpQOTbVjQyolh7WzgBvNgYa
-2GPWtdWium7f11l9kdvbk+dVV5usZtRjrIeWU6/4iplW6QFeHsbl146O44fdXBQI
-z0ibbGANntQLbjNj4+fv/gl799IywKbDpeXw49BuIYaF+vRqJzj0OwRIvf8F2Jjq
-2y/7yfJYFfA0gQ7lF1RaZ4L6dByDrCMVmLe3W2Hrthfpole7yDMfC9mukMvcJ262
-qePAnFeywAviJeIFroPa
-=9/22
+iQGcBAEBCAAGBQJTB6J9AAoJEJQzkH1pP7W4UDQL/0sKx6RgjMp6HaoHsjrG9F+Q
+sLjLnSZqPqo4wt5UehXpiYC5oQ9bQoAT51ZfCBWhWDz9pLirFH3GLC5ac42sEXtv
+Ma1DAqLcIrQkxR1OxdSCuIJvJXhnPmas5ienczbgBTBJPFF7pKuGD46N4GK1w5iq
+qFcMTnGEAKM/N8xsKSINZhJTfHx5nWXhlW+jLNOBf1PFQzdE4JhgcyGGmb+je32x
+RiqWmuTK2NvhvtC7nCtdsCn6QY2kKUxcxMpC1P2LErheBCkE8qVL00oskC3UnQHj
+AcpDRA9DyQdcQ9yfULWDrEZkhsXbq6HIxN3PhiWErc54WgMTkUb2fPlZ6jsRwZPu
+lgrY2/oMzIy8evDzB4rys5t2hHZdlZgdfV+zo3uoz54OIsvY08bckxpIQl3pLSCy
+K3N27aAzlQ6hN5kOOPpIGJp6uuYzsAKK+9B33PkrYkh6uArHxGnAgzh5N3qYAfUh
+qTxV4J8/y5dFMHzyky405RdFqWV5v+VcjrrAIuBdSA==
+=tIvl
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/httpd/files/50httpd-gentoo.el b/app-emacs/httpd/files/50httpd-gentoo.el
index 072ae59d1b2f..431f7e90ae73 100644
--- a/app-emacs/httpd/files/50httpd-gentoo.el
+++ b/app-emacs/httpd/files/50httpd-gentoo.el
@@ -1,4 +1 @@
-
-;;; httpd site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/httpd/httpd-1.1.ebuild b/app-emacs/httpd/httpd-1.1.ebuild
index fc717e49ca65..6d71788d25b5 100644
--- a/app-emacs/httpd/httpd-1.1.ebuild
+++ b/app-emacs/httpd/httpd-1.1.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2006 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/httpd/httpd-1.1.ebuild,v 1.1 2006/04/27 05:58:29 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/httpd/httpd-1.1.ebuild,v 1.2 2014/02/21 19:00:54 ulm Exp $
 
-inherit elisp eutils
+EAPI=5
+
+inherit elisp
 
 DESCRIPTION="A HTTP server embedded in the Emacs"
 HOMEPAGE="http://www.chez.com/emarsden/downloads/"
+# taken from contrib/httpd.el in app-emacs/muse
 SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
 
-SITEFILE=50httpd-gentoo.el
+SITEFILE="50${PN}-gentoo.el"