[gentoo-commits] proj/kde:master commit in: dev-db/virtuoso-server/files/, dev-db/virtuoso-odbc/, eclass/, ...

[Maciej Mrozowski]

commit:     99d4cdedfe9b8ab4cb93c2de181ada5468ab249f
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 00:59:15 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 00:59:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=99d4cded

[dev-db/virtuoso-*] Move 6.1.4 to tree.

---
 dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild    |   41 ------
 .../files/virtuoso-opensource-6.1.4-gawk4.patch    |   86 ++++++++++++
 .../virtuoso-server-6.1.4-unbundle-minizip.patch   |   36 -----
 .../virtuoso-server/virtuoso-server-6.1.4.ebuild   |   85 ------------
 eclass/virtuoso.eclass                             |  144 --------------------
 5 files changed, 86 insertions(+), 306 deletions(-)

diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
deleted file mode 100644
index 9c28954..0000000
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
+++ /dev/null
@@ -1,41 +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-odbc/virtuoso-odbc-6.1.3.ebuild,v 1.3 2011/09/05 13:48:51 chainsaw Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/odbcsdk
-	libsrc/util
-	binsrc/driver
-"
-
-src_configure() {
-	myconf+="
-		--disable-static
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Remove libtool files
-	find "${ED}" -name '*.la' -delete
-}

diff --git a/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch b/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch
new file mode 100644
index 0000000..6291907
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch
@@ -0,0 +1,86 @@
+# HG changeset patch
+# Parent 3c7b74d47ca39768baf9d91bba40141bf111bc21
+# User Nico R. <n-roeser@×××.net>
+# Date 1321439581 -3600
+
+Fix problems with GNU awk 4.0.
+Original patch taken from upstream CVS, and mechanism applied to all code parts
+where ‘gsub’ is used.
+
+
+diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk
+--- a/binsrc/cached_resources/res_to_c.awk
++++ b/binsrc/cached_resources/res_to_c.awk
+@@ -30,7 +30,14 @@
+ 	}
+ 	{
+ 	  fun = $0
+-	  gsub ( /\\/, "\\\\", fun)
++
++	  q = "\\\\"
++	  if (PROCINFO["version"] ~ /^4/)
++	      gsub ( q, q q, fun)
++	  else
++	      gsub ( q, q, fun)
++	  #WAS: gsub ( /\\/, "\\\\", fun)
++
+ 	  gsub ( /"/, "\\\"", fun)
+ 	  gsub ( /\$/, "\\044", fun)
+ 	  gsub ( /.*/, "\"&\\n\",", fun)
+diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
+--- a/binsrc/hosting/perl/pl_to_c.awk
++++ b/binsrc/hosting/perl/pl_to_c.awk
+@@ -42,7 +42,14 @@
+     }
+ 
+   x = $0
+-  gsub (/\\/, "\\\\", x)
++
++  q = "\\\\"
++  if (PROCINFO["version"] ~ /^4/)
++      gsub ( q, q q, x)
++  else
++      gsub ( q, q, x)
++  #WAS: gsub (/\\/, "\\\\", x)
++
+   gsub (/\"/, "\\\"", x)
+   print "\"" x "\\n\""
+ }
+diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
+--- a/binsrc/hosting/python/py_to_c.awk
++++ b/binsrc/hosting/python/py_to_c.awk
+@@ -48,7 +48,14 @@
+     }
+ 
+   x = $0
+-  gsub (/\\/, "\\\\", x)
++
++  q = "\\\\"
++  if (PROCINFO["version"] ~ /^4/)
++      gsub ( q, q q, x)
++  else
++      gsub ( q, q, x)
++  #WAS: gsub (/\\/, "\\\\", x)
++
+   gsub (/\"/, "\\\"", x)
+   print "\"" x "\\n\""
+ }
+diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
+--- a/binsrc/ws/wsrm/xsd2sql.awk
++++ b/binsrc/ws/wsrm/xsd2sql.awk
+@@ -54,7 +54,14 @@
+       print "  ses := string_output ();"
+     }
+   str = $0
+-  gsub ( /\\/, "\\\\", str)
++
++  q = "\\\\"
++  if (PROCINFO["version"] ~ /^4/)
++      gsub ( q, q q, str)
++  else
++      gsub ( q, q, str)
++  #WAS: gsub ( /\\/, "\\\\", str)
++
+   gsub ( /'/, "\\'", str)
+ 
+   #

diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch
deleted file mode 100644
index 143c359..0000000
--- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in
---- virtuoso-opensource-6.1.4.orig/configure.in	2011-11-20 03:38:18.000000000 +0400
-+++ virtuoso-opensource-6.1.4/configure.in	2011-11-20 03:42:44.000000000 +0400
-@@ -1550,14 +1550,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 -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c
---- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c	2011-10-26 17:54:19.000000000 +0400
-+++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c	2011-11-20 03:44:36.000000000 +0400
-@@ -6167,10 +6167,7 @@
- #define fopen64  fopen
- #endif
- 
--#include "zlib/contrib/minizip/unzip.h"
--#include "zlib/contrib/minizip/ioapi.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/virtuoso-server-6.1.4.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild
deleted file mode 100644
index d38a43e..0000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild
+++ /dev/null
@@ -1,85 +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-r1.ebuild,v 1.3 2011/09/21 22:25:23 reavertm 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"
-
-# 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
-	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/Tidy
-	libsrc/Wi
-	libsrc/Xml.new
-	libsrc/langfunc
-	libsrc/odbcsdk
-	libsrc/plugin
-	libsrc/util
-	binsrc/virtuoso
-	binsrc/tests
-"
-
-DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
-
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-minizip.patch"
-	)
-
-src_prepare() {
-	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
-		|| die "failed to disable installation of static lib"
-
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		$(use_enable kerberos krb)
-		$(use_enable ldap openldap)
-		$(use_with readline)
-		--disable-static
-		--disable-hslookup
-		--disable-rendezvous
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Rename isql executables (conflicts with unixODBC)
-	mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
-	mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
-
-	keepdir /var/lib/virtuoso/db
-}

diff --git a/eclass/virtuoso.eclass b/eclass/virtuoso.eclass
deleted file mode 100644
index b4c7677..0000000
--- a/eclass/virtuoso.eclass
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.11 2011/07/07 23:00:06 reavertm Exp $
-
-# @ECLASS: virtuoso.eclass
-# @MAINTAINER:
-# Maciej Mrozowski <reavertm@g.o>
-#
-# @BLURB: Provides splitting functionality for Virtuoso
-# @DESCRIPTION:
-# This eclass provides common code for splitting Virtuoso OpenSource database
-
-case ${EAPI:-0} in
-	2|3|4) : ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-inherit base autotools multilib
-
-MY_P="virtuoso-opensource-${PV}"
-
-case ${PV} in
-	*9999*)
-		ECVS_SERVER="virtuoso.cvs.sourceforge.net:/cvsroot/virtuoso"
-		ECVS_PROJECT='virtuoso'
-		SRC_URI=""
-		inherit cvs
-		;;
-	*)
-		# Use this variable to determine distribution method (live or tarball)
-		TARBALL="${MY_P}.tar.gz"
-		SRC_URI="mirror://sourceforge/virtuoso/${TARBALL} mirror://gentoo/VOS-genpatches-${PV}.tar.bz2"
-		;;
-esac
-
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install
-
-# Set some defaults
-HOMEPAGE='http://virtuoso.openlinksw.com/wiki/main/Main/'
-LICENSE='GPL-2'
-SLOT='0'
-
-# Restrict incompatible gawk, bug 374315
-DEPEND='
-	>=sys-devel/libtool-2.2.6a
-'
-RDEPEND=''
-
-S="${WORKDIR}/${MY_P}"
-
-# @FUNCTION: virtuoso_src_prepare
-# @DESCRIPTION:
-# 1. Applies common release patches
-# 2. Applies package-specific patches (from ${FILESDIR}/, PATCHES can be used)
-# 3. Applies user patches from /etc/portage/patches/${CATEGORY}/${PN}/
-# 4. Modifies makefiles for split build. Uses VOS_EXTRACT
-# 5. eautoreconf
-virtuoso_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	EPATCH_SUFFIX='patch' EPATCH_FORCE='yes' epatch
-	base_src_prepare
-
-	# @ECLASS-VARIABLE: VOS_EXTRACT
-	# @DESCRIPTION:
-	# Lists any subdirectories that are required to be extracted
-	# and enabled in Makefile.am's for current package.
-	if [[ -n ${VOS_EXTRACT} ]]; then
-		# Comment out everything
-		find . -name Makefile.am -exec \
-			sed -e '/SUBDIRS\s*=/s/^/# DISABLED /g' -i {} + \
-				|| die 'failed to disable subdirs'
-
-		# Uncomment specified
-		local path
-		for path in ${VOS_EXTRACT}; do
-			if [[ -d "${path}" ]]; then
-				# Uncomment leaf
-				if [[ -f "${path}"/Makefile.am ]]; then
-					sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/# DISABLED //g' \
-						-i "${path}"/Makefile.am || die "failed to uncomment leaf in ${path}/Makefile.am"
-				fi
-				# Process remaining path elements
-				while true; do
-					local subdir=`basename "${path}"`
-					path=`dirname "${path}"`
-					if [[ -f "${path}"/Makefile.am ]]; then
-						# Uncomment if necessary
-						sed -e '/^# DISABLED \s*SUBDIRS\s*=/s/.*/SUBDIRS =/g' \
-							-i "${path}"/Makefile.am
-						# Append subdirs if not there already
-						if [[ -z `sed -ne "/SUBDIRS\s*=.*${subdir}\b/p" "${path}"/Makefile.am` ]]; then
-							sed -e "/^SUBDIRS\s*=/s|$| ${subdir}|" \
-								-i "${path}"/Makefile.am || die "failed to append ${subdir}"
-						fi
-					fi
-					[[ "${path}" = . ]] && break
-				done
-			fi
-		done
-	fi
-
-	eautoreconf
-}
-
-# @FUNCTION: virtuoso_src_configure
-# @DESCRIPTION:
-# Runs ./configure with common and user options specified via myconf variable
-virtuoso_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Override some variables to make tests work
-	if [[ ${PN} != virtuoso-server ]]; then
-		[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
-		export ISQL="${EPREFIX}"/usr/bin/isql-v
-		export SERVER="${EPREFIX}"/usr/bin/virtuoso-t
-	fi
-
-	econf \
-		--with-layout=gentoo \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-shared \
-		--with-pthreads \
-		--without-internal-zlib \
-		${myconf}
-}
-
-# @FUNCTION: virtuoso_src_compile
-# @DESCRIPTION:
-# Runs make for specified subdirs
-virtuoso_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	base_src_compile
-}
-
-# @FUNCTION: virtuoso_src_install
-# @DESCRIPTION:
-# Default src_install
-virtuoso_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	base_src_install
-}