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

(Portage version: 2.2_rc72/cvs/Linux i686)

4 files changed, 11 insertions, 75 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/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
 }