summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-05-07 22:35:15 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-05-07 22:35:15 +0000
commit26bf55d173197e5b03b16c6720273b9ab6e7e7d5 (patch)
tree0f465188c11b838aa2ff4897a8cbe0c633babab9 /x11-libs/goffice
parentVersion bump to 3.1.1 Fix bug #190435 (diff)
downloadgentoo-2-26bf55d173197e5b03b16c6720273b9ab6e7e7d5.tar.gz
gentoo-2-26bf55d173197e5b03b16c6720273b9ab6e7e7d5.tar.bz2
gentoo-2-26bf55d173197e5b03b16c6720273b9ab6e7e7d5.zip
bump to 0.6.3. Use dolt, use glib regexp handling and drop pcre, ...
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'x11-libs/goffice')
-rw-r--r--x11-libs/goffice/ChangeLog8
-rw-r--r--x11-libs/goffice/goffice-0.6.3.ebuild (renamed from x11-libs/goffice/goffice-0.6.1.ebuild)38
2 files changed, 26 insertions, 20 deletions
diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index ee5f638567f1..ca74f3989a44 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/goffice
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.40 2008/04/21 19:16:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.41 2008/05/07 22:35:15 eva Exp $
+
+*goffice-0.6.3 (08 May 2008)
+
+ 08 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -goffice-0.6.1.ebuild,
+ +goffice-0.6.3.ebuild:
+ bump to 0.6.3. Use dolt, use glib regexp handling and drop pcre, ...
21 Apr 2008; Markus Meier <maekke@gentoo.org> goffice-0.6.2.ebuild:
amd64/x86 stable, bug #218029
diff --git a/x11-libs/goffice/goffice-0.6.1.ebuild b/x11-libs/goffice/goffice-0.6.3.ebuild
index acac7059326a..ea27fc355dd5 100644
--- a/x11-libs/goffice/goffice-0.6.1.ebuild
+++ b/x11-libs/goffice/goffice-0.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.10 2008/01/16 22:48:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.3.ebuild,v 1.1 2008/05/07 22:35:15 eva Exp $
inherit eutils gnome2 flag-o-matic
@@ -9,12 +9,13 @@ HOMEPAGE="http://freshmeat.net/projects/goffice/"
LICENSE="GPL-2"
SLOT="0.6"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="gnome"
-#doc support is broken without gtk-doc 1.9
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome"
+
+# Raising glib dep to 2.14 to drop pcre dependency
#cairo support broken and -gtk broken
-RDEPEND=">=dev-libs/glib-2.8.0
+RDEPEND=">=dev-libs/glib-2.14
>=gnome-extra/libgsf-1.13.3
>=dev-libs/libxml2-2.4.12
>=x11-libs/pango-1.8.1
@@ -24,13 +25,13 @@ RDEPEND=">=dev-libs/glib-2.8.0
>=x11-libs/cairo-1.2
gnome? (
>=gnome-base/gconf-2
- >=gnome-base/libgnomeui-2 )
- dev-libs/libpcre"
+ >=gnome-base/libgnomeui-2 )"
+# libpcre raised to unicode USE flag
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.18
- >=dev-util/intltool-0.35"
-# doc? ( >=dev-util/gtk-doc-1.4 )"
+ >=dev-util/intltool-0.35
+ doc? ( >=dev-util/gtk-doc-1.4 )"
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
@@ -53,22 +54,21 @@ pkg_setup() {
diemessage="${diemessage} No SVG support found in cairo."
fi
- if ! built_with_use dev-libs/libpcre unicode; then
- eerror "Please rebuild dev-libs/libpcre with unicode support enabled"
- eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use"
- eerror "emerge -1 dev-libs/libpcre"
- diemessage="${diemessage} No unicode support found in libpcre."
- fi
-
[ -n "${diemessage}" ] && die ${diemessage}
}
src_unpack() {
gnome2_src_unpack
- # strip doc installation
- # needs gtk-doc-1.9 otherwise
- epatch "${FILESDIR}/${P}-die-gtk-doc.patch"
+ # Fix doc slotting
+ epatch "${FILESDIR}/${PN}-0.6-doc-slot.patch"
+
+ mv "${S}"/docs/reference/html/goffice{,-0.6}.devhelp
+ mv "${S}"/docs/reference/html/goffice{,-0.6}.devhelp2
+ mv "${S}"/docs/reference/goffice{,-0.6}-docs.sgml
+ mv "${S}"/docs/reference/goffice{,-0.6}-overrides.txt
+ mv "${S}"/docs/reference/goffice{,-0.6}-sections.txt
+ mv "${S}"/docs/reference/goffice{,-0.6}.types
}
src_compile() {