version bump -- this works with our sort

7 files changed, 18 insertions, 58 deletions

diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog
index f58d1c166073..ef2aef9eb309 100644
--- a/dev-util/global/ChangeLog
+++ b/dev-util/global/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/global
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.9 2004/06/28 05:35:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.10 2004/07/02 21:17:32 seemant Exp $
+
+*global-4.7.2 (02 Jul 2004)
+
+  02 Jul 2004; Seemant Kulleen <seemant@gentoo.org> +global-4.7.2.ebuild:
+  version bump to 4.7.2 which uses the new sort arguments in coreutils 5 and
+  later. This should close out bug #43838 by Michael Labhard
+  <m.labhard@comcast.net>.  Due to the concerns in that bug, we really
+  should try and get this to stable sooner rather than later.  30 day
+  countdown begins now.
 
   28 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> global-4.6.1.ebuild:
   Added ~sparc, ~mips
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index a014025f67a0..61669735dcba 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,7 +1,5 @@
 MD5 d938a5a567a195b4379516bf21c8e926 global-4.5.ebuild 730
-MD5 716c61ab18c033916d1539595a673e50 ChangeLog 1110
-MD5 15693053738016a65bf0a06a9c3cb6d9 global-4.5.3.ebuild 1203
-MD5 ba82fb8c53b3b3ebfae14db216dc336a global-4.6.1.ebuild 1085
-MD5 6b8a9a520f090092b0e274d302e6fd63 files/digest-global-4.5.3 64
-MD5 c012ade501ea6254b3600c41cebf968d files/digest-global-4.6.1 64
+MD5 881d123fd8ac25dc90e2ff6f091292cb global-4.7.2.ebuild 1094
+MD5 ad2cae28661b7df8bf41d8639a706597 ChangeLog 1518
 MD5 0424e6fe5b2cb2d127bb8c2d358c86f0 files/digest-global-4.5 62
+MD5 e9f2d3ff22577cbeeb33f207c8660067 files/digest-global-4.7.2 64
diff --git a/dev-util/global/files/digest-global-4.5.3 b/dev-util/global/files/digest-global-4.5.3
deleted file mode 100644
index 98bfdfcdd2ad..000000000000
--- a/dev-util/global/files/digest-global-4.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e591095c42fc42c6af8a1a3a5797a5a1 global-4.5.3.tar.gz 456378
diff --git a/dev-util/global/files/digest-global-4.6.1 b/dev-util/global/files/digest-global-4.6.1
deleted file mode 100644
index a8844e15d67e..000000000000
--- a/dev-util/global/files/digest-global-4.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6430ca736a74a734b10201d28fe0a64a global-4.6.1.tar.gz 504379
diff --git a/dev-util/global/files/digest-global-4.7.2 b/dev-util/global/files/digest-global-4.7.2
new file mode 100644
index 000000000000..7200eb00b3ea
--- /dev/null
+++ b/dev-util/global/files/digest-global-4.7.2
@@ -0,0 +1 @@
+MD5 b4c9f4e693037e79323f9fc349c5fe32 global-4.7.2.tar.gz 506420
diff --git a/dev-util/global/global-4.5.3.ebuild b/dev-util/global/global-4.5.3.ebuild
deleted file mode 100644
index a329663e3cb2..000000000000
--- a/dev-util/global/global-4.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-4.5.3.ebuild,v 1.4 2004/06/25 02:33:43 agriffis 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/"
-LICENSE="GPL-2"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">=sys-libs/glibc-2.2
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
-
-src_compile() {
-
-	# Patch configure to add -lssl when using postgresql and ssl
-	if use postgres && use ssl
-	then
-		sed -i "s/-lcrypt/-lcrypt -lssl/" configure
-	fi
-
-	myconf="--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man" || die "./configure failed"
-
-	use postgres && myconf="${myconf} --with-postgres=/usr"
-
-	./configure ${myconf} || die "./configure 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-4.6.1.ebuild b/dev-util/global/global-4.7.2.ebuild
index 51d5ef4cfcd1..e48925ad653d 100644
--- a/dev-util/global/global-4.6.1.ebuild
+++ b/dev-util/global/global-4.7.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-4.6.1.ebuild,v 1.5 2004/06/28 05:35:41 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-4.7.2.ebuild,v 1.1 2004/07/02 21:17:32 seemant 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/"
-LICENSE="GPL-2"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.gnu.org/gnu/${PN}/${P}.tar.gz"
 
-KEYWORDS="~x86 ~sparc ~mips"
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~mips"
 
 DEPEND=">=sys-libs/glibc-2.2
 	postgres? ( >=dev-db/postgresql-7.1 )