Fix library installation (#400623), underlinking, build with latest automake, dicts installation.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 111 insertions, 24 deletions

diff --git a/app-text/ots/ChangeLog b/app-text/ots/ChangeLog
index 7510396d1e7c..a558f5d28acb 100644
--- a/app-text/ots/ChangeLog
+++ b/app-text/ots/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/ots
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ots/ChangeLog,v 1.32 2012/08/05 20:51:32 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ots/ChangeLog,v 1.33 2013/10/15 20:46:09 pacho Exp $
+
+*ots-0.5.0-r1 (15 Oct 2013)
+
+  15 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/ots-0.5.0-automake-1.13.patch, +files/ots-0.5.0-fix-installation.patch,
+  +files/ots-0.5.0-fix-underlinking.patch, +ots-0.5.0-r1.ebuild,
+  -files/ots-0.4.2-gcc4.diff:
+  Fix library installation (#400623), underlinking, build with latest automake,
+  dicts installation.
 
   05 Aug 2012; Anthony G. Basile <blueness@gentoo.org> ots-0.5.0.ebuild:
   Keyword ~arm
@@ -111,4 +120,3 @@
   <nadav256@hotmail.com> requested this to be added in IRC, to me.  I didn't
   see bug #24079 by MG <markgilbert@hotpop.com> where he had submitted the
   ebuild for this. Apologies to him nd foser.
-
diff --git a/app-text/ots/files/ots-0.4.2-gcc4.diff b/app-text/ots/files/ots-0.4.2-gcc4.diff
deleted file mode 100644
index 7ec0f46a8fed..000000000000
--- a/app-text/ots/files/ots-0.4.2-gcc4.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ots-0.4.2.orig/src/article.c	2005-09-28 22:11:41.000000000 -0300
-+++ ots-0.4.2/src/article.c	2005-09-28 22:18:24.000000000 -0300
-@@ -35,7 +35,7 @@
- ots_new_sentence (void)
- {
-   OtsSentence *aLine = g_new0 (OtsSentence, 1);
--  (GList *) aLine->words = NULL;
-+  aLine->words = (GList *)NULL;
-   aLine->wc = 0;
-   aLine->selected = 0;
-   aLine->score = 0;
---- ots-0.4.2.orig/src/grader-tf.c	2005-09-28 22:11:41.000000000 -0300
-+++ ots-0.4.2/src/grader-tf.c	2005-09-28 22:21:48.000000000 -0300
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "libots.h"
-+#include <math.h>
- 
- /*Grader - using the Term frequency algorithm. Will give each line a score*/
- 
diff --git a/app-text/ots/files/ots-0.5.0-automake-1.13.patch b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
new file mode 100644
index 000000000000..074eb0e53a83
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -up ots-0.5.0/configure.in.automake-1_13 ots-0.5.0/configure.in
+--- ots-0.5.0/configure.in.automake-1_13	2007-04-08 20:12:42.000000000 +0200
++++ ots-0.5.0/configure.in	2013-01-09 02:31:52.690211708 +0100
+@@ -34,7 +34,7 @@ PACKAGE=ots
+ 
+ dnl Specify a configuration file
+ dnl Initialize automake stuff
+-AM_CONFIG_HEADER(ots-config.h)
++AC_CONFIG_HEADERS(ots-config.h)
+ AM_INIT_AUTOMAKE($PACKAGE, $OTS_VERSION)
+ AM_MAINTAINER_MODE
+ 
diff --git a/app-text/ots/files/ots-0.5.0-fix-installation.patch b/app-text/ots/files/ots-0.5.0-fix-installation.patch
new file mode 100644
index 000000000000..757f4f86b80b
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-fix-installation.patch
@@ -0,0 +1,11 @@
+--- dic/Makefile.am~	2003-07-22 16:56:03.000000000 +0200
++++ dic/Makefile.am	2009-06-01 00:40:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ DICTS=bg.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml \
+       et.xml eu.xml fi.xml fr.xml ga.xml gl.xml he.xml hu.xml ia.xml id.xml \
+       is.xml it.xml lv.xml mi.xml ms.xml mt.xml nl.xml nn.xml pl.xml pt.xml \
+-      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml en.xml
++      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml
+ 
+ pkgdata_DATA = $(DICTS)
+ 
diff --git a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
new file mode 100644
index 000000000000..dd9295930c33
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2007-04-08 20:17:23.000000000 +0200
++++ src/Makefile.in	2008-07-05 02:16:42.000000000 +0200
+@@ -108,7 +108,7 @@
+ 
+ lib_LTLIBRARIES = libots-1.la
+ 
+-libots_1_la_LIBADD = $(OTS_LIBS)
++libots_1_la_LIBADD = $(OTS_LIBS) -lm
+ libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
+ libots_1_la_SOURCES =  	libots.h			article.c			dictionary.c			grader.c			grader-tf.c			grader-tc.c			grader-tc.h			html.c				parser.c 			text.c				stemmer.c			highlighter.c			wordlist.c			relations.c
+ 
+--- src/Makefile.am~	2007-04-08 18:21:51.000000000 +0200
++++ src/Makefile.am	2009-06-01 00:28:53.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ lib_LTLIBRARIES = libots-1.la
+ 
+-libots_1_la_LIBADD  = $(OTS_LIBS)
++libots_1_la_LIBADD  = $(OTS_LIBS) -lm
+ libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
+ libots_1_la_SOURCES =		\
+ 	libots.h		\
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..09793a0a4dec
--- /dev/null
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ots/ots-0.5.0-r1.ebuild,v 1.1 2013/10/15 20:46:09 pacho Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Open source Text Summarizer, as used in newer releases of abiword and kword."
+HOMEPAGE="http://libots.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/popt-1.5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+
+src_prepare() {
+	# ugly ugly hack, kick upstream to fix its packaging
+	touch "${S}"/gtk-doc.make
+
+	epatch "${FILESDIR}"/${P}-math.patch
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+	epatch "${FILESDIR}"/${P}-fix-installation.patch
+	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	# bug 97448
+	econf \
+		--disable-gtk-doc \
+		--disable-static
+}
+
+src_compile() {
+	# parallel make fails, bug 112932
+	emake -j1
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	rm -rf "${D}"/usr/share/doc/libots
+}