Fix illegal C++ code, bug #417763, approved by Chainsaw

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 56 insertions, 14 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 1d0d89c03dfc..07f71d097c7b 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.205 2012/05/21 09:43:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.206 2012/05/29 08:25:43 ryao Exp $
+
+  29 May 2012; Richard Yao <ryao@gentoo.org>
+  +files/ncurses-5.9-fix-clang-build.patch, ncurses-5.9-r2.ebuild:
+  Fix illegal C++ code, bug #417763, approved by Chainsaw
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> ncurses-5.9-r2.ebuild:
   x86 stable wrt bug #413897
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index fec9d38b2fe7..accb0414b3e0 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX ncurses-5.6-build.patch 265 RMD160 9958f375f7b305f1b8d52b27d9da746be9175263 SHA1 16990ca2cef127711074d70f9d40d256458969e9 SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251
 AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065
 AUX ncurses-5.7-emacs.patch 1934 RMD160 07b7cdb8f0975441e9823959533285f35f31e35c SHA1 c6e4259c455e83e0c166cf89d8c7d23ee77effde SHA256 daf300b7ba0bef6fc685b63f657dc4d864b53da77454129783d767522f1374b0
@@ -11,19 +8,13 @@ AUX ncurses-5.7-rxvt-unicode.patch 3339 RMD160 ad5fac04693b1cb08e942ba4ee9e3d166
 AUX ncurses-5.7-tic-cross-detection.patch 1656 RMD160 cd30a10d49ce0a88fd031b38739032addd49d340 SHA1 584ac536cb09b84801336af4938f67c96ccab57a SHA256 afadd1db1530054cb745193723435a3dffceb9de541abc92caace89c2ea429a5
 AUX ncurses-5.8-gfbsd.patch 695 RMD160 41081a2ae135dd9a149c949f31cfbcb06bf12610 SHA1 f1a90d9911349f464b0ed93aaf104b73b215110f SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82
 AUX ncurses-5.8-rxvt-unicode.patch 3724 RMD160 d6b46469ce0078ec08e1fa405f0a1d9399970c56 SHA1 1adeb974f84197499e59d86991d6ce4f17194155 SHA256 385b6b2afe7b95e3ad172ece63ea60ee2b8db5b5c83f55209fbd319be5edf380
+AUX ncurses-5.9-fix-clang-build.patch 1291 RMD160 ece30834a435e177eb9cd6a3116a8244d6a9a00d SHA1 2d34875a7a22fd3e72b6677b3376ce2e6f605cad SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0
 AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 RMD160 016d385921afbcb08d1e75f2edbab4849ef53fb4 SHA1 5d83d9f7813885194ee1fd2727e7aca89fa85724 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
 DIST ncurses-5.9.tar.gz 2826473 RMD160 dd7dffe38fcc908230ce3e036b71ced2d270ac9e SHA1 3e042e5f2c7223bffdaac9646a533b8c758b65b5 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
 EBUILD ncurses-5.7-r7.ebuild 5126 RMD160 9292a311c2eee95af143369891be944d8f1c7995 SHA1 53bd7470945a2fdf3d760c4d8b6aad27bba5b4a4 SHA256 768d9c817523e94b07aa031e95466bee13bcbedf0bb96115a8a2eab67fc84c6e
 EBUILD ncurses-5.9-r1.ebuild 5245 RMD160 52a9207cf00490931ac7fa8cef0a1d3ceb183fb8 SHA1 49d71a1a7517c8566480e130955e6d020d78e581 SHA256 8e234b5c9604475f64f07824c0356797edf5ffe6761f37a389dfb7c781671090
-EBUILD ncurses-5.9-r2.ebuild 5277 RMD160 6c8da907a82f822a53c936e8d1b126bcecc31cbc SHA1 e33280f2c0eadd8c9032b2a8ad2e83213d862b5c SHA256 a4c6ff874c77ad44cafb8eda4358ada480476fe621b91cb8d20a274612757d20
+EBUILD ncurses-5.9-r2.ebuild 5335 RMD160 80c8d61640f7435fd26ef4ef78977938a6c3664b SHA1 65eeb9e92cf11c764f5ab7550e485142a3134a12 SHA256 65155234f3f8f39fd424b5f15c5ef46e9109d670785575b318cfbc2667b8bb6b
 EBUILD ncurses-5.9.ebuild 4878 RMD160 a64accdf045f6198e8ca4530acc33e7e691a4236 SHA1 27152c98305d0c573f25073d512717763a765cb9 SHA256 4e123a8bf06f4d7bc92c03bd75fe8f28ecab2d636dc20ab53a66277811b6839d
-MISC ChangeLog 29320 RMD160 ab0a6c74762033c2842d7b312c846a41d23a0ab5 SHA1 973983989ed8f26e6d4cb9a5b10beb8d74bd7a59 SHA256 fe8705df4a67cfbff8344e4c2c3e1cd8d5c11a4c657385527b697e975b6ccb0c
+MISC ChangeLog 29485 RMD160 4aa92cf49dae02218a6bd5704245193681d50820 SHA1 56246c38160d884c6fbd204613ef895a3ac80a2e SHA256 232af606902f4cdbd5d274c1440bbf353d4bef0f4b0ebfe273e51c8da7084b9c
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk+6DkIACgkQuUQtlDBCeQKLqQCcDgJ4BeK9FRoYYBrZdt98iEw/
-AFUAn1hotFBAbF+mrrW7R6piiLHK85Dp
-=KkHu
------END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch
new file mode 100644
index 000000000000..0c6ca7acc4fc
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.9-fix-clang-build.patch
@@ -0,0 +1,44 @@
+diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h
+index 70a30c3..db38063 100644
+--- a/ncurses-5.9/c++/cursesf.h
++++ b/ncurses-5.9/c++/cursesf.h
+@@ -677,7 +677,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+@@ -686,7 +686,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
+diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h
+index d9c2273..2d5b79a 100644
+--- a/ncurses-5.9/c++/cursesm.h
++++ b/ncurses-5.9/c++/cursesm.h
+@@ -635,7 +635,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+@@ -644,7 +644,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index f3d619a83595..5ed52362f44f 100644
--- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.8 2012/05/21 09:43:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.9 2012/05/29 08:25:43 ryao Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic toolchain-funcs
@@ -31,6 +31,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
 	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
 	epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
+	epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
 	sed -i \
 		-e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
 		misc/Makefile.in || die
@@ -148,6 +149,8 @@ src_install() {
 			local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
 			local basedir=$(basename $(dirname "${termfile}"))
 
+
+
 			if [[ -n ${termfile} ]] ; then
 				dodir /etc/terminfo/${basedir}
 				mv ${termfile} "${D}"/etc/terminfo/${basedir}/