build progress patch

(Portage version: 2.0.51.22-r2)

9 files changed, 42 insertions, 145 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index 79d3c14d17f8..ec90df284316 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cscope
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.47 2005/02/07 00:17:53 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.48 2005/07/19 19:27:08 carlo Exp $
+
+*cscope-15.5-r4 (19 Jul 2005)
+
+  19 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/cscope-15.5-prog-info.patch, -cscope-15.5.ebuild,
+  -cscope-15.5-r1.ebuild, -cscope-15.5-r2.ebuild, +cscope-15.5-r4.ebuild:
+  build progress patch, clean up
 
   06 Feb 2005; Joshua Kinard <kumba@gentoo.org> cscope-15.5-r3.ebuild:
   Marked stable on mips.
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 4a9898a1ea8e..a2ca1238eb36 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,15 +1,12 @@
-MD5 db3d07cc43f2d5c8332938eeb80224db ChangeLog 6164
-MD5 54a37263612a678007976f4271de25fd cscope-15.5-r1.ebuild 1603
-MD5 b64a9d7f69e1ed86aa9b8b4a9774ea3f cscope-15.5-r2.ebuild 1651
 MD5 e996540d4833ca538c4f8e02bf0d9d41 cscope-15.5-r3.ebuild 1643
-MD5 dee0632935c71c74ed456012cc9b7993 cscope-15.5.ebuild 1419
+MD5 ca204318c2b500973c3bbd0dae37af2d ChangeLog 6411
 MD5 79094d1585cb050b3855fbfe440f22b9 metadata.xml 790
-MD5 22e8d669b78f301c45e9075e2793dfd3 files/15.5-noclobber-tempfile-rexotec.patch 1055
-MD5 28ddc553966bf7045758be324600f5c8 files/50xcscope-gentoo.el 95
+MD5 01f628527f83f3e902df5b948f8b9cc7 cscope-15.5-r4.ebuild 1641
 MD5 c8aeadd309e54712241dec1b77072cbb files/cscope-15.5-can-2004-0996.patch 1125
-MD5 38db4f8e35aac0bbea3287c6deb5f644 files/cscope-15.5-gcc295.patch 685
+MD5 28ddc553966bf7045758be324600f5c8 files/50xcscope-gentoo.el 95
+MD5 9df689ed914642c87166dd98eafb5017 files/cscope-15.5-prog-info.patch 638
 MD5 6b8c74fb664bfaada3d95003f6c1134a files/cscope-15.5-tempfile.patch 2817
-MD5 25ad9fe446a7cabf4c482bbe150c7eaa files/digest-cscope-15.5 63
-MD5 25ad9fe446a7cabf4c482bbe150c7eaa files/digest-cscope-15.5-r1 63
-MD5 25ad9fe446a7cabf4c482bbe150c7eaa files/digest-cscope-15.5-r2 63
 MD5 25ad9fe446a7cabf4c482bbe150c7eaa files/digest-cscope-15.5-r3 63
+MD5 25ad9fe446a7cabf4c482bbe150c7eaa files/digest-cscope-15.5-r4 63
+MD5 22e8d669b78f301c45e9075e2793dfd3 files/15.5-noclobber-tempfile-rexotec.patch 1055
+MD5 38db4f8e35aac0bbea3287c6deb5f644 files/cscope-15.5-gcc295.patch 685
diff --git a/dev-util/cscope/cscope-15.5-r2.ebuild b/dev-util/cscope/cscope-15.5-r2.ebuild
deleted file mode 100644
index c180a274e572..000000000000
--- a/dev-util/cscope/cscope-15.5-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5-r2.ebuild,v 1.8 2005/02/03 22:11:35 ciaranm Exp $
-
-inherit gnuconfig elisp-common eutils
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ppc sparc mips alpha ~arm hppa amd64 ia64 ~s390 ppc64"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50xcscope-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Gentoo Bug #71595, http://www.rexotec.com/advisory/RX171104.html
-	epatch ${FILESDIR}/${PV}-noclobber-tempfile-rexotec.patch
-	epatch ${FILESDIR}/${PN}-${PV}-can-2004-0996.patch
-}
-
-src_compile() {
-	gnuconfig_update
-
-	# This fix is no longer needed as of cscope-15.5 which now should
-	# work with bison directly.	 (04 Feb 2004 agriffis)
-	#sed -i -e "s:={:{:" src/egrep.y
-
-	econf || die
-	make clean || die
-	emake || die
-
-	if use emacs ; then
-		cd ${S}/contrib/xcscope || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die
-	dodoc NEWS AUTHORS TODO ChangeLog INSTALL README* || die
-
-	if use emacs ; then
-		cd ${S}/contrib/xcscope || die
-		elisp-install xcscope *.el *.elc || die
-		elisp-site-file-install ${FILESDIR}/${SITEFILE} xcscope || die
-		dobin cscope-indexer || die
-	fi
-	cp -r ${S}/contrib/webcscope ${D}/usr/share/doc/${PF}/ || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.5-r1.ebuild b/dev-util/cscope/cscope-15.5-r4.ebuild
index 9c1df7fc961f..f616008f57eb 100644
--- a/dev-util/cscope/cscope-15.5-r1.ebuild
+++ b/dev-util/cscope/cscope-15.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5-r1.ebuild,v 1.2 2005/02/03 22:11:35 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5-r4.ebuild,v 1.1 2005/07/19 19:27:08 carlo Exp $
 
 inherit gnuconfig elisp-common eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2"
@@ -24,8 +24,15 @@ SITEFILE=50xcscope-gentoo.el
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# Gentoo Bug #71595, http://www.rexotec.com/advisory/RX171104.html
-	epatch ${FILESDIR}/${PV}-noclobber-tempfile-rexotec.patch || die
+
+	#rphillips - tempfile security patch
+	epatch ${FILESDIR}/${PN}-${PV}-tempfile.patch
+
+	# make it happy with ansi c (from azarah)
+	epatch ${FILESDIR}/${PN}-${PV}-gcc295.patch
+
+	# build progress patch  (bug 94150)
+	epatch ${FILESDIR}/${PN}-${PV}-prog-info.patch
 }
 
 src_compile() {
diff --git a/dev-util/cscope/cscope-15.5.ebuild b/dev-util/cscope/cscope-15.5.ebuild
deleted file mode 100644
index 56f1749e9634..000000000000
--- a/dev-util/cscope/cscope-15.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5.ebuild,v 1.17 2005/02/03 22:11:35 ciaranm Exp $
-
-inherit gnuconfig elisp-common
-
-DESCRIPTION="interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50xcscope-gentoo.el
-
-src_compile() {
-	gnuconfig_update
-
-	# This fix is no longer needed as of cscope-15.5 which now should
-	# work with bison directly.	 (04 Feb 2004 agriffis)
-	#sed -i -e "s:={:{:" src/egrep.y
-
-	econf || die
-	make clean || die
-	emake || die
-
-	if use emacs ; then
-		cd ${S}/contrib/xcscope || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die
-	dodoc NEWS AUTHORS TODO ChangeLog INSTALL README* || die
-
-	if use emacs ; then
-		cd ${S}/contrib/xcscope || die
-		elisp-install xcscope *.el *.elc || die
-		elisp-site-file-install ${FILESDIR}/${SITEFILE} xcscope || die
-		dobin cscope-indexer || die
-	fi
-	cp -r ${S}/contrib/webcscope ${D}/usr/share/doc/${P}/ || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/files/cscope-15.5-prog-info.patch b/dev-util/cscope/files/cscope-15.5-prog-info.patch
new file mode 100644
index 000000000000..ef43f0124560
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.5-prog-info.patch
@@ -0,0 +1,16 @@
+Index: src/build.c
+===================================================================
+RCS file: /cvsroot/cscope/cscope/src/build.c,v
+retrieving revision 1.7
+diff -u -r1.7 build.c
+--- src/build.c	30 Apr 2004 15:31:42 -0000	1.7
++++ src/build.c	1 Feb 2005 15:57:59 -0000
+@@ -365,7 +365,7 @@
+ 		for (fileindex = firstfile; fileindex < lastfile; ++fileindex) {
+ 			
+ 			/* display the progress about every three seconds */
+-			if (interactive == YES && fileindex % 10 == 0) {
++			if ((interactive == YES || verbosemode == YES) && fileindex % 10 == 0) {
+ 				progress("Building symbol database",
+ 					 (long)fileindex, (long)lastfile);
+ 			}
diff --git a/dev-util/cscope/files/digest-cscope-15.5-r1 b/dev-util/cscope/files/digest-cscope-15.5-r1
deleted file mode 100644
index 99cb973ef8e3..000000000000
--- a/dev-util/cscope/files/digest-cscope-15.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz 243793
diff --git a/dev-util/cscope/files/digest-cscope-15.5-r2 b/dev-util/cscope/files/digest-cscope-15.5-r2
deleted file mode 100644
index 99cb973ef8e3..000000000000
--- a/dev-util/cscope/files/digest-cscope-15.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz 243793
diff --git a/dev-util/cscope/files/digest-cscope-15.5 b/dev-util/cscope/files/digest-cscope-15.5-r4
index 99cb973ef8e3..99cb973ef8e3 100644
--- a/dev-util/cscope/files/digest-cscope-15.5
+++ b/dev-util/cscope/files/digest-cscope-15.5-r4