Fix 227295, Gcc-4.3 compatibility. Bump to newest, remove old.

(Portage version: 2.1.5.5)

4 files changed, 46 insertions, 46 deletions

diff --git a/app-text/crf++/ChangeLog b/app-text/crf++/ChangeLog
index ffa26498388c..84c58f89a53d 100644
--- a/app-text/crf++/ChangeLog
+++ b/app-text/crf++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/crf++
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crf++/ChangeLog,v 1.7 2007/12/25 16:58:51 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/crf++/ChangeLog,v 1.8 2008/06/15 20:59:21 loki_val Exp $
+
+*crf++-0.50 (15 Jun 2008)
+
+  15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/crf++-0.50-gcc43.patch, -crf++-0.45.ebuild, -crf++-0.47.ebuild,
+  +crf++-0.50.ebuild:
+  Fix 227295, Gcc-4.3 compatibility. Bump to newest, remove old.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/app-text/crf++/crf++-0.45.ebuild b/app-text/crf++/crf++-0.45.ebuild
deleted file mode 100644
index 59778080b47d..000000000000
--- a/app-text/crf++/crf++-0.45.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crf++/crf++-0.45.ebuild,v 1.2 2007/05/02 17:21:46 usata Exp $
-
-inherit eutils
-
-MY_P="${P/crf/CRF}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="http://crfpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="examples"
-
-DEPEND=""
-
-src_test() {
-	for task in example/* ; do
-		cd ${task}
-		./exec.sh || die "failed test in ${task}"
-		cd -
-	done
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS README
-	dohtml doc/*
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example
-	fi
-}
diff --git a/app-text/crf++/crf++-0.47.ebuild b/app-text/crf++/crf++-0.50.ebuild
index 0fc653d69a70..a40c648c0939 100644
--- a/app-text/crf++/crf++-0.47.ebuild
+++ b/app-text/crf++/crf++-0.50.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/crf++/crf++-0.47.ebuild,v 1.1 2007/05/02 17:21:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/crf++/crf++-0.50.ebuild,v 1.1 2008/06/15 20:59:21 loki_val Exp $
 
-inherit eutils
+inherit eutils base
 
 MY_P="${P/crf/CRF}"
 S="${WORKDIR}/${MY_P}"
@@ -19,6 +19,8 @@ IUSE="examples"
 
 DEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_test() {
 	for task in example/* ; do
 		cd ${task}
@@ -28,7 +30,7 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS README
 	dohtml doc/*
diff --git a/app-text/crf++/files/crf++-0.50-gcc43.patch b/app-text/crf++/files/crf++-0.50-gcc43.patch
new file mode 100644
index 000000000000..0809520dc676
--- /dev/null
+++ b/app-text/crf++/files/crf++-0.50-gcc43.patch
@@ -0,0 +1,31 @@
+diff -NrU5 CRF++-0.50.orig/freelist.h CRF++-0.50/freelist.h
+--- CRF++-0.50.orig/freelist.h	2008-06-15 22:42:21.000000000 +0200
++++ CRF++-0.50/freelist.h	2008-06-15 22:47:44.000000000 +0200
+@@ -7,10 +7,11 @@
+ //
+ #ifndef CRFPP_FREELIST_H__
+ #define CRFPP_FREELIST_H__
+ 
+ #include <vector>
++#include <cstring>
+ 
+ namespace CRFPP {
+   template <class T>
+   class Length {
+   public:
+diff -NrU5 CRF++-0.50.orig/param.h CRF++-0.50/param.h
+--- CRF++-0.50.orig/param.h	2008-06-15 22:42:21.000000000 +0200
++++ CRF++-0.50/param.h	2008-06-15 22:44:33.000000000 +0200
+@@ -28,11 +28,11 @@
+     }
+     return result;
+   }
+ 
+   template <>
+-  static std::string lexical_cast<std::string, std::string>(std::string arg) {
++  std::string lexical_cast<std::string, std::string>(std::string arg) {
+     return arg;
+   }
+ 
+   struct Option {
+     const char *name;