summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-09-28 18:02:53 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-09-28 18:02:53 +0000
commit05d8d9d340cc1e13442ccddf717a9dfd2c6ec596 (patch)
treed6c360df1d91a9cb2bdb4b45a8463dfabb31fa0b /app-text/wpd2odt
parentRevision bump to create stable candidate. (diff)
downloadgentoo-2-05d8d9d340cc1e13442ccddf717a9dfd2c6ec596.tar.gz
gentoo-2-05d8d9d340cc1e13442ccddf717a9dfd2c6ec596.tar.bz2
gentoo-2-05d8d9d340cc1e13442ccddf717a9dfd2c6ec596.zip
Version bump to latest. Drop older. This compiles with gcc-4.6.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'app-text/wpd2odt')
-rw-r--r--app-text/wpd2odt/ChangeLog8
-rw-r--r--app-text/wpd2odt/metadata.xml6
-rw-r--r--app-text/wpd2odt/wpd2odt-0.8.1.ebuild (renamed from app-text/wpd2odt/wpd2odt-0.8.0.ebuild)20
3 files changed, 26 insertions, 8 deletions
diff --git a/app-text/wpd2odt/ChangeLog b/app-text/wpd2odt/ChangeLog
index 7a1f4ad013b4..c23aa0b138c3 100644
--- a/app-text/wpd2odt/ChangeLog
+++ b/app-text/wpd2odt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-text/wpd2odt
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2odt/ChangeLog,v 1.2 2011/08/04 16:27:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2odt/ChangeLog,v 1.3 2011/09/28 18:02:52 scarabeus Exp $
+
+*wpd2odt-0.8.1 (28 Sep 2011)
+
+ 28 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> -wpd2odt-0.8.0.ebuild,
+ +wpd2odt-0.8.1.ebuild, metadata.xml:
+ Version bump to latest. Drop older. This compiles with gcc-4.6.
04 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> wpd2odt-0.8.0.ebuild:
media-libs/libwpg app-text/libwpg
diff --git a/app-text/wpd2odt/metadata.xml b/app-text/wpd2odt/metadata.xml
index fb56680f3630..11ac543649f3 100644
--- a/app-text/wpd2odt/metadata.xml
+++ b/app-text/wpd2odt/metadata.xml
@@ -2,4 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>openoffice</herd>
+<use>
+ <flag name='gsf'>Add support for structured files using <pkg>gnome-extra/libgsf</pkg></flag>
+ <flag name='visio'>Add support for visio format using <pkg>media-libs/libvisio</pkg></flag>
+ <flag name='wpg'>Add support for wpg format using <pkg>app-text/libwpg</pkg></flag>
+ <flag name='wps'>Add support for wps format using <pkg>app-text/libwps</pkg></flag>
+</use>
</pkgmetadata>
diff --git a/app-text/wpd2odt/wpd2odt-0.8.0.ebuild b/app-text/wpd2odt/wpd2odt-0.8.1.ebuild
index b609de83c52b..84c517c687eb 100644
--- a/app-text/wpd2odt/wpd2odt-0.8.0.ebuild
+++ b/app-text/wpd2odt/wpd2odt-0.8.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/wpd2odt/wpd2odt-0.8.0.ebuild,v 1.2 2011/08/04 16:27:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wpd2odt/wpd2odt-0.8.1.ebuild,v 1.1 2011/09/28 18:02:52 scarabeus Exp $
EAPI=4
@@ -10,13 +10,15 @@ SRC_URI="mirror://sourceforge/libwpd/writerperfect-${PV}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="debug gsf +visio +wpg +wps"
RDEPEND="
app-text/libwpd:0.9
- app-text/libwpg:0.2
- gnome-extra/libgsf
+ wpg? ( app-text/libwpg:0.2 )
+ wps? ( app-text/libwps )
+ visio? ( media-libs/libvisio )
+ gsf? ( gnome-extra/libgsf )
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -26,6 +28,10 @@ S=${WORKDIR}/writerperfect-${PV}
src_configure() {
econf \
- --with-libgsf \
- --with-libwpg
+ --disable-werror \
+ $(use_enable debug) \
+ $(use_with gsf libgsf) \
+ $(use_with wpg libwpg) \
+ $(use_with wps libwps) \
+ $(use_with visio libvisio)
}