5 files changed, 34 insertions, 97 deletions
diff --git a/app-text/unrtf/ChangeLog b/app-text/unrtf/ChangeLog
index d724d60b3c5c..4b80f7accd24 100644
--- a/app-text/unrtf/ChangeLog
+++ b/app-text/unrtf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/unrtf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/ChangeLog,v 1.44 2014/12/22 14:32:52 polynomial-c Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/ChangeLog,v 1.45 2015/01/03 14:34:49 polynomial-c Exp $
+
+*unrtf-0.21.9 (03 Jan 2015)
+
+  03 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -unrtf-0.19.3-r1.ebuild,
+  -unrtf-0.21.1.ebuild, -unrtf-0.21.2.ebuild, +unrtf-0.21.9.ebuild:
+  Version bump. Removed old.
 
   22 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> unrtf-0.21.8.ebuild:
   Removed now obsolete src_install function.
diff --git a/app-text/unrtf/unrtf-0.19.3-r1.ebuild b/app-text/unrtf/unrtf-0.19.3-r1.ebuild
deleted file mode 100644
index 9eaa3ec1d06c..000000000000
--- a/app-text/unrtf/unrtf-0.19.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.19.3-r1.ebuild,v 1.9 2005/05/31 00:04:36 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 x86 ~sparc"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-final.patch
-	# in 0.19.3 it's a tar file of 0.19.2
-	rm ${S}/AUTHORS
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dobin unrtf || die
-	doman unrtf.1
-	dohtml doc/unrtf.html
-	dodoc CHANGES README TODO
-}
diff --git a/app-text/unrtf/unrtf-0.21.1.ebuild b/app-text/unrtf/unrtf-0.21.1.ebuild
deleted file mode 100644
index 989a1c01d15a..000000000000
--- a/app-text/unrtf/unrtf-0.21.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.2 2010/03/09 11:19:14 grobian 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}"
-	epatch "${FILESDIR}"/${P}-iconv-detection.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README AUTHORS
-}
diff --git a/app-text/unrtf/unrtf-0.21.2.ebuild b/app-text/unrtf/unrtf-0.21.2.ebuild
deleted file mode 100644
index 584d92c963a2..000000000000
--- a/app-text/unrtf/unrtf-0.21.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.21.2.ebuild,v 1.1 2011/12/20 04:16:22 robbat2 Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gnu/${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_prepare() {
-	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}"
-	epatch "${FILESDIR}"/${PN}-0.21.2-iconv-detection.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc ChangeLog NEWS README AUTHORS
-}
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
new file mode 100644
index 000000000000..1dc181194992
--- /dev/null
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/unrtf/unrtf-0.21.9.ebuild,v 1.1 2015/01/03 14:34:49 polynomial-c Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Converts RTF files to various formats"
+HOMEPAGE="http://www.gnu.org/software/unrtf/unrtf.html"
+SRC_URI="mirror://gnu/${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 ~x64-solaris"
+IUSE=""
+
+src_prepare() {
+	# eautoreconf fails when automake-1.14* is installed. Please check with
+	# next version bump if we still need this workaround.
+	rm aclocal.m4 || die
+
+	epatch "${FILESDIR}"/unrtf-0.21.8-automake-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.21.8-iconv-detection.patch
+	eautoreconf
+}