Revbump. Added upstream fix for python variables starting with def seen as functions. Bug 208466, thanks to ph. Quoting.

Package-Manager: portage-2.1.4.4

5 files changed, 95 insertions, 10 deletions

diff --git a/dev-util/ctags/ChangeLog b/dev-util/ctags/ChangeLog
index e4b779796ac1..996b6f939b21 100644
--- a/dev-util/ctags/ChangeLog
+++ b/dev-util/ctags/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/ctags
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.68 2008/03/24 00:37:48 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.69 2008/03/26 18:43:41 hawking Exp $
+
+*ctags-5.7-r1 (26 Mar 2008)
+
+  26 Mar 2008; Ali Polatel <hawking@gentoo.org>
+  +files/ctags-5.7-python-vars-starting-with-def.patch, ctags-5.6-r2.ebuild,
+  +ctags-5.7-r1.ebuild:
+  Revbump. Added upstream fix for python variables starting with def seen as
+  functions. Bug 208466, thanks to ph. Quoting.
 
   24 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> ctags-5.7.ebuild:
   Re-add mips keyword, bug #202947.
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 166a4c16a571..8f65024ca19e 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -5,21 +5,23 @@ AUX ctags-5.5.4-ebuilds.patch 835 RMD160 dd337274148ef60c8f525ebaf6c0f13593cd0bf
 AUX ctags-5.5.4-ruby-classes.patch 601 RMD160 aa5386b41b40e2078fda694018a60f4716e92ebb SHA1 dec9958c0ca212ee72265bef33e3c149a20bf6ef SHA256 bdf76301ebb238de1571f77d8b1a9681c9c6e554814e5b4665cf45bc5083058d
 AUX ctags-5.6-ebuilds.patch 822 RMD160 fc477e7d5a4c912a273ac3177cefb8bb5dec2910 SHA1 e70f4a372d9c3e48d954d02c654c55ead78de400 SHA256 86930711593e7a2a88043bc9a8d5863c2b62514b256d3e9a81f7929951f17e07
 AUX ctags-5.6-php5.patch 2912 RMD160 025560f26f4833cbd14139f84b89e1cf58747528 SHA1 b843cebf2f4d5f5ac1e323a457e511342e9deedf SHA256 6806ac8ca878e72c0b7057004259595bb67dc91763c5c7c6c7d2d32f5eb1688e
+AUX ctags-5.7-python-vars-starting-with-def.patch 308 RMD160 9088ff8f50b405b1fe7700d778334ff99cf9dd74 SHA1 bf25d89037a4dbc03fcec0d26594dedf7ce649b1 SHA256 181130a510d3eec96748ae9a10a5bd0742d5a50e9619510024b7ede1fe9a7a6e
 AUX ctags-ada.patch 756 RMD160 76a8427a05567e52babbbda82057b3bef9c0106f SHA1 e0281000d9efc03c2045027a6df7e72260fe9934 SHA256 3959c5b4b7336cc248b892565e2c26de57f604c16cfe6445c6760ebbcb5201aa
 DIST ctags-5.5.4.tar.gz 260962 RMD160 0a50cd6009c4d383b9820307be7089b050ce3a93 SHA1 1f912ef66c44d5527ce44c447a13fc33188bf16e SHA256 7b83689a47efa627d4b5670317125de3d87ae9278cf69c3ac7e3b7be646e715d
 DIST ctags-5.6.tar.gz 267019 RMD160 9221bcc105f302b6e05f599914f5d4e24cda62f0 SHA1 930afaa138624717393fe475201f795251bd5e5e SHA256 55c0693845644735f76242fa717efd92d9cb99543f7a7fa65d63bdd083c4eb95
 DIST ctags-5.7.tar.gz 287496 RMD160 8d6d9c0a3e056abfb6356852808afe1c99f9224c SHA1 f7e435286c25181d6cb28ca1ac2d4ba63507a82d SHA256 10623bbcc9b0cb60124271ce83111733a1043ab022d51cfcd2c0e0c953bd8b58
 DIST ctags-ada-mode-4.3.3.tar.bz2 14086 RMD160 55f777901443e3f2dc990f05a2a866892d38cc18 SHA1 2b69babe02f9d2cb6aeb9ab83cde4a722fe7c4bd SHA256 f0ef3ad82654ed5fe4d4e12ec64c7988d7cd40cd7dc67c89eaac06869c5a36fa
 EBUILD ctags-5.5.4-r2.ebuild 1154 RMD160 65e39a0e7af46b0f5e8adbc61d92cd4a440c812b SHA1 b8fa53a54320d1c2ad7ac5e7770d61bf56f0d357 SHA256 f428c19c31fcf68d95cd47cd9eb7dfe25166484245e949f7216e156dfb41fd6e
-EBUILD ctags-5.6-r2.ebuild 1459 RMD160 7672b46bcf044ea07fef2e4339beaa2e8ff66d60 SHA1 fa97bc0d862921d4bbf76871bef02559119d6795 SHA256 51237a4d91ab20222c4e39428dbcfc15610538564cc7e780c0e1aef067ebb2d5
+EBUILD ctags-5.6-r2.ebuild 1463 RMD160 7a9d12405872db9cfe24f5158de07d812f51bde7 SHA1 422841201a765db5f6fd31dfbb7fd602eb869484 SHA256 e5f72d1b3b52750d1d6241ec04da90265a82a9439a609ed91505526fd906f08d
 EBUILD ctags-5.6-r3.ebuild 1706 RMD160 2d77aa2335a7b32776712d5feec0e3b92693ac19 SHA1 f5abae2e895d6984c089dae1b1dab7361a713dd9 SHA256 080ef119e6ec2309cd0397aa4f8f4e9d33751ff6d2ba1a1af01d63e6339df90e
+EBUILD ctags-5.7-r1.ebuild 1721 RMD160 5a63ce25155d7f2fc12283372d2a6a308ad4d3a4 SHA1 95658494f421d70c5d2f43a8bed4a7e91543cddf SHA256 93a42975ea7db79201b16668902ea523854602fcc4ddbc462df210539ed9dd66
 EBUILD ctags-5.7.ebuild 1594 RMD160 ef75b5254abc73594d6fcfeb7765d255aa85bee7 SHA1 b969679726eeab0a63299e1119d7c3cbad4e8bab SHA256 768c413d42faf7e8fa70c27c349e8b341850fb988f123d0becad39f59287c794
-MISC ChangeLog 8632 RMD160 06cbf26a2f9712f03565b958b220c4c0db7f7ef3 SHA1 957f235104674d459bb67baee8dd8edc0bb94e86 SHA256 33bdad1dad31eec6857e60aca51a9bb2619908a0c1985b0853260f774fa3e55a
+MISC ChangeLog 8934 RMD160 3e582cd8e4ff3eaa613c1c5e390d0ed259195cbf SHA1 b54667d852734db2b582f136af12576fbd2bca3c SHA256 f5b73bd1a83f7f8415e1a2e6170d8d8144497bf7631e7cf26d9f4d122fb32037
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH5vfiiqiDRvmkBmIRAh4uAKDr1WngJ0w6ufwhoiA+fovzAUpJrACg2fyg
-+nIuleVsCae61Vf08EBd+28=
-=7Npm
+iD8DBQFH6pljQU4yORhF8iARAiTFAJ9jBT3EgITWtgIM9ETHQQvu6GLpQgCglgfg
+JrOi1sv/jpGXYHagDJKI30I=
+=QzRq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ctags/ctags-5.6-r2.ebuild b/dev-util/ctags/ctags-5.6-r2.ebuild
index 6a2d3176274b..082a84ea611a 100644
--- a/dev-util/ctags/ctags-5.6-r2.ebuild
+++ b/dev-util/ctags/ctags-5.6-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/ctags/ctags-5.6-r2.ebuild,v 1.3 2007/09/24 20:16:05 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.6-r2.ebuild,v 1.4 2008/03/26 18:43:41 hawking Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="ada"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}/${P}-ebuilds.patch"
 	#epatch "${FILESDIR}/${P}-haskell.patch"
 	#epatch "${FILESDIR}/${P}-objc.patch"
@@ -24,7 +24,7 @@ src_unpack() {
 
 	# enabling Ada support
 	if use ada; then
-		cp ${WORKDIR}/ctags-ada-mode-4.3.3/ada.c ${S}
+		cp ${WORKDIR}/ctags-ada-mode-4.3.3/ada.c "${S}"
 		epatch "${FILESDIR}/${PN}-ada.patch"
 	fi
 }
diff --git a/dev-util/ctags/ctags-5.7-r1.ebuild b/dev-util/ctags/ctags-5.7-r1.ebuild
new file mode 100644
index 000000000000..478b118526c5
--- /dev/null
+++ b/dev-util/ctags/ctags-5.7-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.7-r1.ebuild,v 1.1 2008/03/26 18:43:41 hawking Exp $
+
+inherit eutils
+
+DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
+HOMEPAGE="http://ctags.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	ada? ( mirror://sourceforge/gnuada/ctags-ada-mode-4.3.3.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="ada"
+
+DEPEND="app-admin/eselect-ctags"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+	# Upstream fix for python variables starting with def
+	epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch"
+
+	# enabling Ada support
+	if use ada; then
+		cp "${WORKDIR}/${PN}-ada-mode-4.3.3/ada.c" "${S}"
+		epatch "${FILESDIR}/${PN}-ada.patch"
+	fi
+}
+
+src_compile() {
+	econf \
+		--with-posix-regex \
+		--without-readlib \
+		--disable-etags \
+		--enable-tmpdir=/tmp \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
+	# rename ctags to exuberant-ctags (Mandrake does this also).
+	mv "${D}"/usr/bin/{ctags,exuberant-ctags}
+	mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1
+
+	dodoc FAQ NEWS README
+	dohtml EXTENDING.html ctags.html
+}
+
+pkg_postinst() {
+	eselect ctags update
+	elog "You can set the version to be started by /usr/bin/ctags through"
+	elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+	eselect ctags update
+}
diff --git a/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch
new file mode 100644
index 000000000000..05389df41c70
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.7-python-vars-starting-with-def.patch
@@ -0,0 +1,11 @@
+--- python.c	2008-03-26 20:31:26.000000000 +0200
++++ python.c	2008-03-26 20:31:35.000000000 +0200
+@@ -185,7 +185,7 @@
+ 	while (*cp)
+ 	{
+ 		cp = skipEverything (cp);
+-		if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5))
++		if (!strncmp(cp, "def", 4) || !strncmp(cp, "class", 6))
+ 		{
+ 			return cp;
+ 		}