From 8fcd9c39fea2abbf9f3daaccd6906ae3b4f55335 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 3 Mar 2010 22:00:37 +0000 Subject: [PATCH] Version bump and clean up old 0.6 slot revisions. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- x11-libs/goffice/ChangeLog | 10 +++- x11-libs/goffice/Manifest | 18 +++--- .../goffice/files/goffice-0.6-doc-slot.patch | 41 ------------- .../files/goffice-0.6.1-die-gtk-doc.patch | 11 ---- x11-libs/goffice/goffice-0.6.4.ebuild | 60 ------------------- ...fice-0.6.5.ebuild => goffice-0.8.0.ebuild} | 41 +++++++------ 6 files changed, 40 insertions(+), 141 deletions(-) delete mode 100644 x11-libs/goffice/files/goffice-0.6-doc-slot.patch delete mode 100644 x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch delete mode 100644 x11-libs/goffice/goffice-0.6.4.ebuild rename x11-libs/goffice/{goffice-0.6.5.ebuild => goffice-0.8.0.ebuild} (51%) diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog index f73f3d2b4f93..8d7cec42b50f 100644 --- a/x11-libs/goffice/ChangeLog +++ b/x11-libs/goffice/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-libs/goffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.63 2010/01/15 21:35:36 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.64 2010/03/03 22:00:36 eva Exp $ + +*goffice-0.8.0 (03 Mar 2010) + + 03 Mar 2010; Gilles Dartiguelongue + -files/goffice-0.6.1-die-gtk-doc.patch, -goffice-0.6.4.ebuild, + -goffice-0.6.5.ebuild, -files/goffice-0.6-doc-slot.patch, + +goffice-0.8.0.ebuild: + Version bump and clean up old 0.6 slot revisions. 15 Jan 2010; Christian Faulhammer goffice-0.4.3.ebuild, goffice-0.6.6.ebuild: diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest index 7f0727d6ec8d..799b4893e4c7 100644 --- a/x11-libs/goffice/Manifest +++ b/x11-libs/goffice/Manifest @@ -1,22 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX goffice-0.6-doc-slot.patch 2150 RMD160 98557838036fa448db1f34c3cc61a645aa817c00 SHA1 dfee66bd2cde89e6db846fcd0a70ab8fd1bc4f9d SHA256 9a3209131a2aa9eeaf81a4dfde065e24a0b09cff355616c67be83d2b696306da -AUX goffice-0.6.1-die-gtk-doc.patch 441 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 SHA1 3c12861087bce53933004f77afe59e47c6a41fcf SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748 DIST goffice-0.4.3.tar.bz2 1767305 RMD160 d79696c53f34f33ab9546db49046ce4b6ec4478b SHA1 56386b7554ec8e0d2fac47251344ab7edaa7fea4 SHA256 1687a01596888093b23a2c835e8c0c62af79d572fa3dfbf79b22625d056debba -DIST goffice-0.6.4.tar.bz2 1877115 RMD160 da19eca531945a79b12dfe6414db8899bac0ce25 SHA1 b6ce7576396fc69a1a44c9fea4b2b2f159948101 SHA256 ab8caeea86b7fa0c9f59e40f6dd39454ec766d6dc1488ade607c8b87e292872e -DIST goffice-0.6.5.tar.bz2 1993186 RMD160 f0f73da919432ef1d91395bc6f98c15ab03a884d SHA1 c27d310a90d79bcd2e655ac8facc8abcce80deb3 SHA256 15f3454820f8d29cfd724614bcfbe067b39ae33220ffcd1af778e112395a05c5 DIST goffice-0.6.6.tar.bz2 1998355 RMD160 672bce0f1485f373417ec84a580a1d8551ea86d2 SHA1 ac3b768198ee13264ddd26bc7b039d9788c14ad7 SHA256 0767a29fd85ffa5fafe10a8aa6763812d5d404368a5c62fdd2ad9a7766859f86 +DIST goffice-0.8.0.tar.bz2 2249491 RMD160 6c43a56259026011bf343962ce3174726106ee7f SHA1 8a5540f91cb1619ee1d96ee65856e81624743acd SHA256 476cf17095fcf34d8ae2d014a4883d99fed8082adcfb6fe79e5c13fe257a6056 EBUILD goffice-0.4.3.ebuild 1876 RMD160 fbde97a048e59db585af234899ec030c1f2229e9 SHA1 0cdfc52bdd197a4bbe4740e74e49600f39e81630 SHA256 6364d75f7de50fe111768b734edb5d26e03d52c679fb2a87a632c949f6d00b20 -EBUILD goffice-0.6.4.ebuild 1607 RMD160 9f7cbfd960b861d398e58c8d14070eefe0c50b9c SHA1 bc814febf7a236a00813f3b8d14abd2018d9a5fa SHA256 ae633255ee7347325206ddaec1d770c23a973cc8ac39ab59052150bca9df0fac -EBUILD goffice-0.6.5.ebuild 1126 RMD160 e0aaffe25ff2fb6948869e9a467b6558f1900fa3 SHA1 ba29b8b74d7f2cc8acf6c4ddcf34ef6eb0211b8b SHA256 f5bc7a0a73046de7d1701325897eef6b5ec4efa561f0274a359d996000cbd4b9 EBUILD goffice-0.6.6.ebuild 1151 RMD160 16407c92e7e72cf60c71470822a136f636ec5787 SHA1 9180301b581095733f61c4bb027b1a0b595cdbd5 SHA256 73ed7816022ba51ecb286eb89474e16cdcaad39d9e5c59a48398cade543f94f7 -MISC ChangeLog 8140 RMD160 034030152cf83edec021dfddeb3a07c0857dd7f5 SHA1 680ec8241529cde1b6a34003e424126bdc42f74f SHA256 af374021a676723834cbfc52a26404cb67696d1f1c3187d86af84ca615703a69 +EBUILD goffice-0.8.0.ebuild 1232 RMD160 673020764736233a1cb27d8216655cc0713e2afa SHA1 5effeaac4f1af0f8e803cb84f531dc4f45ecbe49 SHA256 37d932fa3526017e868ecf73a710dbda27bdfc785800aa28f9ec7d9ba22e61fd +MISC ChangeLog 8425 RMD160 2bee53f6344c63ba2d246ec2eadaac27f80b6f91 SHA1 8d8da95ca9ec65edc513b6032e088978101ca369 SHA256 cc90d78bc097ae1ee27d40ed13a73b706487bf3ff8f92a602693ef69e705fd85 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktQ364ACgkQNQqtfCuFnePJZwCeIv+ENmoYYeWdrvQsY0Z4dzOy -J5UAnAsHFG3Pukqn9xwva1+7Rfw2gzpg -=A0Vr +iEYEARECAAYFAkuO3BgACgkQ1fmVwcYIWAZeGACgkbDUChtJgiEinra7jSMpJ/fS +620AoOq4G3PNCB0pDQxIr36mFFXx3PsS +=35bc -----END PGP SIGNATURE----- diff --git a/x11-libs/goffice/files/goffice-0.6-doc-slot.patch b/x11-libs/goffice/files/goffice-0.6-doc-slot.patch deleted file mode 100644 index b8b3ac896047..000000000000 --- a/x11-libs/goffice/files/goffice-0.6-doc-slot.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- goffice-0.6.2/docs/reference/html/goffice.devhelp 2008-03-10 23:28:55.000000000 +0100 -+++ goffice-0.6.2/docs/reference/html/goffice.devhelp 2008-03-10 23:29:29.000000000 +0100 -@@ -1,6 +1,6 @@ - - -- -+ - - - ---- goffice-0.6.2/docs/reference/html/goffice.devhelp2 2008-03-10 23:29:02.000000000 +0100 -+++ goffice-0.6.2/docs/reference/html/goffice.devhelp2 2008-03-10 23:29:42.000000000 +0100 -@@ -1,6 +1,6 @@ - - -- -+ - - - ---- goffice-0.6.2/docs/reference/Makefile.am 2008-03-10 23:33:48.000000000 +0100 -+++ goffice-0.6.2/docs/reference/Makefile.am 2008-03-10 23:34:30.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --DOC_MODULE=goffice -+DOC_MODULE=goffice-0.6 - - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml - ---- goffice-0.6.2/docs/reference/Makefile.in 2008-03-10 23:33:55.000000000 +0100 -+++ goffice-0.6.2/docs/reference/Makefile.in 2008-03-10 23:34:10.000000000 +0100 -@@ -234,7 +234,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --DOC_MODULE = goffice -+DOC_MODULE = goffice-0.6 - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml - DOC_SOURCE_DIR = ../../goffice - SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init ()" diff --git a/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch b/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch deleted file mode 100644 index 0b22bad85af4..000000000000 --- a/x11-libs/goffice/files/goffice-0.6.1-die-gtk-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- goffice-0.6.1/Makefile.in.old 2007-12-22 17:20:33.000000000 +0100 -+++ goffice-0.6.1/Makefile.in 2007-12-22 17:21:23.000000000 +0100 -@@ -268,7 +268,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = goffice tests pixmaps plugins po docs tools -+SUBDIRS = goffice tests pixmaps plugins po tools - EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \ - goffice.mk \ - goffice-plugins.mk \ diff --git a/x11-libs/goffice/goffice-0.6.4.ebuild b/x11-libs/goffice/goffice-0.6.4.ebuild deleted file mode 100644 index b8bd0d681eb8..000000000000 --- a/x11-libs/goffice/goffice-0.6.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.4.ebuild,v 1.10 2009/04/20 21:55:13 eva Exp $ - -EAPI=2 - -inherit autotools eutils gnome2 flag-o-matic - -DESCRIPTION="A library of document-centric objects and utilities" -HOMEPAGE="http://freshmeat.net/projects/goffice/" - -LICENSE="GPL-2" -SLOT="0.6" -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.14 - >=gnome-extra/libgsf-1.13.3[gnome?] - >=dev-libs/libxml2-2.4.12 - >=x11-libs/pango-1.8.1 - >=x11-libs/gtk+-2.6 - >=gnome-base/libglade-2.3.6 - >=media-libs/libart_lgpl-2.3.11 - >=x11-libs/cairo-1.2[svg] - gnome? ( - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 )" -# libpcre raised for unicode USE flag - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.18 - >=dev-util/intltool-0.35 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.4 )" - -DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} $(use_with gnome)" - filter-flags -ffast-math -} - -src_prepare() { - gnome2_src_prepare - - # 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 - - eautomake -} diff --git a/x11-libs/goffice/goffice-0.6.5.ebuild b/x11-libs/goffice/goffice-0.8.0.ebuild similarity index 51% rename from x11-libs/goffice/goffice-0.6.5.ebuild rename to x11-libs/goffice/goffice-0.8.0.ebuild index b134307bf5c8..1934da1dcfaa 100644 --- a/x11-libs/goffice/goffice-0.6.5.ebuild +++ b/x11-libs/goffice/goffice-0.8.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.5.ebuild,v 1.4 2009/04/13 01:06:50 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.0.ebuild,v 1.1 2010/03/03 22:00:36 eva Exp $ -EAPI=2 +EAPI="2" +GCONF_DEBUG="no" inherit eutils gnome2 flag-o-matic @@ -10,25 +11,23 @@ DESCRIPTION="A library of document-centric objects and utilities" HOMEPAGE="http://freshmeat.net/projects/goffice/" LICENSE="GPL-2" -SLOT="0.6" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0.8" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris" IUSE="doc gnome" -# Raising glib dep to 2.14 to drop pcre dependency -# cairo support broken and -gtk broken - -RDEPEND=">=dev-libs/glib-2.14 - >=gnome-extra/libgsf-1.13.3[gnome?] +# Build fails with -gtk +# FIXME: add lasem to tree +RDEPEND=">=dev-libs/glib-2.16 + >=gnome-extra/libgsf-1.14.9[gnome?] >=dev-libs/libxml2-2.4.12 >=x11-libs/pango-1.8.1 - >=x11-libs/gtk+-2.6 >=gnome-base/libglade-2.3.6 - >=media-libs/libart_lgpl-2.3.11 >=x11-libs/cairo-1.2[svg] - gnome? ( - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 )" - + x11-libs/libXext + x11-libs/libXrender + >=x11-libs/gtk+-2.16 + gnome? ( >=gnome-base/gconf-2 ) +" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35 @@ -37,6 +36,14 @@ DEPEND="${RDEPEND} DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" pkg_setup() { - G2CONF="${G2CONF} $(use_with gnome)" + G2CONF="${G2CONF} + --without-lasem + --with-gtk + $(use_with gnome gconf)" filter-flags -ffast-math } + +src_install() { + gnome2_src_install + find "${D}" -name "*.la" -delete || die +} -- 2.26.2