Clean up ebuilds and make parallel installable, binaries are backward compatible and behind a USE flag, bug #289879. Rework invalid sed, bug #364655.

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

7 files changed, 121 insertions, 20 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index 935e8bd34aba..35846e86a5b9 100644
--- a/app-text/libwpd/ChangeLog
+++ b/app-text/libwpd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.68 2011/04/20 12:18:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.69 2011/04/24 15:13:43 eva Exp $
+
+*libwpd-0.8.14-r1 (24 Apr 2011)
+
+  24 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> libwpd-0.8.14.ebuild,
+  +libwpd-0.8.14-r1.ebuild, libwpd-0.9.1.ebuild,
+  +files/libwpd-0.9.1-test-build.patch, metadata.xml:
+  Clean up ebuilds and make parallel installable, binaries are backward
+  compatible and behind a USE flag, bug #289879. Rework invalid sed, bug
+  #364655.
 
 *libwpd-0.9.1 (20 Apr 2011)
 
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index d8aa9e542882..5bd9419e5107 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -2,16 +2,18 @@
 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
-EBUILD libwpd-0.8.14.ebuild 901 RMD160 db60d203b818469d5c39acde4dac08e0ca2a7fbd SHA1 480a0cb087574be7b15329ef25d42284823c3913 SHA256 57ce183a9f161dcb8b76d37d7ab2373b673ad4f07c96a4eca2c2805ed9e69472
-EBUILD libwpd-0.9.1.ebuild 956 RMD160 acb379ac30cbf2277f7378c4e43a6f186788df32 SHA1 3697bd3f0ce582009dc5326ca018e7f94b53c40f SHA256 18339de197edca04542a232f08fdd37d344a76a761b60f6334218bf96bb6e01e
-MISC ChangeLog 7973 RMD160 41b4085ced2a3ba2edab60618501f912e6d1b4d5 SHA1 a9bb5a57041eb758220de99a1d7442ca7542633b SHA256 1e2c296f0a4d2cbe75d364802ca822b124cf838f63f93ba104bb52a878ee3488
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD libwpd-0.8.14-r1.ebuild 1488 RMD160 4a1843b8bd09677167ab2a29eed0b01ca5ec9fbd SHA1 596553868b47b09dbe0eef50da75f7d0a3be4510 SHA256 76a76fb7e738bc17bc1da2a840dae8730a2516658802e55bb1554b08f17e6d08
+EBUILD libwpd-0.8.14.ebuild 901 RMD160 de49adddfbe7cb475f5476726e2142780193460d SHA1 b8e6256dc4027d82145428be169f92d793f2cdaf SHA256 cb9590bb3d8156a08b0abe4de7d185ef80a24d4dd8f1669f7d5bb514a23d8e1a
+EBUILD libwpd-0.9.1.ebuild 1748 RMD160 0b056bef88518d69ba1475c50a5f1df4b09cdc45 SHA1 b69025d7b2564af27403c1e059fec68f56d095c3 SHA256 e190367a295c5fbd68d7e580a1217675a0f4aa18d7d90f1939a732c0989452fb
+MISC ChangeLog 8340 RMD160 50ad47d5b4402eb302608b4ddae03657fa478de9 SHA1 75994e650aada2c036f74d29357af6e32e824acd SHA256 5153f62fb5ccbce2e3fd43ab316a924b0430f6c3426af28664d770547d6f16f2
+MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2uzv8ACgkQCaWpQKGI+9TPjwCaA7q6t08tLGz8smqwmw+cpQs4
-QUUAni+luRenpQ8b0X1SYladO5T2+UVJ
-=hg5l
+iEYEARECAAYFAk20Pi0ACgkQ1fmVwcYIWAa7WwCg4bu/aY/gZFN3DCnpToFEOvhx
+Hq8AoJQdZmYnVFGMlFLae3CGJyRXESzq
+=sidw
 -----END PGP SIGNATURE-----
diff --git a/app-text/libwpd/files/libwpd-0.9.1-test-build.patch b/app-text/libwpd/files/libwpd-0.9.1-test-build.patch
new file mode 100644
index 000000000000..c62a63832f48
--- /dev/null
+++ b/app-text/libwpd/files/libwpd-0.9.1-test-build.patch
@@ -0,0 +1,10 @@
+--- a/src/test/Makefile.am	2011-04-24 16:52:45.000000000 +0200
++++ b/src/test/Makefile.am	2011-04-24 16:52:59.000000000 +0200
+@@ -1,6 +1,6 @@
+ target_test = test
+ 
+-noinst_PROGRAMS = $(target_test)
++check_PROGRAMS = $(target_test)
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/src/lib/ $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS)
+ 
diff --git a/app-text/libwpd/libwpd-0.8.14-r1.ebuild b/app-text/libwpd/libwpd-0.8.14-r1.ebuild
new file mode 100644
index 000000000000..57b535c5c065
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.8.14-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.8.14-r1.ebuild,v 1.1 2011/04/24 15:13:43 eva Exp $
+
+EAPI="4"
+
+inherit alternatives
+
+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.8"
+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="dev-libs/glib:2
+	tools? ( >=gnome-extra/libgsf-1.6 )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_configure() {
+	econf \
+		$(use_with doc docs) \
+		$(use_with tools stream) \
+		--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.8.14.ebuild b/app-text/libwpd/libwpd-0.8.14.ebuild
index 6920d4d3c624..b22b09198d9e 100644
--- a/app-text/libwpd/libwpd-0.8.14.ebuild
+++ b/app-text/libwpd/libwpd-0.8.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.8.14.ebuild,v 1.10 2010/01/02 11:28:27 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.14.ebuild,v 1.11 2011/04/24 15:13:43 eva Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://libwpd.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0.8"
 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"
 RESTRICT="test"
diff --git a/app-text/libwpd/libwpd-0.9.1.ebuild b/app-text/libwpd/libwpd-0.9.1.ebuild
index 59313ae60b93..996a69a21800 100644
--- a/app-text/libwpd/libwpd-0.9.1.ebuild
+++ b/app-text/libwpd/libwpd-0.9.1.ebuild
@@ -1,38 +1,62 @@
 # 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.1 2011/04/20 12:18:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.1.ebuild,v 1.2 2011/04/24 15:13:43 eva Exp $
 
 EAPI="4"
 
-inherit eutils autotools
+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"
+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"
+IUSE="doc test tools"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.8.14-r1"
 
 src_prepare() {
-	sed -i -e 's: -Wall -Werror -pedantic::g' configure.in || die
-	epatch "${FILESDIR}/${P}-gcc46.patch"
+	# Do not abort build for warnings
+	sed -i -e 's:-Werror::g' configure.in configure || die
+
+	# 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 \
-		$(use_with doc docs)
+		$(use_with doc docs) \
+		$(use_with tools stream) \
+		--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/metadata.xml b/app-text/libwpd/metadata.xml
index da6fd63d0085..becd44344985 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="tools">Build miscellaneous tools</flag>
+</use>
 </pkgmetadata>