[gentoo-commits] repo/gentoo:master commit in: x11-libs/goffice/files/, x11-libs/goffice/

[Mart Raudsepp]

commit:     55cf5212a0f79d343099c6934da64fcf1783e6af
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 00:07:55 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 00:07:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cf5212

x11-libs/goffice: remove old SLOT="0.8"

No more consumers left

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/goffice/Manifest                          |   1 -
 .../goffice/files/goffice-0.8.17-no-pcre.patch     | 219 ---------------------
 x11-libs/goffice/goffice-0.8.17-r2.ebuild          |  64 ------
 3 files changed, 284 deletions(-)

diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 4c52edc09ac..6c320a393a1 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,2 +1 @@
 DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62
-DIST goffice-0.8.17.tar.xz 1814488 BLAKE2B 8e17ade84f7417e493bbd56bd42805ad9fb87749b4705eb09c208384e3537610f478cf0ecb957b2a2007a097efc5e1c2019060b1aaffddf52bd1db559d7af957 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c

diff --git a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
deleted file mode 100644
index 4691acdcd8f..00000000000
--- a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 00b816027e11f5fd890df07ae94d720cce106f34 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-Date: Fri, 20 Apr 2012 14:57:59 -0400
-Subject: [PATCH] Drop pcre workaround for <glib-2.15.1
-
-For unknown reason, it sometimes gets enabled even on modern systems,
-causing problems.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=670316
----
- configure.in            |   24 +----------
- goffice/utils/regutf8.c |  106 -----------------------------------------------
- 2 files changed, 1 insertions(+), 129 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index fd40d53..62e299d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -93,7 +93,7 @@ PKG_PROG_PKG_CONFIG
- 
- dnl *****************************
- goffice_reqs="
--	glib-2.0		>= 2.8.0
-+	glib-2.0		>= 2.16.0
- 	gobject-2.0		>= 2.16.0
- 	gmodule-2.0		>= 2.16.0
- 	gio-2.0			>= 2.16.0
-@@ -492,13 +492,6 @@ SAVE_CFLAGS=$CFLAGS
- SAVE_LIBS=$LIBS
- CFLAGS="$CFLAGS $GOFFICE_CFLAGS"
- LIBS="$GOFFICE_LIBS $LIBS"
--AC_MSG_CHECKING([for G_REGEX_ERROR_STRAY_BACKSLASH])
--AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gregex.h>]], [[GRegexError error=G_REGEX_ERROR_STRAY_BACKSLASH;]])],
--               [AC_DEFINE(HAVE_G_REGEX_ERROR_STRAY_BACKSLASH, 1, [Define if G_REGEX_ERROR_STRAY_BACKSLASH is defined])
--	        glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=yes
--                AC_MSG_RESULT(yes)],
--               [AC_MSG_RESULT(no)
--	        glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=no])
- if test "x$goffice_with_gtk" = "xtrue" ; then
-   AC_CHECK_FUNCS(gtk_dialog_get_response_for_widget)
-   AC_CHECK_FUNCS(gtk_widget_set_tooltip_text gtk_tool_item_set_tooltip_text,
-@@ -511,21 +504,6 @@ if test $gtk_disable_deprecated = yes; then
-   CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
- fi
- 
--if test "x$glib_has_G_REGEX_ERROR_STRAY_BACKSLASH" = "xno"; then
--  dnl Check for working pcre
--  AC_CHECK_HEADER(pcre.h,[], AC_MSG_ERROR([Header files for PCRE were not found]))
--  AC_CHECK_LIB(pcre,pcre_compile2,[], AC_MSG_ERROR([The PCRE library is missing or too old]))
--  AC_MSG_CHECKING([for UTF-8 support in pcre])
--  if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then
--      AC_MSG_RESULT(yes)
--      LIBS="$LIBS -lpcre"
--      EXTRA_LIBS="$EXTRA_LIBS -lpcre"
--  else
--      AC_MSG_ERROR([The installed PCRE library is not configured for UTF-8 support.])
--  fi
--fi
--
--
- AC_DEFUN([GOFFICE_CHECK_FUNC],
- [AC_CHECK_FUNC([$1],
- 	[],
-diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
-index bc4aae4..3f32dd6 100644
---- a/goffice/utils/regutf8.c
-+++ b/goffice/utils/regutf8.c
-@@ -7,9 +7,6 @@
- 
- #include <goffice/goffice-config.h>
- #include "regutf8.h"
--#ifndef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
--#include <pcre.h>
--#endif
- #include "go-glib-extras.h"
- #include <gsf/gsf-impl-utils.h>
- #include <glib/gi18n-lib.h>
-@@ -21,11 +18,7 @@ void
- go_regfree (GORegexp *gor)
- {
- 	if (gor->ppcre) {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 		g_regex_unref (gor->ppcre);
--#else
--		pcre_free (gor->ppcre);
--#endif
- 		gor->ppcre = NULL;
- 	}
- }
-@@ -70,7 +63,6 @@ go_regerror (int errcode, const GORegexp *gor, char *dst, size_t dstsize)
- int
- go_regcomp (GORegexp *gor, const char *pat, int cflags)
- {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 	GError *error = NULL;
- 	GRegex *r;
- 	int coptions =
-@@ -119,47 +111,6 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
- 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- 		return 0;
- 	}
--#else
--	const char *errorptr;
--	int errorofs, errorcode;
--	pcre *r;
--	int coptions =
--		PCRE_UTF8 |
--		PCRE_NO_UTF8_CHECK |
--		((cflags & GO_REG_ICASE) ? PCRE_CASELESS : 0) |
--		((cflags & GO_REG_NEWLINE) ? PCRE_MULTILINE : 0);
--
--	if (&pcre_compile2 == NULL) {
--		g_error ("libgoffice has been dynamically linked against a libpcre\n"
--				"that lacks the pcre_compile2 function.  This indicates a\n"
--				"distribution dependency problem.  Please report this at\n"
--				"bugzilla.gnome.org and for you distribution.");
--	}
--
--	gor->ppcre = r = pcre_compile2 (pat, coptions,
--			&errorcode, &errorptr, &errorofs,
--			NULL);
--
--	if (r == NULL) {
--		switch (errorcode) {
--		case 1: case 2: case 3: case 37: return GO_REG_EESCAPE;
--		case 4: case 5: return GO_REG_EBRACE;
--		case 6: return GO_REG_EBRACK;
--		case 7: case 30: return GO_REG_ECTYPE;
--		case 8: return GO_REG_ERANGE;
--		case 9: case 10: return GO_REG_BADRPT;
--		case 14: case 18: case 22: return GO_REG_EPAREN;
--		case 15: return GO_REG_ESUBREG;
--		case 19: case 20: return GO_REG_ESIZE;
--		case 21: return GO_REG_ESPACE;
--		default: return GO_REG_BADPAT;
--		}
--	} else {
--		gor->re_nsub = pcre_info (r, NULL, NULL);
--		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
--		return 0;
--	}
--#endif
- 	return 0;
- }
- 
-@@ -167,7 +118,6 @@ int
- go_regexec (const GORegexp *gor, const char *txt,
- 	    size_t nmatch, GORegmatch *pmatch, int eflags)
- {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 	int eoptions =
- 		((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) |
- 		((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0);
-@@ -196,62 +146,6 @@ go_regexec (const GORegexp *gor, const char *txt,
- 		g_match_info_free (match_info);
- 
- 	return matched ? GO_REG_NOERROR : GO_REG_NOMATCH;
--#else
--	size_t txtlen = strlen (txt);
--	int eoptions =
--		((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) |
--		((eflags & GO_REG_NOTEOL) ? PCRE_NOTEOL : 0);
--	int res;
--	int *offsets, *allocated;
--	int offsetcount;
--	if (gor->nosub)
--		nmatch = 0;
--
--	if (nmatch > 0) {
--		/* Paranoia.  */
--		if (nmatch >= G_MAXINT / sizeof (int) / 3)
--			return GO_REG_ESPACE;
--
--		offsetcount = nmatch * 3;
--		offsets = allocated = g_try_new (int, offsetcount);
--		if (!offsets)
--			return GO_REG_ESPACE;
--	} else {
--		offsets = allocated = NULL;
--		offsetcount = 0;
--	}
--
--	res = pcre_exec (gor->ppcre, NULL, txt, txtlen, 0, eoptions,
--			offsets, offsetcount);
--	if (res >= 0) {
--		int i;
--
--		if (res == 0) res = nmatch;
--
--		for (i = 0; i < res; i++) {
--			pmatch[i].rm_so = offsets[i * 2];
--			pmatch[i].rm_eo = offsets[i * 2 + 1];
--		}
--		for (; i < (int)nmatch; i++) {
--			pmatch[i].rm_so = -1;
--			pmatch[i].rm_eo = -1;
--		}
--		g_free (allocated);
--		return GO_REG_NOERROR;
--	}
--
--	g_free (allocated);
--	switch (res) {
--	case PCRE_ERROR_NOMATCH:
--		return GO_REG_NOMATCH;
--	case PCRE_ERROR_BADUTF8:
--	case PCRE_ERROR_BADUTF8_OFFSET:
--		/* POSIX doesn't seem to foresee this kind of error.  */
--		return GO_REG_BADPAT;
--	default:
--		return GO_REG_ESPACE;
--	}
--#endif
- }
- 
- /* ------------------------------------------------------------------------- */
--- 
-1.7.8.5
-

diff --git a/x11-libs/goffice/goffice-0.8.17-r2.ebuild b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
deleted file mode 100644
index a1b5eb192db..00000000000
--- a/x11-libs/goffice/goffice-0.8.17-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.8"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="gnome"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	>=gnome-extra/libgsf-1.14.9
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.8.1
-	>=x11-libs/cairo-1.2[svg]
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/gtk+-2.16:2
-	gnome? ( >=gnome-base/gconf-2:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	dev-util/gtk-doc-am
-
-	gnome-base/gnome-common
-"
-# eautoreconf requires: gnome-common
-
-src_prepare() {
-	# bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
-	epatch "${FILESDIR}/${P}-no-pcre.patch"
-
-	mv configure.in configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-
-	# Gsettings is still experimental
-	if use gnome; then
-		myconf="${myconf} --with-config-backend=gconf"
-	else
-		myconf="${myconf} --with-config-backend=keyfile"
-	fi
-
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		${myconf}
-}