From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Thu, 1 Sep 2011 09:59:06 +0000 (+0000)
Subject: Version bump to latest 0.9 release. Punt older ones from that slot.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=80fa28ded522bef581712f38a19fba473ff720e9;p=gentoo.git

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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---

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/Manifest b/app-text/libwpd/Manifest
index 842580ad640f..2fa0f43d79b0 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX libwpd-0.9.1-gcc46.patch 1864 RMD160 e3452710283ef0e87892d361e0bbf422e55c8f98 SHA1 6008c567e4a68e274c31c586e15287bcd29b2ca0 SHA256 f95a5a3edda76fda7d27d039696fd4bbc660a17ef8219f82f0cb4ca09fd1ea2d
 AUX libwpd-0.9.1-test-build.patch 312 RMD160 fe4525bceb0075f45020127551c06500d7e0014b SHA1 a81860d901a35951e7c26f565e055a5814533add SHA256 9aa5942719ff08b8955f14e7e25c0db3e14258106d1d03fbbdef824a9d87d35f
 DIST libwpd-0.8.14.tar.bz2 424176 RMD160 fdac23a7c582119e4840958f2dac7a30953f86d4 SHA1 0ffc66954bde284030a6c5ad837b862160ed3d33 SHA256 e4aca91b90d6faf9b01fbc4695074ac43f236eb39aee6f8bd993e1c241149901
-DIST libwpd-0.9.1.tar.bz2 540345 RMD160 8cb666fd4244831be0008a24905fb22692414d8e SHA1 bc1fd58fdb260409b02bd01911bd3187b05c5220 SHA256 f8295f3803f9089f31c26b77371f3bcaf8e57909b6803b7b8fb9194e7e55e40b
-DIST libwpd-0.9.2.tar.bz2 614862 RMD160 6509411050260fa35d2c0b7d590e7781478b65cb SHA1 4cbf7e1534082156c4c4a1402d26cf2416649fda SHA256 cc52efc05136876f90166d9bb778fb0d6be1dd05f3bce4435d42baa281109f1a
+DIST libwpd-0.9.3.tar.bz2 621849 RMD160 07e2fc78e296bb5b6ce6fee8f2be2cf45b8f3ee1 SHA1 0165a5d48e247522a5d6c4fb7a977e82daabcbd1 SHA256 1a1b7d76521d10c641cfe6d2be927abf7b4503b93bf99e48ef4f5d097b003947
 EBUILD libwpd-0.8.14-r1.ebuild 1631 RMD160 48e2233d079713ffca8cae1ec978efd1e20020e2 SHA1 3fe4cb3873cc8bbaf3b128629c24057f78f9d108 SHA256 55cffd43de3f400d9356a594bb59f5ea68b279be547100b3a60cf0b3789ddab7
 EBUILD libwpd-0.8.14.ebuild 901 RMD160 de49adddfbe7cb475f5476726e2142780193460d SHA1 b8e6256dc4027d82145428be169f92d793f2cdaf SHA256 cb9590bb3d8156a08b0abe4de7d185ef80a24d4dd8f1669f7d5bb514a23d8e1a
-EBUILD libwpd-0.9.1.ebuild 1941 RMD160 917298cda40b943d5526d3ca5f808466058c0667 SHA1 467cc86432e7f198ee41162672b2c235cc3c0e86 SHA256 a3104403164c90cf90dac3f76f8c1c18155a343536bcc7565303ffbf8674e7e4
-EBUILD libwpd-0.9.2.ebuild 1950 RMD160 93d57f1c49f8dcc0af63b505a046303869b97d7a SHA1 93e1bc522d3380149d26d88a3abb5e2dffa5efd7 SHA256 b131971efc0c5d2779cca12345b8916bbb0f63866c686d3906492050fca93876
-MISC ChangeLog 9709 RMD160 558fd220331ae3a127fd52c3fb8ac8ac95bb6120 SHA1 a80de8e88355fad7e067c64cc3434ca64a67bc3e SHA256 b25f421d3fbdf52d4362d761a239eee6c21b722f19105c5794be244c5b8f00e6
+EBUILD libwpd-0.9.3.ebuild 1588 RMD160 e1f442d0d715e89f0b44e7558f49865e12858990 SHA1 87861757bc3ec2e5ba12d12f75b4ad953c4ae2d6 SHA256 865f5469f1c5ad2486a88ba1f7ccc3cb13d87759d4b0f1aa74df646740558947
+MISC ChangeLog 9938 RMD160 66e36b433641ee49b4311a4c5987f72aeee5f900 SHA1 e7bba6f874b0019014470063d7f1d46d49d01c6b SHA256 6ca8ad03790cbabe92b1b31a2ad73bb7ed9499acfad1da156b15664ee00c6fb9
 MISC metadata.xml 248 RMD160 e6e19f57017979f608542b1e09ee93cfa150438e SHA1 769c3dd9e05b840fadd34b4e51f4268a26f30f31 SHA256 2c7cca8c98a1d6a1bb228d65355ca2e55181d9eca1246db84faa6896cdc7e56f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5P/boACgkQVWmRsqeSphPM4wCfYGDKD2K1M4SHGqzxDk5L4Wv8
-BgMAmQEKkibLcyDCRGYgIWDNIJFG8Qto
-=8RJj
+iEYEARECAAYFAk5fV30ACgkQHB6c3gNBRYdB/ACgvWwnprSA4WQMzTbkFv/wC2xP
+C/MAn2IVwZdmMp5Zyg8tlZncQ6VidZqM
+=HXmZ
 -----END PGP SIGNATURE-----
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
similarity index 71%
rename from app-text/libwpd/libwpd-0.9.1.ebuild
rename to 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() {