Names of emacs and xemacs eclass variables have changed, bug 406053.

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

4 files changed, 34 insertions, 34 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 657f671166d0..e09773650ca5 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.111 2012/04/28 19:00:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.112 2012/05/19 16:26:07 ulm Exp $
+
+  19 May 2012; Ulrich Müller <ulm@gentoo.org> puppet-2.7.12.ebuild,
+  puppet-2.7.13.ebuild:
+  Names of emacs and xemacs eclass variables have changed, bug 406053.
 
   28 Apr 2012; Raúl Porcel <armin76@gentoo.org> puppet-2.7.13.ebuild:
   sparc stable wrt #401857
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index ece2a1ea3bf1..c753ac5ca148 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -11,14 +11,24 @@ DIST puppet-2.7.11.gem 1846272 RMD160 2ef1c5276b70acb2ad37dce6d34ee9647ea0c62b S
 DIST puppet-2.7.12.gem 1876480 RMD160 91fad29bfcdf3944aa84cd54347c928d728ccc91 SHA1 ef1afaeec34f921c055826f33b39dc88cbb52c01 SHA256 2c96c6cba32b1b413faee8a0d96b1f33be08aca99d165ea689f06a7dc1a2bc1f
 DIST puppet-2.7.13.gem 1876992 RMD160 a300a1af4ba79ba430703bc6c71774e2dd9c2d25 SHA1 8fd974b7cb9feb5b5e70e050389a37574694aa48 SHA256 1e91ee9eed15d2ca4aba691299d1bde61de310cbcee0f1a557f9d47ffd2e0bd8
 EBUILD puppet-2.7.11.ebuild 4603 RMD160 6031cdb3689fad70fc3e45073e358360d022c1b3 SHA1 8c253f12341b378f2e98e328a42487369c7c17ae SHA256 121c1057e2ff1ba20dd2deae47ae5f87cfca075cd2e59b8172f02af8f9e7554e
-EBUILD puppet-2.7.12.ebuild 4890 RMD160 5320feaa0754538997aabcc7223679142f2790c1 SHA1 d6497f94a15254c8960cb060e6023d23b00a6864 SHA256 b1c2ca9cfa6b35a2d0c6129242eb9aafdf0a3da1962684c75aa34e57dfcca2d3
-EBUILD puppet-2.7.13.ebuild 4905 RMD160 6f43d8e8c3c14e47fd32d6dc1a78ea9a2710b367 SHA1 bdf4306acbfa29ee715398956e1f83efd0978ce8 SHA256 b27d5e6cb40da564b87eca6f947f7e1deb802a14ef86bfa02532a87a6f451f05
-MISC ChangeLog 18609 RMD160 e8f2ed9c32073000df131334c57edd66ec312762 SHA1 5155198b3000bec69dd3743fa783a2e107173147 SHA256 15296c6793f36694406d5a2f73832f379d739464d8f8b4dceb1630b329e1253b
+EBUILD puppet-2.7.12.ebuild 4617 RMD160 f5f950a3afc45506c22f626b9d2bbb699e6cda19 SHA1 723348f289a38ba60a834f3639798edc6df2c36f SHA256 04a40d8ee1ae912540c71df5162b5e4b911521c66da14ad0d2cb58c7516b540f
+EBUILD puppet-2.7.13.ebuild 4631 RMD160 f62d5812a629d3cd9289a1ff2b4baa321d491fa1 SHA1 54a6e152901e55611f820fb1b999f33eb787c056 SHA256 d39a903d64eb09ae1415bf2a69126878b97e969093fd8fe10ec5ae6377f5372d
+MISC ChangeLog 18770 RMD160 1bfd52a6b2890faba19fee4fa8d02fedcd1c71f2 SHA1 56ca17413bc5cbd84f80a7015899c28a8c742cb0 SHA256 df4d34b206487e53a0b55d079e9d274ca245c590315e240a0feb9bf51f945ab0
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+cPkAACgkQuQc30/atMkBbCgCgvGz8RaalN4deZ/GRW7v16LSa
-XdEAn21niC2OWpyFvsdK6YR//zbjNMvu
-=6mrW
+iQIcBAEBAgAGBQJPt8qtAAoJEDxpGckxwJCBYGQP/R6SEHZI2hwmITFCUAMsfrhg
+w/GzDv8v0F2c3+dCvze819GcVpgkakaZ2XU2oUY6qwjPHrbbzdir4abpPplcKrjR
+a2/VIKT1gIfByA6IytfjTR1sQDprY5fGA/UWarvYdGsrnbpJHyFzBidVBSg9r5p0
+wjFSCguhdsSnyIN6R8zWR6LOLWuLvKnjgCpazbIKU+up/418mApHKxoyJs41u6Cd
+0wTuctyOt3Jn3CPX0zYLhRrG+ZaukZgZ5kPxfbZZRbFxUbYzjgSoI3yr5VT6azMd
+68QG8+WGANzgc/dnYtd/1YT5ZZhVA97J6vnsvSJS9LzgnkCGmjxETYMg5tLCwrH0
+lN4TdHe7tsIX+tt+9+i+wqCDoiuaVExD71hULQ+VRfiIVygU8r5MAhezyzwPo+2X
+QWCp+7cOcVdESy5sEprZ59MUrh1S+1StTsLLKR0fQENcNxuyTUJLsuhYcAUNSWK5
+rZET11my3fttvZFyr9m1L3/INU3GSF4KCfS14S4NQC0FFqUX1Xz+kN9A+dwUW9xt
+4BrULpxr3W0rC3qIyjRu3Bv9Q5G2TtTof53lBPbbTOQrPBN9LDRmXozMNRfbg2hT
+pNGzlnUb4zrHY4M3kQBMaBymBOKgLyNAYRHqlyB00HRRlOvMwaEdsyC6zx5HcfQH
+rKUxwC3k1M/NAOip+NJt
+=308U
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.7.12.ebuild b/app-admin/puppet/puppet-2.7.12.ebuild
index 9395f0c6d2b5..a5c148dadbc4 100644
--- a/app-admin/puppet/puppet-2.7.12.ebuild
+++ b/app-admin/puppet/puppet-2.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.12.ebuild,v 1.1 2012/03/14 16:33:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.12.ebuild,v 1.2 2012/05/19 16:26:07 ulm Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -10,12 +10,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
 
-# bug #406053
-inherit elisp-common
-EMACS_SITELISP="${SITELISP}"
-inherit xemacs-elisp-common
-XEMACS_SITELISP="${SITELISP}"
-inherit eutils ruby-fakegem
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
 
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
@@ -116,13 +111,11 @@ all_ruby_install() {
 	fi
 
 	if use emacs ; then
-		SITELISP="${EMACS_SITELISP}"
 		elisp-install ${PN} ext/emacs/puppet-mode.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use xemacs ; then
-		SITELISP="${XEMACS_SITELISP}"
 		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
 		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
@@ -170,11 +163,11 @@ pkg_postinst() {
 		elog
 	fi
 
-	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
-	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
 }
 
 pkg_postrm() {
-	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
-	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
 }
diff --git a/app-admin/puppet/puppet-2.7.13.ebuild b/app-admin/puppet/puppet-2.7.13.ebuild
index fffc9a1bdcd3..b6f8892f5271 100644
--- a/app-admin/puppet/puppet-2.7.13.ebuild
+++ b/app-admin/puppet/puppet-2.7.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.7 2012/04/28 19:00:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.8 2012/05/19 16:26:07 ulm Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -11,12 +11,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
 
-# bug #406053
-inherit elisp-common
-EMACS_SITELISP="${SITELISP}"
-inherit xemacs-elisp-common
-XEMACS_SITELISP="${SITELISP}"
-inherit eutils ruby-fakegem
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
 
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
@@ -117,13 +112,11 @@ all_ruby_install() {
 	fi
 
 	if use emacs ; then
-		SITELISP="${EMACS_SITELISP}"
 		elisp-install ${PN} ext/emacs/puppet-mode.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use xemacs ; then
-		SITELISP="${XEMACS_SITELISP}"
 		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
 		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
@@ -171,11 +164,11 @@ pkg_postinst() {
 		elog
 	fi
 
-	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
-	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
 }
 
 pkg_postrm() {
-	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
-	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
 }