Version bump to latest. Drop older. This compiles with gcc-4.6.

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

diff --git a/app-text/wpd2odt/ChangeLog b/app-text/wpd2odt/ChangeLog
index 7a1f4ad013b46fdda3e55ede0f314323f6be0c30..c23aa0b138c3d874c75e4d92cb364b54110a2f8f 100644 (file)
--- 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/Manifest b/app-text/wpd2odt/Manifest
index bfd34f40c48c0c1bb6f1d20db9b910570d2b7c97..38ac7bec4a314a1919d2b2060fee453554717bfa 100644 (file)
--- a/app-text/wpd2odt/Manifest
+++ b/app-text/wpd2odt/Manifest
@@ -1,14 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST writerperfect-0.8.0.tar.bz2 298845 RMD160 9e3ed1aa72249f602a724cb696bb141acdced516 SHA1 4469dd86d7c6fd6359784e9e4175ae55dd956759 SHA256 d5bfd34cd817b052cf87eb3a9e9efc42ef8b1ce6e175a19e5b75a16967bfe68d
-EBUILD wpd2odt-0.8.0.ebuild 731 RMD160 eec4294113fdc25b1151e4eb750902f14826398f SHA1 8cf9300d5568285f44aac01be25e5c9e66fded66 SHA256 526b0758d1041323c193bf1d2185c6a2a1f4194d0d64056574584fea8b4f2cb2
-MISC ChangeLog 522 RMD160 177e2356ab2d8ebe409fefab59833c8e45a082d3 SHA1 1176355955a464f10c73ecc431ec560cd5ab8935 SHA256 f645b98a507970d53eed70fb73fabbcc8eefd194db849a3f27fffdb976f21cf6
-MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
+DIST writerperfect-0.8.1.tar.bz2 304145 RMD160 23dbd7d7f06296fa7915b312f6a9756971998677 SHA1 c48b42f042973923f56d17ce4c1b5024b6e6dcb8 SHA256 70068b3c887f4171eadd450d4190e393e433db489408eabc923be3d2ff5992e8
+EBUILD wpd2odt-0.8.1.ebuild 943 RMD160 5d919dccf7d09a0705358b15cb5dd2dc82cc651b SHA1 61e3d05d7be14b7fc227a7106e3d1db5e651cb13 SHA256 b7460ea228e19866cda3c3c89f900a5c47cb53214364f903a2630b014f1028cd
+MISC ChangeLog 736 RMD160 24c2078796604d0c6de649f370be59bbcfe2bc7b SHA1 f423bfc6ed8940a4afe3311296011307e57cd306 SHA256 0587dafff68370202fd2839a8bd196c2119b318c13f9f41389a01e9bf73d9475
+MISC metadata.xml 533 RMD160 e35b32e58067c32c3695195dee035dd12c7217a9 SHA1 4a9964a4211a0698e680bee195f34f03606fc755 SHA256 eeb5dea7e73a9a2a2927bcdf49ca30ef7b61b315ca909c316904357d08564d0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk46yIcACgkQHB6c3gNBRYfLiwCfQF5E+VfYFuNKT9xyS2e1Dsql
-YX8AniaSUBET8oy+ouOaHV0tjPtMGT7x
-=gPKT
+iQIcBAEBAgAGBQJOg2EcAAoJEOSiRoyO7jvoQWQP/19buSQsp0G29HPk3KGDTfPF
+/3j6nJxWzhc5eCg6ZFnG45HFGfc30nadnW7hGDxCrXZbTM/MCrLBkDPeskK6PtRg
+tULGHNffAXvuyfLtEkpeAbjTyjBqVZz0x0K8NHka5aziZSgMmT7Qd0usUwYU8J1q
+g4bekOsaXOXhhBzpMnuAOteNsB75oCoqiY8hZnTjdI0Qs6dh5yuvQW/IWELnUrtu
+vbk/4AvuU1fbM1JfPB2kL0h1Q+oJB2Dh1xulhFxrT/n1momgHWixhk4FQVS2JknQ
+VFkD5rMS1BX1GPhblG3KIdGcvvpxJ/h5ZyNINbSy4qEcw+nbaZhehhOvCg1J5vWt
+1hT9GH4tA3ibeUUx5q67a/308nrCx5F4rAy3PthIohYTv9aMinhS3/eg8FyXIyJv
+CRI8T4UD5mrj6OO3B9ue7B7gqOXOTd2hIFRApDjONPFzFmnsXeQu9ATMwpJhDCr+
+UBoykYxhp3rzYOCUSfjCi8TflE44M2HYBjC7/zTdp6+KQWyiTN9Fp3115orLShEA
+R/nU124mWnzhB6dbCvfReGhe/NA+OA/NMT7Fts9+oXRaMpxhRAk7ADr0lvgW0WVI
+8FUhVj0B9ZJ+8MxCIyJ1crlIQP4ZZfnu6OT3KslUfpqbeNU+REff402T50pE7eGl
+EObnERye8RRT78NpBjVn
+=nEuz
 -----END PGP SIGNATURE-----

diff --git a/app-text/wpd2odt/metadata.xml b/app-text/wpd2odt/metadata.xml
index fb56680f36300a532901467c13f8b74aac98953a..11ac543649f3b424ad5a3d0b419d9207c0802126 100644 (file)
--- 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
similarity index 55%
rename from app-text/wpd2odt/wpd2odt-0.8.0.ebuild
rename to app-text/wpd2odt/wpd2odt-0.8.1.ebuild
index b609de83c52b632791d76fb82b9c4428e3487209..84c517c687eb33fa68160854d5d3b1efd31f7428 100644 (file)
--- 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)
 }