Stable 0.9.6 on all archs for the annoying crashes (only cosm patches that are not needed for all at to test). Remove older.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 8 insertions, 59 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index e1dfa4740b04..da24172f80e4 100644
--- a/app-text/libwpd/ChangeLog
+++ b/app-text/libwpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/libwpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.102 2012/09/25 07:58:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.103 2012/10/24 14:50:54 scarabeus Exp $
+
+  24 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libwpd-0.9.4.ebuild,
+  libwpd-0.9.6.ebuild:
+  Stable 0.9.6 on all archs for the annoying crashes (only cosm patches that are
+  not needed for all at to test). Remove older.
 
   25 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libwpd-0.9.6.ebuild:
   Drop autotools eclass.
diff --git a/app-text/libwpd/libwpd-0.9.4.ebuild b/app-text/libwpd/libwpd-0.9.4.ebuild
deleted file mode 100644
index 2d8bbb3647b3..000000000000
--- a/app-text/libwpd/libwpd-0.9.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.4.ebuild,v 1.10 2012/05/29 22:04:46 blueness Exp $
-
-EAPI=4
-
-inherit alternatives autotools eutils
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0.9"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test +tools"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${RDEPEND}
-	!<app-text/libwpd-0.8.14-r1"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_with tools stream) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--program-suffix=-${SLOT}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9]"
-	fi
-}
-
-pkg_postrm() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9]"
-	fi
-}
diff --git a/app-text/libwpd/libwpd-0.9.6.ebuild b/app-text/libwpd/libwpd-0.9.6.ebuild
index 748422682b36..ff2cc7eb95ca 100644
--- a/app-text/libwpd/libwpd-0.9.6.ebuild
+++ b/app-text/libwpd/libwpd-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.6.ebuild,v 1.2 2012/09/25 07:58:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.6.ebuild,v 1.3 2012/10/24 14:50:54 scarabeus Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test +tools"
 
 RDEPEND=""