bump to 0.6.3. Use dolt, use glib regexp handling and drop pcre, ...

Package-Manager: portage-2.1.5_rc6

3 files changed, 32 insertions, 26 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/Manifest b/x11-libs/goffice/Manifest
index 1387f8858519..39b9e8497893 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -5,18 +5,18 @@ AUX goffice-0.6-doc-slot.patch 2150 RMD160 98557838036fa448db1f34c3cc61a645aa817
 AUX goffice-0.6.1-die-gtk-doc.patch 441 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 SHA1 3c12861087bce53933004f77afe59e47c6a41fcf SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748
 DIST goffice-0.2.1.tar.bz2 1415715 RMD160 c4623aa40f0abca223b59bb51b6638058844ac7e SHA1 91509a2e4c2acc42d83d733202e9cb13a2f388be SHA256 158258dcb85fd4f3e4ee5a61df49560f8b65d94682ef9322cbb20fb2d3e93034
 DIST goffice-0.4.3.tar.bz2 1767305 RMD160 d79696c53f34f33ab9546db49046ce4b6ec4478b SHA1 56386b7554ec8e0d2fac47251344ab7edaa7fea4 SHA256 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba
-DIST goffice-0.6.1.tar.bz2 1869159 RMD160 ef90dd912fa84baece3e4f69c8dc94cafa4c09d1 SHA1 bb7269e67c14b4ff5ca4a88c85582de02ed0c968 SHA256 a8956a3a12f7d959c95f9213fcf29e54e1e0a3d2cb2326bd3f79e6446e877e82
 DIST goffice-0.6.2.tar.bz2 1929905 RMD160 d24399f8986c383e915e495913696e1d3c2f71b3 SHA1 dfdf7ba48597f72e7802d36258013362d2ba8999 SHA256 b126902259875a24ece29bdf1f93cc7fd4fd7b83508cae1c15dabd10b4d537cd
+DIST goffice-0.6.3.tar.bz2 1937434 RMD160 8f2665bceefd9858487863fda44fbb971161acc4 SHA1 206e84ccf243a04d7556e96e225bcdd9a3cc8c59 SHA256 a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
 EBUILD goffice-0.2.1.ebuild 1551 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b SHA1 54eab3ce820d23efb63b1fdc3549b0c1e95819b5 SHA256 ab44b56a516ee1716d370a0fd6c6b9a789da6e573c27a282973ccfceae23c7bb
 EBUILD goffice-0.4.3.ebuild 2831 RMD160 9578b7ed9c4b6a528a0cd50f7ba8d275abc70185 SHA1 196c1ece58df5b5d1f5dccb37b6a18fe7c44f815 SHA256 78149e0704edfc47e13e9a220d6532ad500ff04e3576808574a4345f2422dc91
-EBUILD goffice-0.6.1.ebuild 2255 RMD160 5d9f8e4eb3232950f917f0e21c76b57bba8e63f3 SHA1 36b4341adaf79e42376d0423deabb2a3d7ace12d SHA256 068faca2f1cd9bd6145fa451946fa1e9f440dd05114317e57707c424c57605f9
 EBUILD goffice-0.6.2.ebuild 2537 RMD160 3fefdf02a564f2ed1791dc2b93d536380e4eb901 SHA1 2695d494fc44dfa5e4c4fbc6e1cd50c5edcc9666 SHA256 0ba54e3d84789964b6c16859d8d09da27fa2103be9d60a9d1940b0e59c86c125
-MISC ChangeLog 5384 RMD160 f716583b6b0a4f2e8a265e36c21d2f518ed37991 SHA1 b010859091975696958500261ac5bfb28f99b818 SHA256 9383cc9294b3ec0cadc5439c46959ee4c92226f6da7b8d162d099209851413b7
+EBUILD goffice-0.6.3.ebuild 2265 RMD160 27564cb94363ab0a78dce987a5a47941da4d3557 SHA1 7acb990a3a21aa67fa00299d7e5605e6ed2a661c SHA256 928691b402616f4e201e192e4a0f2805e21ad1a3186e8c7198e26d960fd0881c
+MISC ChangeLog 5585 RMD160 ee2d0e333bef30dab856a0a5863e5cdfbf26cf3f SHA1 e490ff7e0f6a41742d2a54303ed18290d1adc8fb SHA256 bedbe6853d01c32a640b579cdb58bdf6ba2990ae1197e66ea9b7ff9a67973fa1
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgM6EwACgkQkKaRLQcq0GJhSgCdH4HOeHcCE5qRycV3SLCJXnW+
-dvwAmgIHmcCoW13zLFFGztGOiRRlbAlv
-=Dux1
+iEYEARECAAYFAkgiStEACgkQ1fmVwcYIWAbdIgCgz76SrNztJRtslQCB4YhIr2XZ
+9roAoNRhGAH595OgpHG7Zdb1oIYukgJH
+=mfma
 -----END PGP SIGNATURE-----
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() {