Fix docs installation (bug #374369 by Chris Mayo) and version bump.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 84 insertions, 7 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index 6b94e21aafc7..592ab4900700 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.74 2011/07/02 11:24:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.75 2011/07/08 11:16:52 pacho Exp $
+
+*libwpd-0.9.2 (08 Jul 2011)
+
+  08 Jul 2011; Pacho Ramos <pacho@gentoo.org> libwpd-0.9.1.ebuild,
+  +libwpd-0.9.2.ebuild:
+  Fix docs installation (bug #374369 by Chris Mayo) and version bump.
 
   02 Jul 2011; Pacho Ramos <pacho@gentoo.org> libwpd-0.8.14-r1.ebuild,
   libwpd-0.9.1.ebuild:
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index db260d020325..3a71be3d44e3 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -5,15 +5,17 @@ AUX libwpd-0.9.1-gcc46.patch 1864 RMD160 e3452710283ef0e87892d361e0bbf422e55c8f9
 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
 EBUILD libwpd-0.8.14-r1.ebuild 1638 RMD160 07239bcc1d40266db1bc1133eec0374a41fd0981 SHA1 8fc6e8ccccd2e4a052f5c464d3554a17bb44d52c SHA256 af08acd0b57f12ddd01097eecc8b9e684138621bd4e444d5194507f1772d2be9
 EBUILD libwpd-0.8.14.ebuild 901 RMD160 de49adddfbe7cb475f5476726e2142780193460d SHA1 b8e6256dc4027d82145428be169f92d793f2cdaf SHA256 cb9590bb3d8156a08b0abe4de7d185ef80a24d4dd8f1669f7d5bb514a23d8e1a
-EBUILD libwpd-0.9.1.ebuild 1907 RMD160 c3ae572405f5612fbee25f0ef7ab603112c5ab2d SHA1 e5a5571c796a7aab0fb29add0f5ba96f157f8a5f SHA256 fe2608488352ccb03fc9b99a775371a857f79f69d5c65dd1dd6816e83cb59bc1
-MISC ChangeLog 9098 RMD160 e0f4714f80ad7b85cb7ca110dd90e3ada4b28e31 SHA1 9a3b20562309638c4fbe20345f11b77d18f6b800 SHA256 ad0d0ae46a73a889af5b4f3fd45a31ea347189bd0ca5c2ffabcfc5efdf657c62
+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 9289 RMD160 2f52a07a5b21f8c4dc1052140235cfbaa5a66353 SHA1 3ff3a9b97b1c6fd9e86ebb87b0aa1711ae5a4285 SHA256 67e5a97193c7ae96ac5cf8956313473a9b45dbf50ee59324133734fc54ed5ac3
 MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4O/+QACgkQCaWpQKGI+9RvTwCeLgbko7LjWhUJ2oQ+P0SCvDJL
-+ukAni/PsHmA6Mxm6y674uCUQDSSEW3y
-=l2FM
+iEYEARECAAYFAk4W5yoACgkQCaWpQKGI+9RF+ACfeuunM5xM7BsFGSX4IA2XtNKS
+gSYAniMZiOSCHNkes0yVPRAvgcG4M9rq
+=q+/6
 -----END PGP SIGNATURE-----
diff --git a/app-text/libwpd/libwpd-0.9.1.ebuild b/app-text/libwpd/libwpd-0.9.1.ebuild
index a85657282303..4088b6c88745 100644
--- a/app-text/libwpd/libwpd-0.9.1.ebuild
+++ b/app-text/libwpd/libwpd-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2011/07/02 11:24:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.7 2011/07/08 11:16:52 pacho Exp $
 
 EAPI="4"
 
@@ -44,6 +44,7 @@ src_configure() {
 	econf \
 		$(use_with doc docs) \
 		$(use_with tools stream) \
+		--docdir=/usr/share/doc/${PF} \
 		--program-suffix=-${SLOT}
 }
 
diff --git a/app-text/libwpd/libwpd-0.9.2.ebuild b/app-text/libwpd/libwpd-0.9.2.ebuild
new file mode 100644
index 000000000000..e49451f573cb
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# 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
+}