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
commit8908eb373b049771e5ffee914bc4fdff250d0b1c (patch)
tree996a4a383a6f112b6b17b719e96ff8623a1c270f /app-text/libwps
parentFix test failing with VERBOSE. Bug #423301 (diff)
downloadgentoo-2-8908eb373b049771e5ffee914bc4fdff250d0b1c.tar.gz
gentoo-2-8908eb373b049771e5ffee914bc4fdff250d0b1c.tar.bz2
gentoo-2-8908eb373b049771e5ffee914bc4fdff250d0b1c.zip
Stable 0.2.7 on amd64 x86 and ppc. Drop older.
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
Diffstat (limited to 'app-text/libwps')
-rw-r--r--app-text/libwps/ChangeLog7
-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
4 files changed, 7 insertions, 60 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/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="