From: Hannes Mehnert <hannes@gentoo.org>
Date: Sun, 3 Nov 2002 11:10:11 +0000 (+0000)
Subject: fixed to compile with gcc-3.2 (#9903)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ffd2e1d5dcbb65f8905edbdcd4f3f63f5fa14ee4;p=gentoo.git

fixed to compile with gcc-3.2 (#9903)
---

diff --git a/dev-libs/korelib/ChangeLog b/dev-libs/korelib/ChangeLog
index d205629f847f..ac4c3ddc96a8 100644
--- a/dev-libs/korelib/ChangeLog
+++ b/dev-libs/korelib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/korelib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/korelib/ChangeLog,v 1.1 2002/08/20 01:36:25 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/korelib/ChangeLog,v 1.2 2002/11/03 11:10:11 hannes Exp $
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> korelib-1.0.ebuild:
+  added patch to compile with gcc-3.2, thanks to gentoo-bugzilla@lusis.org
+  (John E. Vincent) for submission.
 
 *korelib-1.0.ebuild (19 Aug 2002)
 
diff --git a/dev-libs/korelib/files/korelib-1.0-gentoo.diff b/dev-libs/korelib/files/korelib-1.0-gentoo.diff
new file mode 100644
index 000000000000..c047badeba3e
--- /dev/null
+++ b/dev-libs/korelib/files/korelib-1.0-gentoo.diff
@@ -0,0 +1,42 @@
+--- kore/metainfo.cpp.orig	2002-05-20 16:26:01.000000000 +0200
++++ kore/metainfo.cpp	2002-11-02 21:04:32.000000000 +0100
+@@ -1,7 +1,11 @@
+ #include <kore/metainfo.h>
+ #include <vector>
+ #include <iostream.h>
++#if (__GNUC__<3)
+ #include <hash_map>
++#else
++#include <backward/hash_map.h>
++#endif
+ using namespace kore;
+ using namespace std;
+ 
+--- kore/componenttrader.cpp.orig	2002-05-20 16:26:01.000000000 +0200
++++ kore/componenttrader.cpp	2002-11-02 21:04:56.000000000 +0100
+@@ -8,7 +8,11 @@
+ #include <strstream>
+ 
+ //#ifdef _WIN32
++#if (__GNUC__<3)
+ #include <hash_map>
++#else
++#include <backward/hash_map.h>
++#endif
+ #include <vector>
+ #include <set>
+ //#else
+--- include/kore/metainfo.h.orig	2002-05-20 16:26:01.000000000 +0200
++++ include/kore/metainfo.h	2002-11-02 21:05:19.000000000 +0100
+@@ -7,7 +7,11 @@
+ #include <map>
+ #include <iostream.h>
+ #else
++#if (__GNUC__<3)
+ #include <hash_map>
++#else
++#include <backward/hash_map.h>
++#endif
+ #endif
+ #include <set>
+ 
diff --git a/dev-libs/korelib/korelib-1.0.ebuild b/dev-libs/korelib/korelib-1.0.ebuild
index 8c7e1b0b3662..6de37dcb6cfe 100644
--- a/dev-libs/korelib/korelib-1.0.ebuild
+++ b/dev-libs/korelib/korelib-1.0.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/korelib/korelib-1.0.ebuild,v 1.3 2002/10/20 18:41:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/korelib/korelib-1.0.ebuild,v 1.4 2002/11/03 11:10:11 hannes Exp $
 
-#A="korelib-1.0.tar.gz"
-S=${WORKDIR}/${P}
+IUSE=""
 DESCRIPTION="theKompany's cross-platform c++ library for developing modular applications"
 SRC_URI="ftp://ftp.rygannon.com/pub/Korelib/${P}.tar.gz"
 HOMEPAGE="http://www.thekompany.com/projects/korelib/"
 
 DEPEND="virtual/glibc"
 
-LICENSE="GPL-2 | commercial"
+LICENSE="GPL-2 QPL-1.0"
 SLOT="1"
 KEYWORDS="x86"
 
 src_compile() {
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 	#this is really weird - lib developers did not run automake themselves
 	#leaving this to the "end users"
 	automake
@@ -28,7 +28,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install
 	
-	#the lib installs one binary with by the name "demo" - baad choice
+	#the lib installs one binary with by the name "demo" - bad choice
 	mv ${D}/usr/bin/demo ${D}/usr/bin/kore-demo
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README THANKS TODO