Bug #302284 version bump. Include patch to fix upstream putting config files in /usr/local/lib, and fix the testsuite to use the non-installed copy of them as well.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 64 insertions, 1 deletions

diff --git a/app-text/unrtf/ChangeLog b/app-text/unrtf/ChangeLog
index 43db3d4f6276..f6e2e5a51bde 100644
--- a/app-text/unrtf/ChangeLog
+++ b/app-text/unrtf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/unrtf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/ChangeLog,v 1.38 2010/01/02 11:44:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/ChangeLog,v 1.39 2010/02/01 06:40:31 robbat2 Exp $
+
+*unrtf-0.21.1 (01 Feb 2010)
+
+  01 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +unrtf-0.21.1.ebuild,
+  +files/unrtf-0.21.1-automake-fix.patch:
+  Bug #302284 version bump. Include patch to fix upstream putting config
+  files in /usr/local/lib, and fix the testsuite to use the non-installed
+  copy of them as well.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> unrtf-0.20.5.ebuild:
   Transfer Prefix keywords
diff --git a/app-text/unrtf/files/unrtf-0.21.1-automake-fix.patch b/app-text/unrtf/files/unrtf-0.21.1-automake-fix.patch
new file mode 100644
index 000000000000..320e45343977
--- /dev/null
+++ b/app-text/unrtf/files/unrtf-0.21.1-automake-fix.patch
@@ -0,0 +1,26 @@
+diff -Nuarp unrtf-0.21.1.orig/charmaps/Makefile.am unrtf-0.21.1/charmaps/Makefile.am
+--- unrtf-0.21.1.orig/charmaps/Makefile.am	2010-01-17 07:33:12.000000000 +0000
++++ unrtf-0.21.1/charmaps/Makefile.am	2010-02-01 06:37:10.184989205 +0000
+@@ -1,2 +1,2 @@
+-outputsdir = ${libdir}/${PACKAGE}
++outputsdir = ${pkgdatadir}
+ dist_outputs_DATA = SYMBOL.charmap
+diff -Nuarp unrtf-0.21.1.orig/outputs/Makefile.am unrtf-0.21.1/outputs/Makefile.am
+--- unrtf-0.21.1.orig/outputs/Makefile.am	2010-01-17 07:32:48.000000000 +0000
++++ unrtf-0.21.1/outputs/Makefile.am	2010-02-01 06:37:20.968321648 +0000
+@@ -1,2 +1,2 @@
+-outputsdir = ${libdir}/${PACKAGE}
++outputsdir = ${pkgdatadir}
+ dist_outputs_DATA = html.conf latex.conf rtf.conf text.conf vt.conf
+diff -Nuarp unrtf-0.21.1.orig/tests/Makefile.am unrtf-0.21.1/tests/Makefile.am
+--- unrtf-0.21.1.orig/tests/Makefile.am	2010-02-01 06:30:50.085007020 +0000
++++ unrtf-0.21.1/tests/Makefile.am	2010-02-01 06:31:07.848358870 +0000
+@@ -61,7 +61,7 @@ CLEANFILES = $(testresults_html) $(testr
+ # add the test scripts and the test data to the distributed files
+ EXTRA_DIST = $(TESTS) $(testdata)
+ 
+-TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf
++TESTS_ENVIRONMENT = UNRTF="$(top_builddir)/src/unrtf -P $(top_builddir)/outputs:$(top_builddir)/charmaps"
+ 
+ # ensure that the distributed scripts are executable before distribution.
+ # Could be necessary if checking out CVS.
diff --git a/app-text/unrtf/unrtf-0.21.1.ebuild b/app-text/unrtf/unrtf-0.21.1.ebuild
new file mode 100644
index 000000000000..31b7910a56be
--- /dev/null
+++ b/app-text/unrtf/unrtf-0.21.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.21.1.ebuild,v 1.1 2010/02/01 06:40:31 robbat2 Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Converts RTF files to various formats"
+HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
+SRC_URI="http://www.gnu.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/unrtf-0.21.1-automake-fix.patch
+	sed -i \
+		-e 's,/usr/local/lib/,/usr/share/,g' \
+		"${S}"/src/*.h || die "failed to sed"
+	cd "${S}"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog NEWS README AUTHORS
+}