Version bump to latest 0.9 release. Punt older ones from that slot.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 12 insertions, 88 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index efe7074c08ce..ca5d7a1076dc 100644
--- a/app-text/libwpd/ChangeLog
+++ b/app-text/libwpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/libwpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.79 2011/08/20 18:32:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.80 2011/09/01 09:59:06 scarabeus Exp $
+
+*libwpd-0.9.3 (01 Sep 2011)
+
+  01 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libwpd-0.9.1.ebuild,
+  -libwpd-0.9.2.ebuild, +libwpd-0.9.3.ebuild:
+  Version bump to latest 0.9 release. Punt older ones from that slot.
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> libwpd-0.8.14-r1.ebuild:
   Stable for HPPA (bug #369909).
diff --git a/app-text/libwpd/libwpd-0.9.2.ebuild b/app-text/libwpd/libwpd-0.9.2.ebuild
deleted file mode 100644
index e49451f573cb..000000000000
--- a/app-text/libwpd/libwpd-0.9.2.ebuild
+++ /dev/null
@@ -1,68 +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/libwpd/libwpd-0.9.2.ebuild,v 1.1 2011/07/08 11:16:52 pacho 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 ~hppa ~ia64 ~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}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${RDEPEND}
-	!<app-text/libwpd-0.8.14-r1"
-
-src_prepare() {
-	# Do not abort build for warnings
-	sed -i -e 's:-Werror::g' configure.in configure || die
-
-	# Skip stream tests when it's disabled, bug #373757, upstream bug #13104
-	if ! use tools; then
-		sed -i -e '/src\/test/d' Makefile.{am,in} || die
-	fi
-
-	# Do not build tests if not needed (and no before the lib itself), upstream bug #13103
-	epatch "${FILESDIR}/${PN}-0.9.1-test-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with doc docs) \
-		$(use_with tools stream) \
-		--docdir=/usr/share/doc/${PF} \
-		--program-suffix=-${SLOT}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
-
-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.1.ebuild b/app-text/libwpd/libwpd-0.9.3.ebuild
index 4088b6c88745..0c988830755e 100644
--- a/app-text/libwpd/libwpd-0.9.1.ebuild
+++ b/app-text/libwpd/libwpd-0.9.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.7 2011/07/08 11:16:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.3.ebuild,v 1.1 2011/09/01 09:59:06 scarabeus Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit alternatives autotools eutils
 
@@ -24,24 +24,10 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	!<app-text/libwpd-0.8.14-r1"
 
-src_prepare() {
-	# Do not abort build for warnings
-	sed -i -e 's:-Werror::g' configure.in configure || die
-
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-
-	# Skip stream tests when it's disabled, bug #373757
-	if ! use tools; then
-		sed -i -e '/src\/test/d' Makefile.{am,in} || die
-	fi
-
-	# Do not build tests if not needed (and no before the lib itself)
-	epatch "${FILESDIR}/${P}-test-build.patch"
-	eautoreconf
-}
-
 src_configure() {
 	econf \
+		--disable-static \
+		--disable-werror \
 		$(use_with doc docs) \
 		$(use_with tools stream) \
 		--docdir=/usr/share/doc/${PF} \
@@ -50,7 +36,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {