Version bump, bug 284731. Forward port all patches and also bump ada-mode version.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

6 files changed, 148 insertions, 2 deletions

diff --git a/dev-util/ctags/ChangeLog b/dev-util/ctags/ChangeLog
index 4008f8340b9c..c5e844d5dda8 100644
--- a/dev-util/ctags/ChangeLog
+++ b/dev-util/ctags/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/ctags
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.72 2009/10/24 02:04:29 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ChangeLog,v 1.73 2009/11/16 21:59:58 spatz Exp $
+
+*ctags-5.8 (16 Nov 2009)
+
+  16 Nov 2009; Dror Levin <spatz@gentoo.org> +ctags-5.8.ebuild,
+  +files/ctags-5.8-ada.patch, +files/ctags-5.8-f95-pointers.patch,
+  +files/ctags-5.8-python-vars-starting-with-def.patch:
+  Version bump, bug 284731. Forward port all patches and also bump ada-mode
+  version.
 
 *ctags-5.7-r2 (24 Oct 2009)
 
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index dab11c897ec8..75c080735d90 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX ctags-5.5.4-ebuilds.patch 835 RMD160 dd337274148ef60c8f525ebaf6c0f13593cd0bf0 SHA1 9c6b64c694857217ca49898badb409ea24aec625 SHA256 cf4081cee70409e58ddf6939d7f4ab8a7f0e122fdcdbb4ba6c573372bc4b58b6
 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-f95-pointers.patch 695 RMD160 d7e339506faac267d8a77851457c28bc4f689bc3 SHA1 40981b1ae4c2b7461e6906c25e3d6e3911d5d399 SHA256 33ef6ef533346a31275330dc9a04f3dcc54f00de7cb8a43dbd16d70192b3c883
 AUX ctags-5.7-python-vars-starting-with-def.patch 310 RMD160 f052f5f9d4038a06128ce44bc6f85c3602220a59 SHA1 000e79f3ca0de7196b8420009f0e5785ffc50d78 SHA256 cc31eec391bae85de8929eb1261852077e1102ea728f4306750fe3410efab084
+AUX ctags-5.8-ada.patch 613 RMD160 c557386fb034562c039b9d46be0d6e686d4acb3c SHA1 c377fcdcbc76331fc7409f53e8311d6b99aeaa55 SHA256 e6122236e929509248661569967f4a0168d30214ed0ea814926583f9c087846a
+AUX ctags-5.8-f95-pointers.patch 471 RMD160 2db458fb5666df3fc78ba0d9dde5ac8951e9dbc9 SHA1 ae46d787a6082cb0de243b84c2e70e10cca4bba6 SHA256 93434a7e0df23da4c98b4425e8971152125674bf135c1a87f7ee1024ce3034d7
+AUX ctags-5.8-python-vars-starting-with-def.patch 435 RMD160 2cf9d9662935c0c0f91a2c923b0e6cef0ee579ad SHA1 e0c7d991978212baf5729293446880671889ed75 SHA256 a388bafd70e538f187d5c6540c586da36e5a91e4ff3bc93a5f2caf75b13282c3
 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-5.8.tar.gz 479927 RMD160 191495869fbfa2f77a9619a4920eba26d02eface SHA1 482da1ecd182ab39bbdc09f2f02c9fba8cd20030 SHA256 0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7
+DIST ctags-ada-mode-4.3.11.tar.bz2 14060 RMD160 75ee4dbfc4608bf590f2fbfbc2abe49163e57f80 SHA1 deff8ae748adab44a4fb9dbf41f7f8d47234b0b6 SHA256 d25a3fd26b356adbd068f10a0b68691d36c154c04b96304b96386e169e4b6b57
 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 1467 RMD160 1e1d454eb8113a3a1ef2f30bcbcd6550dba7f1d8 SHA1 3982a322fd53b81b95e0179995ca229cd60331ab SHA256 cadc5a1383070c846c7ab528cbcd8c1a14aace5d87965d0c767ef2674d40aaf8
@@ -15,5 +23,17 @@ EBUILD ctags-5.6-r3.ebuild 1706 RMD160 2d77aa2335a7b32776712d5feec0e3b92693ac19
 EBUILD ctags-5.7-r1.ebuild 1727 RMD160 5b6dcfcea98feb1c724fea4812506da392da3a7c SHA1 92bc34d7531a9420893eee9a26e47d7e7a5bc8d6 SHA256 cab6d2fe683460dd411d3f7155ec9f7b0287730f28b83b9ed9aa9e217097bdef
 EBUILD ctags-5.7-r2.ebuild 1742 RMD160 42b25406fa31bc50f9c9ac18a433d15ecbcf9632 SHA1 4f06bf36df29c3debbed307040852e908bab4a79 SHA256 059af6e90a9620d5df0f114d1e6f0338bd59376ba0de01ecf9bdf667acd638f7
 EBUILD ctags-5.7.ebuild 1589 RMD160 e57f6b9402ed609a2d9a02e848d0def57f04960a SHA1 a260d5779d4e1672d94129bd04cef2f21e55efc7 SHA256 2731cb122337cebb837b562ca8051a16b1208fbf2617be3244d08b2df328d686
-MISC ChangeLog 9364 RMD160 00110742f04ad195a6a3697df0e5f3dbcad70a8b SHA1 90c2c4b2b89fb4c7c45ea2e0cd0383ab944b0e5a SHA256 13d67dbf2a5ac8860da81f9851375ae4cc2036f7f3f9bc671514016035985b77
+EBUILD ctags-5.8.ebuild 1758 RMD160 4eccf9d97447b4eb95cc0ff2461d422883c39c73 SHA1 ce64ccd2ef23f22deeb99f0162d163d5a21db90d SHA256 c3693b80293fffad7517fa00b47b5feb5de2c67c4849a5743a67ae78a83da50f
+MISC ChangeLog 9666 RMD160 7d6575c570c4fea623b3af951641fe5d49664051 SHA1 ba7d30916512a24a5e153e5132516a30f5f55b96 SHA256 fdfc1d6b6360082a7ac7696edc45db0623012a50c60eae988bb5482344efa570
 MISC metadata.xml 222 RMD160 5123b6991f513049f25fd2a60c5bcc4b7deda1d0 SHA1 d51b39ab79072ab08651ca47eb968960d29f50bc SHA256 3621ccd9c8460be7054a186c326ed9077b42eb25b48252dd0672986b5b0fd12b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLActnAAoJEAWF714uGAc6MPkH/0WnAfTytD0HUyboEBsXNcne
+bugy2uasAXgViMHvNcKTf7uSr3ZXwbbPZ0FjhLCr4ZBIHXOCWyoW8E2zbli6Ceig
+jbv0EYrpfx4WyfRSQ2e7TeCYpfC3LwWmxOGbiu9wCyxvPzBA6q0jJmrinZtENzAC
+7AQ1DYERzhj6H1WL1dOc29rReC9cz2ljMwLnuPHyxKM3NZGLeeyHtMScR40Uh72t
+ivDPq3yDRx4rUgnfBbKiVytQ4BYdhT0QIZ/XxGDvvTN6EmEzhlsLFsWJd99Tq9LY
+qFoR4Iw0l9mXlckkkyN/Ptbk+IEaFNMZXHaKJBmOW5/EYBqmYDFcqPAVBjA6q9g=
+=ea7g
+-----END PGP SIGNATURE-----
diff --git a/dev-util/ctags/ctags-5.8.ebuild b/dev-util/ctags/ctags-5.8.ebuild
new file mode 100644
index 000000000000..f8175aaf30d3
--- /dev/null
+++ b/dev-util/ctags/ctags-5.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ctags/ctags-5.8.ebuild,v 1.1 2009/11/16 21:59:58 spatz Exp $
+
+EAPI="2"
+
+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.11.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="ada"
+
+DEPEND="app-admin/eselect-ctags"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.6-ebuilds.patch"
+	# Upstream fix for python variables starting with def
+	epatch "${FILESDIR}/${P}-python-vars-starting-with-def.patch"
+
+	# Bug #273697
+	epatch "${FILESDIR}/${P}-f95-pointers.patch"
+
+	# enabling Ada support
+	if use ada; then
+		cp "${WORKDIR}/${PN}-ada-mode-4.3.11/ada.c" "${S}"
+		epatch "${FILESDIR}/${P}-ada.patch"
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-posix-regex \
+		--without-readlib \
+		--disable-etags \
+		--enable-tmpdir=/tmp \
+		|| die "econf 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 || die
+	dohtml EXTENDING.html ctags.html || die
+}
+
+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.8-ada.patch b/dev-util/ctags/files/ctags-5.8-ada.patch
new file mode 100644
index 000000000000..48ed96f0d88e
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-ada.patch
@@ -0,0 +1,28 @@
+--- parsers-orig.h	2009-11-16 23:39:49.747328066 +0200
++++ parsers.h	2009-11-16 23:40:26.541581805 +0200
+@@ -16,6 +16,7 @@
+ 
+ /* Add the name of any new parser definition function here */
+ #define PARSER_LIST \
++	AdaParser, \
+ 	AntParser, \
+ 	AsmParser, \
+ 	AspParser, \
+--- source-orig.mak	2009-11-16 23:41:17.184586699 +0200
++++ source.mak	2009-11-16 23:41:48.358331136 +0200
+@@ -8,6 +8,7 @@
+ 	strlist.h vstring.h
+ 
+ SOURCES = \
++	ada.c \
+ 	args.c \
+ 	ant.c \
+ 	asm.c \
+@@ -70,6 +71,7 @@
+ REGEX_HEADERS = gnu_regex/regex.h
+ 
+ OBJECTS = \
++	ada.$(OBJEXT) \
+ 	args.$(OBJEXT) \
+ 	ant.$(OBJEXT) \
+ 	asm.$(OBJEXT) \
diff --git a/dev-util/ctags/files/ctags-5.8-f95-pointers.patch b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
new file mode 100644
index 000000000000..4ac9560f8785
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-f95-pointers.patch
@@ -0,0 +1,12 @@
+--- fortran-orig.c	2009-11-16 23:38:06.154328652 +0200
++++ fortran.c	2009-11-16 23:38:08.711335501 +0200
+@@ -1319,7 +1319,8 @@
+ 			readToken (token);
+ 			skipPast (token, TOKEN_OPERATOR);
+ 		}
+-		else if (strcmp (vStringValue (token->string), "=") == 0)
++		else if ((strcmp (vStringValue (token->string), "=") == 0) ||
++					(strcmp (vStringValue (token->string), "=>") == 0))
+ 		{
+ 			while (! isType (token, TOKEN_COMMA) &&
+ 					! isType (token, TOKEN_STATEMENT_END))
diff --git a/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
new file mode 100644
index 000000000000..83d9f7e887eb
--- /dev/null
+++ b/dev-util/ctags/files/ctags-5.8-python-vars-starting-with-def.patch
@@ -0,0 +1,13 @@
+--- python-orig.c	2009-11-16 23:33:44.930351712 +0200
++++ python.c	2009-11-16 23:35:08.433328150 +0200
+@@ -264,8 +264,8 @@
+ 	while (*cp)
+ 	{
+ 		cp = skipEverything (cp);
+-		if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5) ||
+-			!strncmp(cp, "cdef", 4) || !strncmp(cp, "cpdef", 5))
++		if (!strncmp(cp, "def ", 4) || !strncmp(cp, "class ", 6) ||
++			!strncmp(cp, "cdef ", 5) || !strncmp(cp, "cpdef ", 6))
+ 		{
+ 			return cp;
+ 		}