Fixed an implicit int->pointer conversion, see bug #333451.

Package-Manager: portage-2.1.9.14/cvs/Linux i686

4 files changed, 74 insertions, 5 deletions

diff --git a/dev-util/cdecl/ChangeLog b/dev-util/cdecl/ChangeLog
index 88bc87cc1fcf..73bd4c678788 100644
--- a/dev-util/cdecl/ChangeLog
+++ b/dev-util/cdecl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cdecl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.16 2010/08/26 20:17:47 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/ChangeLog,v 1.17 2010/11/03 17:20:22 phosphan Exp $
+
+*cdecl-2.5-r2 (03 Nov 2010)
+
+  03 Nov 2010; Patrick Kursawe <phosphan@gentoo.org> +cdecl-2.5-r2.ebuild,
+  +files/cdecl-2.5-implicit-pointer.patch:
+  Fixed an implicit int->pointer conversion, see bug #333451.
 
   26 Aug 2010; Patrick Kursawe <phosphan@gentoo.org> cdecl-2.5-r1.ebuild,
   files/cdecl-2.5.patch:
diff --git a/dev-util/cdecl/Manifest b/dev-util/cdecl/Manifest
index 8bbbd147d976..c6f9f4ed75f1 100644
--- a/dev-util/cdecl/Manifest
+++ b/dev-util/cdecl/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cdecl-2.5-implicit-pointer.patch 502 RMD160 5d7344f8474469d05a6680f042ca0ca1d2d5cad2 SHA1 4b4710ee9c74a4ae8e548e17cf464b1471f989ff SHA256 0dadb6e9869547ebe654fec16fc61b14b4e2006c8ff9b181aa9bb7eac5645e8b
 AUX cdecl-2.5.patch 1891 RMD160 ca1eb1a8046ea62a04f4e7925e5fd4e844fe1577 SHA1 53d7f69966f10dfec446847d1796e9aabf2bac6f SHA256 29be443674ab4b330cf0ed152263db0539df02ad5cd30a7010cb7a9bcfdd1ad6
 DIST cdecl-2.5.tar.gz 21435 RMD160 351c36dcc7f18e4d143f2559460025d2de9a83c4 SHA1 b955a0b95b635090360b19de888cb29d5c005296 SHA256 b74caef08407a2195d6f1facf103e5af29253f67d599486164241b14ee42a936
 EBUILD cdecl-2.5-r1.ebuild 1071 RMD160 001f53680590361c5b19b67bed7d8a155a82c23c SHA1 adc91374bd784e9950a62eab034cd03f86e7097e SHA256 2f4ff8a315c8f76f0c92f2acdc31df6f353287af61eb53051082636d4f64f362
-MISC ChangeLog 1834 RMD160 2b2c812135ef83b756c8f75413b0db749eb06353 SHA1 d8a26d6fca1bf9e78ae69e86dcb071c4929b7074 SHA256 f2f3aee0a6c0c3116e628ccdba4e2d12015d0a2afceb504200a14434b521ca7e
+EBUILD cdecl-2.5-r2.ebuild 1122 RMD160 84e5294b6ea3b37eaaf5f44bb75d2b8f36693dba SHA1 b559b40193dbab9322cd7ea2809d82dad284970a SHA256 39f97a4d2271f8a41e85be7f7f67a0c31e7f8513436a4c10d5e39c402d49b415
+MISC ChangeLog 2044 RMD160 e826c80d6a6c642b9d9299fe145f172eb96b66c3 SHA1 52392e68f464482b8ee336ef89e9a200a950fe63 SHA256 a2028637e3651a26a799e43f9b8033baf7379470fcd22ab5d29949d3b74e8b50
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkx2y/cACgkQJRJa6W8CX/6TNQD8CKdwqRzMdLlN5IP7dpJ42Y5b
-YT7ZQTsm0Wy+SW5c66kA+wZAb4lMLatD1443DUqi8YRVA7SlYtHFJ33VbZzORhe+
-=ouJe
+iF4EAREIAAYFAkzRme4ACgkQJRJa6W8CX/6mEAD/SLM+EDM5pO/1lhXCR7wepmSy
+Z/BB3TdQxvbyAufvv9sA/11AH8OY+qioQx4AN9op1LFedobEjvgtkvHxoeouYNQV
+=y437
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cdecl/cdecl-2.5-r2.ebuild b/dev-util/cdecl/cdecl-2.5-r2.ebuild
new file mode 100644
index 000000000000..1f396efe5c6e
--- /dev/null
+++ b/dev-util/cdecl/cdecl-2.5-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdecl/cdecl-2.5-r2.ebuild,v 1.1 2010/11/03 17:20:22 phosphan Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Turn English phrases to C or C++ declarations"
+SRC_URI="ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/${P}.tar.gz"
+HOMEPAGE="http://www.boutell.com/lsm/lsmbyid.cgi/002103"
+
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="readline? (
+			sys-libs/ncurses
+			sys-libs/readline
+			)"
+
+DEPEND="${RDEPEND}
+		|| (
+			dev-util/yacc
+			sys-devel/bison
+			)
+		!<dev-util/cutils-1.6-r2"
+
+IUSE="readline"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/${P}-implicit-pointer.patch"
+}
+
+src_compile() {
+	if use readline; then
+		CFLAGS="${CFLAGS} -DUSE_READLINE"
+		LIBS="${LIBS} -lreadline -lncurses"
+	fi
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" || die
+}
+
+src_install() {
+	dobin cdecl
+	dohard /usr/bin/cdecl /usr/bin/c++decl
+	dodoc README
+	doman *.1
+}
diff --git a/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch b/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch
new file mode 100644
index 000000000000..ee4949beb6ed
--- /dev/null
+++ b/dev-util/cdecl/files/cdecl-2.5-implicit-pointer.patch
@@ -0,0 +1,12 @@
+Index: cdecl-2.5/cdecl.c
+===================================================================
+--- cdecl-2.5.orig/cdecl.c
++++ cdecl-2.5/cdecl.c
+@@ -204,6 +204,7 @@ int DebugFlag = 0;		/* -d, output debugg
+ #define ANSI	4	/* combo not allowed anymore in ANSI compiler */
+ #define A	ANSI
+ 
++extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
+ /* This is an lower left triangular array. If we needed */
+ /* to save 9 bytes, the "long" row can be removed. */
+ char crosscheck[9][9] = {
\ No newline at end of file