Version bump, bug #217405. Remove old versions

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-gentoo-r2 i686)

4 files changed, 17 insertions, 118 deletions

diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog
index 2ab7ab182e8b..a7bfbf842f62 100644
--- a/dev-util/global/ChangeLog
+++ b/dev-util/global/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/global
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.29 2008/05/21 16:02:02 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.30 2008/06/29 17:59:26 darkside Exp $
+
+*global-5.7.1 (29 Jun 2008)
+
+  29 Jun 2008; Jeremy Olexa <darkside@gentoo.org> -global-4.7.2.ebuild,
+  -global-5.3.ebuild, -global-5.6.1.ebuild, +global-5.7.1.ebuild:
+  Version bump, bug #217405. Remove old versions
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> global-4.7.2.ebuild:
   Changed dependency for postgresql from dev-db/postgresql to
diff --git a/dev-util/global/global-4.7.2.ebuild b/dev-util/global/global-4.7.2.ebuild
deleted file mode 100644
index ffe7624ea7de..000000000000
--- a/dev-util/global/global-4.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-4.7.2.ebuild,v 1.6 2008/05/21 16:02:02 dev-zero Exp $
-
-IUSE="ssl postgres"
-
-DESCRIPTION="Global can find the locations of specified object in C, C++, Yacc, Java and assembler source files."
-HOMEPAGE="http://www.gnu.org/software/global/"
-SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-
-DEPEND=">=sys-libs/glibc-2.2
-	postgres? ( >=virtual/postgresql-server-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-src_compile() {
-	local myconf
-
-	if use postgres; then
-		myconf="--with-postgres=/usr"
-		if use ssl; then
-			# Patch configure to add -lssl when using postgresql and ssl
-			sed -i 's/-lcrypt/-lcrypt -lssl/' configure || die 'sed failed'
-		fi
-	fi
-
-	econf || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	insinto /etc
-	doins gtags.conf
-	dodoc AUTHORS COPYING INSTALL LICENSE NEWS README THANKS
-	insinto /usr/share/${PN}
-	doins gtags.el gtags.pl globash.rc
-}
diff --git a/dev-util/global/global-5.3.ebuild b/dev-util/global/global-5.3.ebuild
deleted file mode 100644
index 5b9383fd36db..000000000000
--- a/dev-util/global/global-5.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.3.ebuild,v 1.2 2007/08/27 17:15:47 armin76 Exp $
-
-inherit elisp-common
-
-DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in C, C++, Yacc, Java and assembler sources."
-HOMEPAGE="http://www.gnu.org/software/global/global.html"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="doc vim emacs"
-DEPEND="virtual/libc
-	doc? ( sys-apps/texinfo )
-	vim? ( app-editors/vim )
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50gtags-gentoo.el
-
-src_compile() {
-	econf || die "econf failed"
-
-	if use doc; then
-		texi2pdf -q -o doc/global.pdf doc/global.txi
-		texi2html -o doc/global.html doc/global.txi
-	fi
-
-	if use emacs; then
-		elisp-comp *.el || die
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	if use doc; then
-		dohtml doc/global.html
-		dodoc  doc/global.pdf
-	fi
-	dodoc AUTHORS LICENSE FAQ INSTALL 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.6.1.ebuild b/dev-util/global/global-5.7.1.ebuild
index ea62822dbfe6..05bb2bf3ff87 100644
--- a/dev-util/global/global-5.6.1.ebuild
+++ b/dev-util/global/global-5.7.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.6.1.ebuild,v 1.1 2007/08/27 17:15:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.7.1.ebuild,v 1.1 2008/06/29 17:59:26 darkside Exp $
 
 inherit elisp-common
 
-DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in C, C++, Yacc, Java and assembler sources."
+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"
@@ -12,10 +12,11 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc vim emacs"
-DEPEND="virtual/libc
-	doc? ( sys-apps/texinfo )
-	vim? ( app-editors/vim )
+
+RDEPEND="vim? ( || ( app-editors/vim app-editors/gvim ) )
 	emacs? ( virtual/emacs )"
+DEPEND="${DEPEND}
+	doc? ( sys-apps/texinfo )"
 
 SITEFILE=50gtags-gentoo.el
 
@@ -35,12 +36,12 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	if use doc; then
 		dohtml doc/global.html
 		dodoc  doc/global.pdf
 	fi
-	dodoc AUTHORS LICENSE FAQ INSTALL NEWS README THANKS
+	dodoc AUTHORS FAQ NEWS README THANKS
 
 	insinto /etc
 	doins gtags.conf
@@ -54,7 +55,7 @@ src_install() {
 
 	if use emacs; then
 		elisp-install gtags *.{el,elc}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }