Version bump, bug #217405. Remove old versions

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.22-gentoo-r2 i686

5 files changed, 20 insertions, 125 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/Manifest b/dev-util/global/Manifest
index 410ed433ea50..859b613c6004 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,11 +1,7 @@
 AUX 50gtags-gentoo.el 184 RMD160 38ffa8e74a0617fd5742eb88c9aac42c9de53edc SHA1 351967e4b6bcef1043a634de2ea3dab9724ca457 SHA256 8453e25df3e5d19222539aa8f477fc6ae1b6ac7e9fed98013c25fdf77a98e006
-DIST global-4.7.2.tar.gz 506420 RMD160 d11dda2033ce5d787747e034c94474c395e975c1 SHA1 956ad5ddddb0ee59273538961ef3b3c636449bd4 SHA256 5162f897d686cd3cc7ea478729615cc47e24496eb6a2573e69f2a8be9c78bcb4
-DIST global-5.3.tar.gz 721505 RMD160 481d87c3e9faacaca4634df4ae26ae8163ea7b0d SHA1 1ec3af70330bf54e6b555ef019878c16ee0174e8 SHA256 acd5ffe8e527853d0ec0698b9d805547c2b9f851e7caf3d32ff67c92f03e3672
-DIST global-5.6.1.tar.gz 739374 RMD160 db342c7d4a6815c598f24d87189b049f4d640485 SHA1 556391973bcc3f4b9c14d77bfcfedaff07dfa92d SHA256 8702375ed712ddd9b27295fe2094632411e526f41344c61d8a13982a46570974
 DIST global-5.6.2.tar.gz 739856 RMD160 70862a2d79ec8fe97caa63416c1c945913fe0065 SHA1 0f594e1c10ab04db6dbd3e7bd6d6e16dd3c58ffa SHA256 988f5eb7770780c4b816bf38d26fa63fe85bef7ca27fd09cfb9c64b77466cb25
-EBUILD global-4.7.2.ebuild 1115 RMD160 b88dc06b2bdd7f932c27f1e83d9bc0f59260bbfa SHA1 9f67296555b51cf90d01f3074b420c5f08def852 SHA256 5c2562f1f08fcbfa2ed0f283c8bef1a12a7dfbb793990dda7d591c7d1473d6e8
-EBUILD global-5.3.ebuild 1490 RMD160 d86adafadb2f82a90041b2a2199abed0ab271323 SHA1 0c4a4def9af930adb3070b620dd2159688db69ea SHA256 ecdf27a82d526e39775b559a51877aae9f5f977cccfe54a1d79ddd8cab308183
-EBUILD global-5.6.1.ebuild 1493 RMD160 34c8da8258e1060c0368246c65cc85dad057d78c SHA1 f1f68869cc160e686dceae9d81b000ee129070d4 SHA256 a95c6866926307b919357ca079b2b801ff35071dd74b5fbc11af81999e83e72b
+DIST global-5.7.1.tar.gz 739157 RMD160 f46bd9e7d45a2c8cb130bcbade85c0d233f9bd96 SHA1 015dce234675714c2e7fc29cb17fe559c175c5f9 SHA256 e6076a98c8a35d26e606a8995ef141c8dbfbb206034311bc3050f1a7dd0fc70e
 EBUILD global-5.6.2.ebuild 1508 RMD160 bc890483a0e1e5f962725773ff051b8bae51ea0b SHA1 9fc4d053f9305c2b9403b8701ca35fc368a86cf2 SHA256 31afd6414df7cf700e1c4414e08a89ba1f12aacb841d70c60f640459e06e1e00
-MISC ChangeLog 4115 RMD160 04305af80bb0169dcd0fdaa6a7937c793ecce850 SHA1 8423a4602a50b33b9626ee8433cc25e35d73527c SHA256 8e2ad096aa9e7efde5b8637c44f624aaa96d2bb0bd5a7f42207d653caf868bfa
+EBUILD global-5.7.1.ebuild 1511 RMD160 1fc5c411bb057fc1c845bcb3119883496163f6c2 SHA1 2a6e2cdfa237c83c0e24cbd1bd6c25bbbc90dc9c SHA256 23a4425cbcb7f1418b558ef7ddf92f19b625a57f9e07548b59f0e9f6a44d0163
+MISC ChangeLog 4332 RMD160 17f7ef436f381024169f8266c0c0959c3460b34c SHA1 15f5b5b98eb1d3f7208155ac59a75d51383239cb SHA256 b884fc078cfd7f2a63df15e76267b2ba8ad631f0e495b20ee534ad98a8e79ee7
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
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
 }