Added HAVE_MEMSET patch to support building on Gentoo/*BSD; Add ~x86-fbsd keyword; Resolves Bug #129128.

(Portage version: 2.1_pre7-r4)

5 files changed, 110 insertions, 11 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index 34383472fd5e..0eefd525dd35 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cscope
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.56 2006/02/06 03:36:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.57 2006/04/08 21:19:56 mkennedy Exp $
+
+*cscope-15.5-r5 (08 Apr 2006)
+
+  08 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/cscope-15.5-memset.patch, +cscope-15.5-r5.ebuild:
+  Added HAVE_MEMSET patch to support building on Gentoo/*BSD; Add ~x86-fbsd
+  keyword; Resolves Bug #129128.
 
   06 Feb 2006; Aron Griffis <agriffis@gentoo.org> cscope-15.5-r4.ebuild:
   Mark 15.5-r4 stable on alpha
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index eefcd7b04481..5abfa509001e 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e869ae0218813310568edc9601dac573 ChangeLog 7186
 RMD160 b60003cbb4e0eab3bccdaca5b6d0a6ba0b0a81c4 ChangeLog 7186
 SHA256 edc03d07fd05627c9e415001cb8252308c5f9798b6fc5843511de6b048ae07e3 ChangeLog 7186
@@ -10,6 +7,9 @@ SHA256 1b82defef00ec817e8be552fa50536e7f31bac0567e7bf03301a42615aac3cef cscope-1
 MD5 8975f3f6251cde8893710176ba9189f1 cscope-15.5-r4.ebuild 1732
 RMD160 379bf3143a7248a7df951a929478642e25a400f2 cscope-15.5-r4.ebuild 1732
 SHA256 f2e26e41cfedadc77b9e487b51e58492903dcbed2c75742881c5276b6766bd0a cscope-15.5-r4.ebuild 1732
+MD5 8db3c80a8e6e6b78a23f016ee28b170d cscope-15.5-r5.ebuild 1824
+RMD160 1e0b5c432a376bc16c0c15fe71a929d6df194886 cscope-15.5-r5.ebuild 1824
+SHA256 3407bf54166da262dce2f30e215bc1fb8d15526d7d8bd8bed2a772e310db4ada cscope-15.5-r5.ebuild 1824
 MD5 22e8d669b78f301c45e9075e2793dfd3 files/15.5-noclobber-tempfile-rexotec.patch 1055
 RMD160 7ed807c7946ca134cbaee89bb3eb4c03e5c0bbf9 files/15.5-noclobber-tempfile-rexotec.patch 1055
 SHA256 c5cd253327e131825c6d6620a5683a4e1ab0a2f6b41906fe8009ab0e5dfef522 files/15.5-noclobber-tempfile-rexotec.patch 1055
@@ -22,6 +22,9 @@ SHA256 827984ff55ccb2fec0f3641027485e3161587d15f4ea7078a29fd6769d662cca files/cs
 MD5 38db4f8e35aac0bbea3287c6deb5f644 files/cscope-15.5-gcc295.patch 685
 RMD160 2bc68fd0c6c436b86c92550d8dcd71fbfabe8ef1 files/cscope-15.5-gcc295.patch 685
 SHA256 0e77a0d037a81c5d4fe035bc4021a3bf2f06770e827f9fb0985156579dd3cc2b files/cscope-15.5-gcc295.patch 685
+MD5 cb92cc645956e1c1c2dd4bbee987f477 files/cscope-15.5-memset.patch 410
+RMD160 6bbecad930ecb1a5652229a0e2c39aac88b25ac8 files/cscope-15.5-memset.patch 410
+SHA256 3cf28093f03554a758991f656d64e19f04f0de5442d2dee46b6c4bd15df8cf47 files/cscope-15.5-memset.patch 410
 MD5 9df689ed914642c87166dd98eafb5017 files/cscope-15.5-prog-info.patch 638
 RMD160 7ef9aa309f8196b2f1ff85533c43e2b3550b3cda files/cscope-15.5-prog-info.patch 638
 SHA256 6e3d6afc3259e9af29ed8b383a808b768e77395685d6a20932485996c5197822 files/cscope-15.5-prog-info.patch 638
@@ -34,13 +37,9 @@ SHA256 dbb30746575f40d28f13b0f00f17587c9d94102c85cde57c4038d3f6c44ae05f files/di
 MD5 4b40350acbcab41cabb7e20f19243dd1 files/digest-cscope-15.5-r4 235
 RMD160 b64d39e0c116defb66f2fedd959b04164a5474d0 files/digest-cscope-15.5-r4 235
 SHA256 c5ecf545ac3d96b8d1500621f91cdb18af0ba795ad672d464126b1190ca8b70d files/digest-cscope-15.5-r4 235
+MD5 4b40350acbcab41cabb7e20f19243dd1 files/digest-cscope-15.5-r5 235
+RMD160 b64d39e0c116defb66f2fedd959b04164a5474d0 files/digest-cscope-15.5-r5 235
+SHA256 c5ecf545ac3d96b8d1500621f91cdb18af0ba795ad672d464126b1190ca8b70d files/digest-cscope-15.5-r5 235
 MD5 79094d1585cb050b3855fbfe440f22b9 metadata.xml 790
 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 metadata.xml 790
 SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8 metadata.xml 790
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5sRDJrHF4yAQTrARAqBZAKCDq/LHiiy61F4IcbrEDwjMQFFiawCgmIZR
-yowebOegno9tfmxGHWjGB0k=
-=kK9Z
------END PGP SIGNATURE-----
diff --git a/dev-util/cscope/cscope-15.5-r5.ebuild b/dev-util/cscope/cscope-15.5-r5.ebuild
new file mode 100644
index 000000000000..1a0b4bf7b23b
--- /dev/null
+++ b/dev-util/cscope/cscope-15.5-r5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.5-r5.ebuild,v 1.1 2006/04/08 21:19:56 mkennedy 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+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}
+
+	#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
+
+	# BSD memset test (Bug #129128)
+	epatch ${FILESDIR}/${P}-memset.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/files/cscope-15.5-memset.patch b/dev-util/cscope/files/cscope-15.5-memset.patch
new file mode 100644
index 000000000000..881e6e667dc3
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.5-memset.patch
@@ -0,0 +1,13 @@
+Index: cscope-15.5/src/egrep.y
+===================================================================
+--- cscope-15.5.orig/src/egrep.y
++++ cscope-15.5/src/egrep.y
+@@ -605,7 +605,7 @@ done:	(void) fclose(fptr);
+ 
+ /* FIXME HBB: should export this to a separate file and use
+  * AC_REPLACE_FUNCS() */
+-#if BSD
++#ifndef HAVE_MEMSET
+ /*LINTLIBRARY*/
+ /*
+  * Set an array of n chars starting at sp to the character c.
diff --git a/dev-util/cscope/files/digest-cscope-15.5-r5 b/dev-util/cscope/files/digest-cscope-15.5-r5
new file mode 100644
index 000000000000..c58257c280e7
--- /dev/null
+++ b/dev-util/cscope/files/digest-cscope-15.5-r5
@@ -0,0 +1,3 @@
+MD5 beb6032a301bb11524aec74bfb5e4840 cscope-15.5.tar.gz 243793
+RMD160 30623f07043abc90d76b384c407abe5813a8a716 cscope-15.5.tar.gz 243793
+SHA256 be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 cscope-15.5.tar.gz 243793