fix building with -fno-implicit-templates #90819

Package-Manager: portage-2.0.51.21

5 files changed, 33 insertions, 12 deletions

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 503abcb2b720..24b01aafe8dc 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,13 +1,14 @@
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 dc48a525d519adf819d098b754d27d0a ChangeLog 14851
-MD5 f58de0ba31f47cd8aafecb6c8bc0faeb ncurses-5.4-r6.ebuild 5324
-MD5 f4bcac1333b3e77c6a0b16ac3fcc9fe5 ncurses-5.4.20050319.ebuild 5538
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3c4a01d7c3fad3e3ebc9bd7bf298ee5b ncurses-5.4-r5.ebuild 6140
 MD5 1d92671261d5e5ddcb50f26da871bdf8 ncurses-8.1.ebuild 406
-MD5 9b518840fa3acf0dc47a06bcafa05b4f ncurses-5.4-r5.ebuild 6086
-MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
-MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 05ff20e1e287685ef67f96800cdc3c6e ncurses-5.4-r6.ebuild 5378
+MD5 026ecb9d396eb49bb02f2e752d6e4688 ncurses-5.4.20050319.ebuild 5595
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
 MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142
+MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
+MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
diff --git a/sys-libs/ncurses/files/ncurses-5.4-c++-templates.patch b/sys-libs/ncurses/files/ncurses-5.4-c++-templates.patch
new file mode 100644
index 000000000000..60c4b716e2de
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.4-c++-templates.patch
@@ -0,0 +1,17 @@
+Fix building with -fno-implicit-templates.
+
+http://bugs.gentoo.org/show_bug.cgi?id=90819
+
+Patch by Mike Frysinger (C++ sucks btw)
+
+--- c++/demo.cc
++++ c++/demo.cc
+@@ -152,6 +152,8 @@
+     return FALSE;
+   }
+ };
++template class MyAction<UserData>;
++template class NCURSES_IMPEXP NCursesUserItem<UserData>;
+ 
+ class QuitItem : public NCursesMenuItem
+ {
diff --git a/sys-libs/ncurses/ncurses-5.4-r5.ebuild b/sys-libs/ncurses/ncurses-5.4-r5.ebuild
index 0afbcbb91382..41803a556857 100644
--- a/sys-libs/ncurses/ncurses-5.4-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r5.ebuild,v 1.23 2005/03/22 18:52:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r5.ebuild,v 1.24 2005/05/03 04:48:55 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-xterm.patch
 	epatch "${FILESDIR}"/${P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${P}-c++-templates.patch #90819
 }
 
 src_compile() {
diff --git a/sys-libs/ncurses/ncurses-5.4-r6.ebuild b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
index b84a5e173c74..583e1bc359b1 100644
--- a/sys-libs/ncurses/ncurses-5.4-r6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.6 2005/05/01 17:17:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r6.ebuild,v 1.7 2005/05/03 04:48:55 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-xterm.patch
 	epatch "${FILESDIR}"/${P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${P}-c++-templates.patch #90819
 }
 
 src_compile() {
diff --git a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
index 20c0d04fdaa3..5e8d47448201 100644
--- a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
+++ b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.1 2005/04/28 23:08:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.2 2005/05/03 04:48:55 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -35,6 +35,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
 	epatch "${FILESDIR}"/${MY_P}-share-sed.patch #42336
+	epatch "${FILESDIR}"/${MY_P}-c++-templates.patch #90819
 }
 
 src_compile() {