Install site file into correct location (bug #285600).

Package-Manager: portage-2.2_rc72/cvs/Linux i686

5 files changed, 14 insertions, 80 deletions

diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog
index 6ba51965ba13..64f33ac8cfdd 100644
--- a/dev-util/global/ChangeLog
+++ b/dev-util/global/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/global
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.64 2010/09/01 13:40:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.65 2010/09/01 15:02:03 jer Exp $
+
+  01 Sep 2010; Jeroen Roovers <jer@gentoo.org> -global-5.8.2.ebuild,
+  global-5.9.1.ebuild, global-5.9.2.ebuild:
+  Install site file into correct location (bug #285600).
 
 *global-5.9.2 (01 Sep 2010)
 
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 4018bbcc97d3..8db3fce1ee67 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,12 +1,10 @@
 AUX 50gtags-gentoo.el 183 RMD160 cf95e9970c71dd14fad6234ed57b8354d45ead74 SHA1 b338f4153d2cb31e8495a7b640e0e4887dc60ecd SHA256 52531e861595504a3461a483dfc05520acef423932e273cd26461aee66082428
 AUX global-5.9.2-localstatedir.patch 641 RMD160 53c6c4248c5549538cfc9862c01a86dbfe9e9fcd SHA1 016d445f12bb88addea6582f2ae24535592b4417 SHA256 f28b861bb5a2531b0aaf3b5cc9ca21bfd8a27b8c5f7d4b85ac06dcea9ab54d7b
-DIST global-5.8.2.tar.gz 1122085 RMD160 d9945fc6924ed126fc854655dfdd5ff56d37db3b SHA1 301f6529a93aa7fdb841c9b3cab0291891fb19b1 SHA256 d0e95765952927a8147ff7ef2ffb1fd787f687cee8f8f61e7138531c4e9b7996
 DIST global-5.9.1.tar.gz 1135370 RMD160 4361fe1a054e99113e5b82a225a1cf5a4616021d SHA1 f19fa4abbf5fabf48b5e841f31c70f35b5375193 SHA256 0d6e63aefef918493c9d710db0a4cd6f6ac1e374ac1f8c85c428a54f3f44af42
 DIST global-5.9.2.tar.gz 1136242 RMD160 90b7a41b2e9983f97c9399169a6a8ed6ce5965e6 SHA1 31ede49e75f7619b91d7483956ffd88e2e3bdf55 SHA256 55e32a188d91862d69ea6fb607c060bef59c72b289bd221285dc9dcaf852dcac
 DIST global-5.9.tar.gz 1064325 RMD160 f8fd47445614ace3f6d87d8ca1f405d889b63eb3 SHA1 4489b8e41aabfb6087be91ce37f8795718e00307 SHA256 b98d8da814a56c0b4051c69bc643003d54a7ec5daa89c4723abbce24b7c23b7e
-EBUILD global-5.8.2.ebuild 1565 RMD160 d2fad0fe93dec1f1794a593f84e99dc8a3ea947d SHA1 17953c4750f7a9394e29c402d8c05721376a1113 SHA256 02b8d97df46efe484f89076f9c63dcf12210ed7a6923e7bc40a023fda4ae7e9d
-EBUILD global-5.9.1.ebuild 1515 RMD160 cb196a42bea70707e75592aad261352e40e93150 SHA1 c1138e33aba62632aa5d604ddc0bf8c2ff184acd SHA256 2e716ba44f3ed7eca283605ccd84cd33934420099cb5976003cc31049ab50bf3
-EBUILD global-5.9.2.ebuild 1599 RMD160 020dc4c993830aeacbf03acfbb2d872da6ef6016 SHA1 bb3d545f16dcc89eb73931002a24b6e03a01a35d SHA256 54fe6cfa11834114b0ba93270284da87b2419da7c2ebc9c39db7d9f51f2447b2
+EBUILD global-5.9.1.ebuild 1524 RMD160 2d832c5e0ae1a4df8f437e1d671d067554d8fcd5 SHA1 af012c303e0c70db60fab5b58c965a919f39219c SHA256 5cc1083af2c30878aa7cabef2460d92dc8524f385942cef32ab9ece48ac19e38
+EBUILD global-5.9.2.ebuild 1613 RMD160 906158a2f93f96dc9a467cc1050b81cd9e697f5e SHA1 25cbea4af047faee8d673dbe2d4d370541402d61 SHA256 344f226eafbc45700185c225dad742e777b2cd8ec0e179bef9476e9b60d9a7d6
 EBUILD global-5.9.ebuild 1506 RMD160 faca7ac0e5abaf134427664dfb5a8377d9c4b988 SHA1 daeeb88f4ad63b6546995aa18448bc781d87a94f SHA256 d977ba70bd6a78c3a90c102c739df593c450b8a113d4026a872b54101da89649
-MISC ChangeLog 8473 RMD160 88573bd08f79c40b690b648c3b3da892468bbbd4 SHA1 162836ec1cc10cbe29c6043ec3a4038959db1f57 SHA256 7a4fac953445a2e1fcaef423fedc8bf0ddfa655f399923bc617a3816e2c9b441
+MISC ChangeLog 8644 RMD160 5edcf74df74f72be56eb9ebe9a5d509385636631 SHA1 f7a8f16721d4902a387506d15a9fa902259490e9 SHA256 f81a23a4a1c84dda16455df9f978725c93c36ac58f0dca9f9248022542e3cc8f
 MISC metadata.xml 335 RMD160 e2e75309d1811e3cf2e6f49bdde6c57cc1de697b SHA1 02d6463eceaa26a6d3400d81ead282021e08465e SHA256 586345abd8dffd3fa55b0fbde0957a1756f674637eaa3e61c19add5ac8ad1709
diff --git a/dev-util/global/global-5.8.2.ebuild b/dev-util/global/global-5.8.2.ebuild
deleted file mode 100644
index aa09d4412c21..000000000000
--- a/dev-util/global/global-5.8.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.8.2.ebuild,v 1.4 2010/06/04 10:30:24 phajdan.jr Exp $
-
-EAPI="3"
-
-inherit elisp-common
-
-DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources."
-HOMEPAGE="http://www.gnu.org/software/global/global.html"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="doc vim emacs"
-
-RDEPEND="vim? ( || ( app-editors/vim app-editors/gvim ) )
-	emacs? ( virtual/emacs )"
-DEPEND="${DEPEND}
-	doc? ( app-text/texi2html sys-apps/texinfo )"
-
-SITEFILE="50gtags-gentoo.el"
-
-src_compile() {
-	if use doc; then
-		texi2pdf -q -o doc/global.pdf doc/global.texi
-		texi2html -o doc/global.html doc/global.texi
-	fi
-
-	if use emacs; then
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc; then
-		dohtml doc/global.html
-		[[ -f doc/global.pdf ]] && dodoc doc/global.pdf
-	fi
-	dodoc AUTHORS FAQ NEWS README THANKS
-
-	insinto /etc
-	doins gtags.conf
-	insinto /usr/share/${PN}
-	doins gtags.pl globash.rc
-
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins gtags.vim
-	fi
-
-	if use emacs; then
-		elisp-install gtags *.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/global/global-5.9.1.ebuild b/dev-util/global/global-5.9.1.ebuild
index 85118880fc42..84e0183cef17 100644
--- a/dev-util/global/global-5.9.1.ebuild
+++ b/dev-util/global/global-5.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.9.1.ebuild,v 1.1 2010/07/19 23:23:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.9.1.ebuild,v 1.2 2010/09/01 15:02:03 jer Exp $
 
 EAPI="3"
 
@@ -54,8 +54,8 @@ src_install() {
 	fi
 
 	if use emacs; then
-		elisp-install gtags *.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} *.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 }
 
diff --git a/dev-util/global/global-5.9.2.ebuild b/dev-util/global/global-5.9.2.ebuild
index 8e458a16f888..da60cef92502 100644
--- a/dev-util/global/global-5.9.2.ebuild
+++ b/dev-util/global/global-5.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.9.2.ebuild,v 1.1 2010/09/01 13:40:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.9.2.ebuild,v 1.2 2010/09/01 15:02:03 jer Exp $
 
 EAPI="3"
 
@@ -59,8 +59,8 @@ src_install() {
 	fi
 
 	if use emacs; then
-		elisp-install gtags *.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} *.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 }