From 29647dc074ebcd75f31deae9f2faaf2cdaa205e5 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Wed, 23 May 2012 09:02:01 +0000 Subject: Remove old. (Portage version: 2.2.0_alpha107/cvs/Linux i686) --- dev-db/virtuoso-server/ChangeLog | 8 +- .../virtuoso-server-6.1.3-unbundle-minizip.patch | 36 --------- .../files/virtuoso-server-6.1.3-unicode.patch | 21 ------ .../virtuoso-server-6.1.3-r2.ebuild | 86 ---------------------- .../virtuoso-server/virtuoso-server-6.1.4.ebuild | 86 ---------------------- 5 files changed, 7 insertions(+), 230 deletions(-) delete mode 100644 dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch delete mode 100644 dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch delete mode 100644 dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild delete mode 100644 dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild (limited to 'dev-db') diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog index 582edb25a1a6..929e56f67eb6 100644 --- a/dev-db/virtuoso-server/ChangeLog +++ b/dev-db/virtuoso-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/virtuoso-server # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.37 2012/05/23 08:27:53 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.38 2012/05/23 09:02:01 johu Exp $ + + 23 May 2012; Johannes Huber + -files/virtuoso-server-6.1.3-unbundle-minizip.patch, + -files/virtuoso-server-6.1.3-unicode.patch, -virtuoso-server-6.1.3-r2.ebuild, + -virtuoso-server-6.1.4.ebuild: + Remove old. 23 May 2012; Jeff Horelick virtuoso-server-6.1.4-r1.ebuild: diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch deleted file mode 100644 index e68903a2230e..000000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN virtuoso-opensource-6.1.3/configure.in new/configure.in ---- virtuoso-opensource-6.1.3/configure.in 2011-03-30 01:20:19.000000000 +0200 -+++ new/configure.in 2011-09-21 23:04:42.372977092 +0200 -@@ -1568,14 +1568,15 @@ - then - AC_CHECK_HEADER(zlib.h) - AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) -+ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) - fi - if test "x$with_zlib" = "xinternal" - then - ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' - ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' - else -- ZLIB_INC="" -- ZLIB_LIB="-lz" -+ ZLIB_INC=`pkg-config --cflags zlib minizip` -+ ZLIB_LIB=`pkg-config --libs zlib minizip` - fi - AC_SUBST(ZLIB_INC) - AC_SUBST(ZLIB_LIB) -diff -ruN virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c new/libsrc/Wi/bif_file.c ---- virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c 2011-02-14 13:30:56.000000000 +0100 -+++ new/libsrc/Wi/bif_file.c 2011-09-21 22:44:52.638977417 +0200 -@@ -6139,10 +6139,7 @@ - return NULL; - } - -- --#include "zlib/contrib/minizip/unzip.h" --#include "zlib/contrib/minizip/ioapi.c" --#include "zlib/contrib/minizip/unzip.c" -+#include "unzip.h" - - static caddr_t - bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch deleted file mode 100644 index 30046d2332ad..000000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: libsrc/Wi/xqf.c -=================================================================== -RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v -retrieving revision 1.21.2.9 -retrieving revision 1.21.2.12 -diff -u -r1.21.2.9 -r1.21.2.12 ---- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 -+++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 -@@ -3520,6 +3552,12 @@ - desc = xqf_str_parser_descs + desc_idx; - if (DV_DB_NULL == arg_dtp) - return NEW_DB_NULL; -+ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ -+ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) -+ { -+ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); -+ goto res_ready; -+ } - if (DV_STRING != arg_dtp) - { - caddr_t err = NULL; diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild deleted file mode 100644 index cc0c4fb96b91..000000000000 --- a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild,v 1.4 2011/12/28 18:46:21 halcy0n Exp $ - -EAPI=4 - -inherit virtuoso - -DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database" - -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="kerberos ldap readline" - -# Bug 305077 -#RESTRICT="test" - -# Version restriction on sys-libs/zlib, bug #383349 - -# zeroconf support looks like broken - disabling - last checked around 5.0.12 -# mono support fetches mono source and compiles it manually - disabling for now -# mono? ( dev-lang/mono ) -COMMON_DEPEND=" - dev-libs/libxml2:2 - >=dev-libs/openssl-0.9.7i:0 -