Don't initialise ebuild-mode-portdir from PORTDIR any more, which allows using the default of elisp.eclass for most functions. Specify LICENSE more precisely. Remove old.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

6 files changed, 30 insertions, 117 deletions

diff --git a/app-emacs/gentoo-syntax/ChangeLog b/app-emacs/gentoo-syntax/ChangeLog
index 2cff19154e42..344da77358e0 100644
--- a/app-emacs/gentoo-syntax/ChangeLog
+++ b/app-emacs/gentoo-syntax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/gentoo-syntax
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.81 2012/07/01 18:16:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/ChangeLog,v 1.82 2012/09/22 13:20:16 ulm Exp $
+
+  22 Sep 2012; Ulrich Müller <ulm@gentoo.org> files/50gentoo-syntax-gentoo.el,
+  -gentoo-syntax-1.17.ebuild, -gentoo-syntax-1.18.ebuild,
+  gentoo-syntax-1.19.ebuild:
+  Don't initialise ebuild-mode-portdir from PORTDIR any more, which allows
+  using the default of elisp.eclass for most functions. Specify LICENSE more
+  precisely. Remove old.
 
   01 Jul 2012; Raúl Porcel <armin76@gentoo.org> gentoo-syntax-1.19.ebuild:
   alpha/ia64/sparc stable wrt #417305
diff --git a/app-emacs/gentoo-syntax/Manifest b/app-emacs/gentoo-syntax/Manifest
index 0fe047b33c44..f2b39e22e219 100644
--- a/app-emacs/gentoo-syntax/Manifest
+++ b/app-emacs/gentoo-syntax/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50gentoo-syntax-gentoo.el 794 SHA256 ed5ea6da36d6e08cfa10615f1ebe8e99339a37c1f8d4f00c1c6fa68ff6a0ce14 SHA512 1470d86d9005ba662f523e26e0d915c991ea1f66d1cad3931ec48fc252f40009c53c1aad8bda2b536255c687408ee94b06e10120f68a43f4a0d5786e56d329e0 WHIRLPOOL 98002dbfd05cfb6c96067c032cefb2ac21ea364875e3f625134d25bd38b52bde369f5036c678168155621da794b1d5bf593868de6cbc2eadb540fff73cff2c5e
-DIST gentoo-syntax-1.17.tar.bz2 20238 SHA256 fe5743de2cb2326448eba9335f4c64e07a84269ec9703fb8a3b89522241b4b33 SHA512 0dae232ec969c6bbfcbeddab38fb80c567555c0429f56744b793676979ca292f7c499e05585b82f3d35a09b1b3eaef7c9786dbfef2c9b6da230bca6e537b18c4 WHIRLPOOL 478da7190297acdcb23c09b1b2daa4d23fe3740c1996882bce513d125c2d0eaa8048e63ae31e78304ab6d86460284c0401ab150e1b5f25c218fbac2a4e01e56c
-DIST gentoo-syntax-1.18.tar.bz2 20819 SHA256 c05a935ce7803595a888c77c37c2f16dd9fe5da31418bc8f9b5940be9c08fb14 SHA512 c7786f2abb9765fdc7b3d59e7cf46e01fa1d8e7bc7a21af17a61b4fd3968f9471a023c75d09330c4bab33c0e8cdaa4e58f1c80a05e118fece89ddddb98a8aa13 WHIRLPOOL ea5d726b65f581ac6018c08fa7180c91c805ce0b20245e8b829fa4b406b993477617325c00886482d098ba6cfc54799e4f955e0a1042d4bea235ad3c8e1bd778
+AUX 50gentoo-syntax-gentoo.el 754 SHA256 86461009121d7190a0ff0826b0740649e04183abac5a7f272670b4df3bee29d8 SHA512 cd47f38b204fe62f6f14b2a90720698863467cfeccd37f2b9207b62f097fb2b8e8f69ab148ee06c55261e7b9061a48a4540a9305dba5ba67b79c9929ef278659 WHIRLPOOL d913f2f841d45f82e8dd8fb8ba00833e28daa153cbc96d386f7854ab2bd217e713de954c223d8c5cddeaa84096da6da79e5392a5a05fbf6274da6e570a8383c6
 DIST gentoo-syntax-1.19.tar.bz2 21385 SHA256 d20b5f13118d7823f5fed194c43decf322fb4ff3a05a7b63c46a9f001307b058 SHA512 ae745375cd4737fe4fa51be2d26c06b0579018b16963cad173af0721cd8a278f7c294fac4eeea9cdd57a41ca20892cdcf988da54049005a2e9aab13c58fdb9fd WHIRLPOOL 1d3883761bb1255021ba7fb2871b7d8edb75785e1a01ab0c5f1165827665dc58e41da6bd89a174c3c38adecd67d1ee6ffaee6648aab3f9c60e52a82b85b5d858
-EBUILD gentoo-syntax-1.17.ebuild 1123 SHA256 24e068ea07f9e60c682eeda691d7f0741abe8c7f42cd21a0056ae1e5d4e2780f SHA512 f197583f7029f7a4ca59b07bebf1e61d9dfec71775b875863ddce5516b8e6a98f2ad8d1b8871438f204dc6696bae84d03a59a70d7f763673f9a7e8013c6a4664 WHIRLPOOL 0099f97d75cbd0f9b0d82ecaa0ceba69af7fd7c531f22819bb85cb1fba79596d3e982e71770fc989af6b0a133401bcf95c9bec60996ea5d515249fb0a0c72e88
-EBUILD gentoo-syntax-1.18.ebuild 1146 SHA256 24e4067e3f8f213e9c7fe27ca8eee390b45f6e1a55388a8a157bc1b501e97473 SHA512 809ec37dea30a89757fae466e3261385578be7dfce0105d502ddcc1b3ef104c3ed3f99d5c05f776b7cbbb5756757b6654bea9d8a2f506545c816ce81fa0e3ba0 WHIRLPOOL 4f7ecbcde65a85c3e8814bab62355bfe2304f6235db0af27cb2070543b16d1b0ae59754cdb1bf96124c1428ad833c2d644185a82ab232b7db2e12da90cd1dd60
-EBUILD gentoo-syntax-1.19.ebuild 1138 SHA256 d353baaff1bffb5a197e3d841f1e7f2c0d427540a3aca5419343f6fd1c3c1eb4 SHA512 837c76ad54cc0c5cc79563577c3a1a9110d38c1686262871648ac96784db0f2eaf9e7c8af803ccde99980344bec5daeb8b7434478644ccaf7982e75227e95bb0 WHIRLPOOL d64a173187a772cdba08ebbc5addccd89033ddf5a5c75a6a3d9b5e139265dad70e0dbaeafd74de4a26bf23ded5200c9301b43704442d62b3730503a6f42b86e0
-MISC ChangeLog 13894 SHA256 d2a632473132e9c5903c9d74727262087586c819fdc88d5bd6deb20a563756bb SHA512 112b7a16c241c292006c5d21c463f9426ce3b5d8ee24d366ecad8a4b56011c6b93238cb1ee1149f0edeed7269b062b4de7b1fca257ac465e6f4845083fa641a5 WHIRLPOOL bdf22f3fb0efe3f732d43aabe96338106cb89fb9803d25d1c433cf73743ad23af87b179f384c391696607310460a9581705b280532593d170813140191c4f780
+EBUILD gentoo-syntax-1.19.ebuild 832 SHA256 8b1bc8f34be8a68ffca2260246e256cd0bebd3df0dd113e4b0e511dbff6d1853 SHA512 0a369754eb672d81378a688114f2891d8e1d479e38f623ce54e2e47dfbea4cae7bc7fa1da521b831d5d8ff4d5f7e0bf6084d81b76d1f6818db76468a968ca79f WHIRLPOOL 47f03f8809ec4037e91fd399a83b901fb1ee822a15ea712ea42f2f35b437217b6423afcd41162e48e9ae05ac1f4bcf8b27d2bdb2e1eb892f703af3d50106007c
+MISC ChangeLog 14235 SHA256 252495b6857222ecfdcdc693c30cdf0e171c0fc09e0337506caf6fe418f9df56 SHA512 c2b975fee7d7b9e6e380ee8af640af45b8259d99e56c21158cbf85abfdecde8f793d765c4bed150fd27ba1cda643b355e572e938e4ded9107efb8f1adba7995d WHIRLPOOL 1d4ff43644cb0d1a832869dd691f13950862a9ba9adb1c6d6a4ee652be1e66516290162a22528dc42b8ebdd2f0e8f3118cb57bc56933fee1ff0370ceafdfe226
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e6wAAoJEDxpGckxwJCBs3EP/AkXIYHtQxGp+2o9RkArGfcF
-/rSNMEryvcEAPniG6eFWT6pMdFvwRyy49tomfegDny1P9BwjN70mjQZcdLZG/jKs
-JlLGEu4KRCbWPJurwl61w0joHnW/npuiN+73iJED51wp5fW8HvvtbUDqKh2KzoPs
-zDSlwGUIC2rvdrNAwoQ5YGhKF0UkYOqPLb7bX3oIGFGSTXN6KN+td5eEUd0u4p2k
-rS74QEWNKWW8BFEzkiSimDbkP+2Bi/xU+UT4LUGQLNSLeq6tnOnyh6KPigXJff7S
-0w81VtwQK4ZI7zuKLdwDlQ0bpfer/CkZeEoFL9LRu+3NZOx+WoxG4MWSKtoONCa2
-EglY14BslV749lGgDdQy2ZiAVSAarsqmeNLPPdGVUIheI6H7GUD9w6mSIstC3yi/
-qgRCmtbUe7tM7jQtHSFmokpW2tdHYxZi196W4qoxcfUF4/PvzvavRNLkMcEBp+uw
-GzdFsPtXrFh2KFXnVDwY2w9jfwsBWcLRp2wN8+GjgFc/s6CLT2j4GR44uSmcltL+
-8xSHrf1Pgm8TgPViqQSV7ZPTT6XwpBkp5KA58kLaJoaPWaahgZgV3zeuxXXjqOht
-59fMWV1tYLan7iUmS8gEXd2DMf0f5DYQluozOq9sE1DJlzX/O8QaIVZEr7fhl/PS
-gvu86LiL+NI/J2Isxcfm
-=1LdI
+iQIcBAEBCAAGBQJQXb0lAAoJEDxpGckxwJCBf8wQAMD66K47rnFNGKZ2phJoRZ9k
+OGab5y4gL19tD28dLWijK952w+4byVfLCGHzGiuztk/2YFvNMpSJWCfdVT3Atjyn
++ut0tuok6+mCvhV369chQrppcVzqnE9kTHoMm1aPurBMAJQ4045AG8hx1/yOVdhU
+JK+TaKZtxMlMIdFnOmal2KNy6BXnCu+KQ1Ept9qNUyaXdQjA0unDYj0ZR3+dOf10
+XvEQjR9R3QQ93++cYHU4vwV/yG3ylslev44faDkyp9wJkfKiHdxbJQwha12lMi/R
+ecJUH2tnxpv7NQLF5zg2yWJ59QH9sAl1Z1CdjQqvt0o1Pc3ppkrhmCuJY4bsYFFY
+Rn4v9atrDW8XUY7CvsSOPevqDzvO+tFI9bmhlUdgu3Ikb2Jo54Whc+3du4Gn7GNo
+ZYorWAdS9YN+4eYuLH6KjS6UrZxzJACf8hZ9JsXcuewrwBOongXp1p99mm2ygfmz
+kwu/z7MtHMF+bDHgwgd1d4a102FBsGu8FG9cm2HU0ECWzk2jG+e4BhbP5QonQ3EO
+Pp7Gtcc4cNupzm8QtnqqnxbVGdTLVyLPXiVH370g5qduSeXhx4wgVCp+GWmTvl7h
+HJw+i18V2tQSRHVKT5wEZ/iVLC+TafRNOZADotiQPhVr/XtTNFU1E+22YJJxdcsk
+f0z+hZDWsC2UP2quEV8H
+=lxaj
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
index ad4568a1d82d..382e284e25e5 100644
--- a/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
+++ b/app-emacs/gentoo-syntax/files/50gentoo-syntax-gentoo.el
@@ -14,5 +14,3 @@
 (add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
 (modify-coding-system-alist
  'file "\\.\\(ebuild\\|eclass\\|eblit\\|eselect\\)\\'" 'utf-8)
-
-(setq ebuild-mode-portdir "@PORTDIR@")
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.17.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.17.ebuild
deleted file mode 100644
index 7bf312800bf8..000000000000
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.17.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.17.ebuild,v 1.6 2010/09/29 15:55:37 jer Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-DOCS="ChangeLog"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	makeinfo gentoo-syntax.texi || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc || die
-	sed -e "s:@PORTDIR@:${PORTDIR}:" \
-		"${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	doinfo gentoo-syntax.info || die
-	dodoc ${DOCS} || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Some optional features may require installation of additional"
-	elog "packages, like app-portage/gentoolkit-dev for echangelog."
-}
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.18.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
deleted file mode 100644
index 1abc25a02447..000000000000
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.18.ebuild
+++ /dev/null
@@ -1,38 +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/gentoo-syntax/gentoo-syntax-1.18.ebuild,v 1.2 2011/01/18 18:42:52 grobian Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DOCS="ChangeLog"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	makeinfo gentoo-syntax.texi || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc || die
-	sed -e "s:@PORTDIR@:${PORTDIR}:" \
-		"${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	doinfo gentoo-syntax.info || die
-	dodoc ${DOCS} || die
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Some optional features may require installation of additional"
-	elog "packages, like app-portage/gentoolkit-dev for echangelog."
-}
diff --git a/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild b/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
index 5a1a32e65eb5..ff31d5473500 100644
--- a/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
+++ b/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.6 2012/07/01 18:16:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gentoo-syntax/gentoo-syntax-1.19.ebuild,v 1.7 2012/09/22 13:20:16 ulm Exp $
+
+EAPI=4
 
 inherit elisp
 
@@ -8,28 +10,14 @@ DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
 DOCS="ChangeLog"
+ELISP_TEXINFO="${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
-src_compile() {
-	elisp_src_compile
-	makeinfo gentoo-syntax.texi || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc || die
-	sed -e "s:@PORTDIR@:${PORTDIR}:" \
-		"${FILESDIR}/${SITEFILE}" >"${T}/${SITEFILE}" || die
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-	doinfo gentoo-syntax.info || die
-	dodoc ${DOCS} || die
-}
-
 pkg_postinst() {
 	elisp-site-regen