Use autoload for Emacs files (#174469). Other minor fixes.

Package-Manager: portage-2.1.3.9

5 files changed, 139 insertions, 9 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index 05f71426658b..b8dfa8eff8ec 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/cscope
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.95 2007/02/15 10:21:00 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.96 2007/09/21 08:46:34 ulm Exp $
+
+*cscope-15.6-r2 (21 Sep 2007)
+
+  21 Sep 2007; Ulrich Mueller <ulm@gentoo.org> +files/50cscope-gentoo.el,
+  +cscope-15.6-r2.ebuild:
+  Fix Emacs support: Use autoload (bug #174469); install files in standard
+  location ${SITELISP}/${PN}. Don't install licence and CVS directories with
+  webcscope documentation. Add GPL-2 to "LICENSE" since it applies to xcscope
+  and webcscope. Add some quotes and some messages to die commands.
 
   15 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   -cscope-15.5.20060927.ebuild, -cscope-15.5.20060927-r1.ebuild,
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 8edf4457712c..3e66750f892b 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 50cscope-gentoo.el 1479 RMD160 bcb0f315b4eea044e6360cb003405ef595064227 SHA1 fc5951c1084e7417e3eb0cf642803ca0122cfab9 SHA256 33790fe4a8961cd90209f8f42583626fcd8a7db3fd849c91c2bd4fe2e824ad6f
+MD5 d3a9049860b0244a2b9a41b942c4dc78 files/50cscope-gentoo.el 1479
+RMD160 bcb0f315b4eea044e6360cb003405ef595064227 files/50cscope-gentoo.el 1479
+SHA256 33790fe4a8961cd90209f8f42583626fcd8a7db3fd849c91c2bd4fe2e824ad6f files/50cscope-gentoo.el 1479
 AUX 50xcscope-gentoo.el 95 RMD160 427fc486b902b6fb57e6524c747a51403993f02f SHA1 c051e28d49967d6f590c9098f3aa99b1fa8508cd SHA256 65f0256a47f6df2d724ab665906965348295ddb14b8f8f153335933c60de5c7e
 MD5 28ddc553966bf7045758be324600f5c8 files/50xcscope-gentoo.el 95
 RMD160 427fc486b902b6fb57e6524c747a51403993f02f files/50xcscope-gentoo.el 95
@@ -14,10 +18,14 @@ EBUILD cscope-15.6-r1.ebuild 1471 RMD160 88950db9a97ddc91924d121ac0fc37503bb12ad
 MD5 5344fe9338dcc140088ee7313ad99a1d cscope-15.6-r1.ebuild 1471
 RMD160 88950db9a97ddc91924d121ac0fc37503bb12ade cscope-15.6-r1.ebuild 1471
 SHA256 d0f1cd08344afbd1dff60cf2e5141955d63634749fb8e4e0ad02c8b50f6ae3c2 cscope-15.6-r1.ebuild 1471
-MISC ChangeLog 12629 RMD160 8d3756cd3a1711fb083c1b447e3b2e2f45855b2f SHA1 28c9f0bfdbe75a81a311cdd60ac7a6b940cfa261 SHA256 afd5321e4c42c87878a7199506292902a79091b6305b56067cd9821c5658d8b0
-MD5 221694c9ebf7512104b0e2421f6fe76f ChangeLog 12629
-RMD160 8d3756cd3a1711fb083c1b447e3b2e2f45855b2f ChangeLog 12629
-SHA256 afd5321e4c42c87878a7199506292902a79091b6305b56067cd9821c5658d8b0 ChangeLog 12629
+EBUILD cscope-15.6-r2.ebuild 1782 RMD160 662189a3d64cc9bc9a81ddd1d0be5fe90a780772 SHA1 7aaef49ca929ac06f53a49886090b3f427564694 SHA256 ff11a09f67e2cb658774c88de64e55bb939b40f34d88b1202f2002ff8e1e34ed
+MD5 a9b59160fe4554e5b899da778882fe65 cscope-15.6-r2.ebuild 1782
+RMD160 662189a3d64cc9bc9a81ddd1d0be5fe90a780772 cscope-15.6-r2.ebuild 1782
+SHA256 ff11a09f67e2cb658774c88de64e55bb939b40f34d88b1202f2002ff8e1e34ed cscope-15.6-r2.ebuild 1782
+MISC ChangeLog 13057 RMD160 f9d1218bed35486ea5440048fe5d7507657d6f61 SHA1 6f3f2c5170a6abb8a52ee6a03a43cb3adbe81d09 SHA256 e3b7befcd0c4f30f116bfec8e0de48df26ccabf8bde86f154330676233b369b6
+MD5 361a057ea41a0b21a68774a3a87edb70 ChangeLog 13057
+RMD160 f9d1218bed35486ea5440048fe5d7507657d6f61 ChangeLog 13057
+SHA256 e3b7befcd0c4f30f116bfec8e0de48df26ccabf8bde86f154330676233b369b6 ChangeLog 13057
 MISC metadata.xml 790 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 SHA1 379cdedd442db840c7d9ea38c13cdb917ece90eb SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8
 MD5 79094d1585cb050b3855fbfe440f22b9 metadata.xml 790
 RMD160 7889067edaf88f6188a74c114c39160fcf827f71 metadata.xml 790
@@ -25,10 +33,13 @@ SHA256 c357e749a49ff673990a6cfdda92bd8589d6b5d2d8a4f45e8976d7bd7eb384d8 metadata
 MD5 4bd8ebc34f7028967f258d210e5b5e77 files/digest-cscope-15.6-r1 235
 RMD160 d6ef0554329cdf3c560ab5cbfadae810a3e529b6 files/digest-cscope-15.6-r1 235
 SHA256 5dd44a7fae431e139f023aedb5fd9742666c433ddf5a9b006cb1b461ff1c1ecd files/digest-cscope-15.6-r1 235
+MD5 4bd8ebc34f7028967f258d210e5b5e77 files/digest-cscope-15.6-r2 235
+RMD160 d6ef0554329cdf3c560ab5cbfadae810a3e529b6 files/digest-cscope-15.6-r2 235
+SHA256 5dd44a7fae431e139f023aedb5fd9742666c433ddf5a9b006cb1b461ff1c1ecd files/digest-cscope-15.6-r2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF1DPjNQqtfCuFneMRAuWUAJ0VrGm+cg2d+dBPeBnbQcY8i0IDUACeLqrO
-0EWZIdwLN7f9vg13FqZqJXQ=
-=bYUm
+iD8DBQFG84T5Oeoy/oIi7uwRAszJAKCSt4xiZlRWWT5LiUaTyuAFlNdogwCeOO8d
+zT86sMVRD7jsvYgxG5Ch8mg=
+=G2TR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cscope/cscope-15.6-r2.ebuild b/dev-util/cscope/cscope-15.6-r2.ebuild
new file mode 100644
index 000000000000..04713ec47f08
--- /dev/null
+++ b/dev-util/cscope/cscope-15.6-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.6-r2.ebuild,v 1.1 2007/09/21 08:46:34 ulm Exp $
+
+inherit 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 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="emacs"
+
+RDEPEND=">=sys-libs/ncurses-5.2"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	>=sys-devel/autoconf-2.60
+	emacs? ( virtual/emacs )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+
+	# warn users of insecure web frontend, see bug #158831
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-158831-warning_webscope.patch"
+}
+
+src_compile() {
+	STRIP="no"
+
+	econf || die "econf failed"
+	make clean || die "make clean failed"
+	emake || die "emake failed"
+
+	if use emacs ; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
+
+	if use emacs ; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+		dobin cscope-indexer || die "dobin failed"
+	fi
+
+	cd "${S}"/contrib/webcscope || die
+	docinto webcscope
+	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c || die "dodoc failed"
+	insinto /usr/share/doc/${PF}/webcscope/icons; doins icons/*.gif
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cscope/files/50cscope-gentoo.el b/dev-util/cscope/files/50cscope-gentoo.el
new file mode 100644
index 000000000000..bfb13da9f974
--- /dev/null
+++ b/dev-util/cscope/files/50cscope-gentoo.el
@@ -0,0 +1,37 @@
+
+;;; cscope site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cscope-minor-mode "xcscope")
+(autoload 'cscope-display-buffer "xcscope"
+  "Display the *cscope* buffer." t)
+(autoload 'cscope-display-buffer-toggle "xcscope"
+  "Toggle cscope-display-cscope-buffer, which corresponds to
+\"Auto display *cscope* buffer\"." t)
+(autoload 'cscope-next-symbol "xcscope"
+  "Move to the next symbol in the *cscope* buffer." t)
+(autoload 'cscope-next-file "xcscope"
+  "Move to the next file in the *cscope* buffer." t)
+(autoload 'cscope-prev-symbol "xcscope"
+  "Move to the previous symbol in the *cscope* buffer." t)
+(autoload 'cscope-prev-file "xcscope"
+  "Move to the previous file in the *cscope* buffer." t)
+(autoload 'cscope-pop-mark "xcscope"
+  "Pop back to where cscope was last invoked." t)
+(autoload 'cscope-set-initial-directory "xcscope"
+  "Set the cscope-initial-directory variable." t)
+(autoload 'cscope-unset-initial-directory "xcscope"
+  "Unset the cscope-initial-directory variable." t)
+(autoload 'cscope-find-this-symbol "xcscope"
+  "Locate a symbol in source code." t)
+(autoload 'cscope-find-global-definition "xcscope"
+  "Find a symbol's global definition." t)
+(autoload 'cscope-find-global-definition-no-prompting "xcscope"
+  "Find a symbol's global definition without prompting." t)
+
+(defun cscope:hook ()
+  (cscope-minor-mode))
+(add-hook 'c-mode-hook 'cscope:hook)
+(add-hook 'c++-mode-hook 'cscope:hook)
+(add-hook 'dired-mode-hook 'cscope:hook)
diff --git a/dev-util/cscope/files/digest-cscope-15.6-r2 b/dev-util/cscope/files/digest-cscope-15.6-r2
new file mode 100644
index 000000000000..01c0b5205907
--- /dev/null
+++ b/dev-util/cscope/files/digest-cscope-15.6-r2
@@ -0,0 +1,3 @@
+MD5 db87833f90d8267b1fc0c419cfc4d219 cscope-15.6.tar.gz 391223
+RMD160 b93238d3c91782d032e028abcfde3c2a7491a9c9 cscope-15.6.tar.gz 391223
+SHA256 6d6461ef402a1d6e42e1cd40e7524c4ed19e79eacef1d83ba4ed680f7bcac5ca cscope-15.6.tar.gz 391223