summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-06-29 11:51:33 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-06-29 11:51:33 +0000
commit3ba4ca8d5ff5476e0337784e2edf2ddea9c7b82e (patch)
tree80992ad07c8fa728aef950899f9364ed6d74adbb /app-text
parentFix test failing with VERBOSE. Bug #423301 (diff)
downloadhistorical-3ba4ca8d5ff5476e0337784e2edf2ddea9c7b82e.tar.gz
historical-3ba4ca8d5ff5476e0337784e2edf2ddea9c7b82e.tar.bz2
historical-3ba4ca8d5ff5476e0337784e2edf2ddea9c7b82e.zip
Stable 0.2.7 on amd64 x86 and ppc. Drop older.
Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64
Diffstat (limited to 'app-text')
-rw-r--r--app-text/libwps/ChangeLog7
-rw-r--r--app-text/libwps/Manifest25
-rw-r--r--app-text/libwps/files/libwps-0.2.6-debug.patch13
-rw-r--r--app-text/libwps/libwps-0.2.6.ebuild43
-rw-r--r--app-text/libwps/libwps-0.2.7.ebuild4
5 files changed, 23 insertions, 69 deletions
diff --git a/app-text/libwps/ChangeLog b/app-text/libwps/ChangeLog
index f0e86eb22998..b5cd47b50c56 100644
--- a/app-text/libwps/ChangeLog
+++ b/app-text/libwps/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/libwps
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/ChangeLog,v 1.31 2012/06/17 18:24:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/ChangeLog,v 1.32 2012/06/29 11:51:33 scarabeus Exp $
+
+ 29 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/libwps-0.2.6-debug.patch, -libwps-0.2.6.ebuild, libwps-0.2.7.ebuild:
+ Stable 0.2.7 on amd64 x86 and ppc. Drop older.
17 Jun 2012; Raúl Porcel <armin76@gentoo.org> libwps-0.2.6.ebuild,
libwps-0.2.7.ebuild:
@@ -119,4 +123,3 @@
30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> +libwps-0.2.0.ebuild,
+metadata.xml:
Initial commit to fix bug #284159.
-
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index de0ccaaa3ea1..23ffeb3d94a8 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,17 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX libwps-0.2.6-debug.patch 481 RMD160 a54ef7f4861897eb06f12728ef6689d9ccdbbb5a SHA1 a97f213acc36513be316184097aa79b0111e2d7e SHA256 e97ef11209f07a2b58798ba9601b02b1b9ec19d85f11a3021ab1612d6ffc8ad9
-DIST libwps-0.2.6.tar.xz 288712 RMD160 bda88ef9de4e6e710efa745c20434fda63601120 SHA1 89696592cfe51b89fecabb3b64fe6c6a8b4ecb39 SHA256 622813b89755603a13b8e39ce5e0ff013193b7b9610081e58bdd282ef7f42162
DIST libwps-0.2.7.tar.xz 345148 RMD160 1025c875035e446191e6e5b0200326bdf6902eb6 SHA1 d26cbec758be1b555ef48fc73ef87186126c8d74 SHA256 07b8e6ba6dd327996638cef886d3d510b1438ab0a374dfeeda168244f630b304
-EBUILD libwps-0.2.6.ebuild 938 RMD160 f40c05af5b993c473c588e304b7a72d98524155b SHA1 2abb22946fb9f471202456dbc963135136e96b20 SHA256 e3c99792b53bf802749efe9da889ddd9bd5756cd209e5930d0d7e053508eed9b
-EBUILD libwps-0.2.7.ebuild 896 RMD160 010d7182a3ae77875eb32f8408a244569be0a568 SHA1 35089c6be728527882da0dd86a3af0b8dbe081d2 SHA256 160068cb56c922159991928d04675b7050ad49f0cbfc734603ab08961eb38de1
-MISC ChangeLog 4303 RMD160 961b9ae8b5c8e071bed64db98c7e4e56d0dec98f SHA1 3df0912f8f99387a9c5dc3dd8d4840e639381bcd SHA256 9d1de3346a254b1e7a45a757a09d592c1f56f66e4ebcf1f84e468511af577b9d
+EBUILD libwps-0.2.7.ebuild 895 RMD160 5a768f73c32c8ac257ea425d571a08026ecb5f43 SHA1 aea810e85eb614c1712d9fd48b172415c49d3c6b SHA256 c11ac7445ef6589256038431843499207797a47f369b32a92c4414c84698fcea
+MISC ChangeLog 4487 RMD160 85c76dfdba573493b8d168abbbe52f65228c47e4 SHA1 22d1a583076326d3d0e817e60def782fa7647b61 SHA256 5b87957f109dce7ec4a4e316159ac12f99736f2e810d142e0a15129eeb05b18d
MISC metadata.xml 202 RMD160 da9a051f0f8f8e34f758afb1bd81e7696c844eeb SHA1 f757e09ca2f9ac304059f764fba4dab297e3a391 SHA256 0385d3046d1908b2beb7e7537b8a298767fa61bdc2c2bb835d2e81851e8bf52b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/eINcACgkQuQc30/atMkDT/wCfQvamMsc2R2PT1CVJrGnsgnBF
-71EAmwZaza1pn99XceiIcagseEISd1oV
-=gz+6
+iQIcBAEBAgAGBQJP7ZbPAAoJEOSiRoyO7jvoLJQP/1b7N/FFix0IrMb6rjtWXELS
+AXH8a/hucIRL3qe6U9vf7mnhLLLiz6czThlTI7MmZxNkbAvj81IW/4bz2jW7jBOR
+7jGT+2fbL90pgwvOGqiEJUk5fBrrFYIalA/jhV2W+x9JKqTsfQrOABN3HhNFlerX
+J2MIu9uMPmUTIUTmIE+3GjWAkA5G/AIi6OVgiLf5sUEEe60qvbJ6wsMnyNXb48Gm
+69dk04ZpZRTvvyrBFzgojzrFb7G4PWUsywqRGKDT065HYvenGr4LXg0a/WL3ChXA
+t13uNNqUQ0lFN7ruZIlRwS1XmwEvCkFQVLsjzpVtufYa/gijzVre5ZlBrqmIopm6
+clcYF92+qU1Zwi6ZZ5HrSJ7sC97zd8qLoaOqD2FrNOQFd73vof4TRcUDpj7PVOUy
+XeMAVs1Vaq7nswC6SmpiJVmSSWuw/1jxqp9dOzcqs8ML1qbC6ZCj1LkUaoeIfFFr
+dLkHKVzBUNCgA5+ai0f30bLlYiN0/gnxfw5KNSHL+A7KBb9JF9l7tVdOHaxKnNTC
+Bk4mob5Weabx9jXb86obhlBT9zp/N6IYNOFjIYmwitfcjuDoQL0lAR4DRhgMktUX
+5OLZPX7/IkKSqxID43mowbAPkrN6bJ1IDRlScvaDoIuII7U+L/AWPSSd8uBnrcSP
+fwniRlONNTT86PbOJcmM
+=oU/Q
-----END PGP SIGNATURE-----
diff --git a/app-text/libwps/files/libwps-0.2.6-debug.patch b/app-text/libwps/files/libwps-0.2.6-debug.patch
deleted file mode 100644
index d085d8f8fe27..000000000000
--- a/app-text/libwps/files/libwps-0.2.6-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN libwps-0.2.6.old//src/lib/libwps_internal.h libwps-0.2.6/src/lib/libwps_internal.h
---- libwps-0.2.6.old//src/lib/libwps_internal.h 2012-05-28 13:59:43.855727293 +0200
-+++ libwps-0.2.6/src/lib/libwps_internal.h 2012-05-28 14:00:16.373727679 +0200
-@@ -25,6 +25,9 @@
- #include <libwpd-stream/libwpd-stream.h>
- #include <libwpd/libwpd.h>
- #include <string>
-+#ifdef DEBUG
-+#include <stdio.h>
-+#endif
-
- #if defined(_MSC_VER) || defined(__DJGPP__)
- typedef signed char int8_t;
diff --git a/app-text/libwps/libwps-0.2.6.ebuild b/app-text/libwps/libwps-0.2.6.ebuild
deleted file mode 100644
index 56726ef101f9..000000000000
--- a/app-text/libwps/libwps-0.2.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.6.ebuild,v 1.5 2012/06/17 18:24:16 armin76 Exp $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="http://libwps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc debug static-libs"
-
-RDEPEND="
- app-text/libwpd:0.9
- dev-libs/boost
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-debug.patch"
-)
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable static-libs static) \
- --docdir=/usr/share/doc/${PF} \
- $(use_with doc docs) \
- $(use_enable debug)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete
-}
diff --git a/app-text/libwps/libwps-0.2.7.ebuild b/app-text/libwps/libwps-0.2.7.ebuild
index e7190c160780..f92b2cd49d11 100644
--- a/app-text/libwps/libwps-0.2.7.ebuild
+++ b/app-text/libwps/libwps-0.2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.7.ebuild,v 1.4 2012/06/17 18:24:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.7.ebuild,v 1.5 2012/06/29 11:51:33 scarabeus Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc debug static-libs"
RDEPEND="