[dev-db/virtuoso] Added back and unmasked 5.0.12 release, keep 6.0.0 masked

6 files changed, 277 insertions, 0 deletions

diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest
index a67024e4ee..ebc5a40d6d 100644
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@@ -1,4 +1,7 @@
+AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
 AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
+DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4
 DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac
+EBUILD virtuoso-odbc-5.0.12.ebuild 730 RMD160 b5352881ce044a42e910eca699284ffb2c5269fc SHA1 3831d7ace7fb07d17e4d405a6a5edb31d3982639 SHA256 b4e6f7666928643fd6630261df4d642a6d701bcdb09ff3ffb7a228f47030ac83
 EBUILD virtuoso-odbc-6.0.0.ebuild 730 RMD160 b5352881ce044a42e910eca699284ffb2c5269fc SHA1 3831d7ace7fb07d17e4d405a6a5edb31d3982639 SHA256 b4e6f7666928643fd6630261df4d642a6d701bcdb09ff3ffb7a228f47030ac83
 MISC metadata.xml 254 RMD160 53ade98a0f3bc3e0865a83ad0337f7aef78e176d SHA1 671cd5784aa889f2dc95c412748e2b9ea15945ea SHA256 801b3c18ec13a5e6bfa0e0d940c190a73c7e0ae031a4c6eb621b64fe8f8ab886
diff --git a/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch b/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch
new file mode 100644
index 0000000000..3e4d012e02
--- /dev/null
+++ b/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch
@@ -0,0 +1,64 @@
+diff -ru ../old/configure.in ./configure.in
+--- ../old/configure.in	2009-04-21 18:28:32.000000000 +0200
++++ ./configure.in	2009-07-02 07:24:11.000000000 +0200
+@@ -606,18 +607,6 @@
+ ##									##
+ ##########################################################################
+ 
+-AC_ARG_WITH(debug, [dnl
+-AC_HELP_STRING([--with-debug], [debugging code])dnl
+-], [ with_debug="$withval" ],
+-   [ with_debug="no" ])
+-if test "x$with_debug" = "xyes"; then
+-    CCOPT="-g"
+-    AM_LDFLAGS="-g"
+-else
+-    CCOPT=""
+-    AM_LDFLAGS="-s"
+-fi
+-
+ AC_CHECKING([default compiler values])
+ if eval "${CC-cc} $CFLAGS $AM_LDFLAGS -o binsrc/config/ccdefs binsrc/config/ccdefs.c" ; then
+     eval `binsrc/config/ccdefs`
+diff -ru ../old/appsrc/Makefile.am ./appsrc/Makefile.am
+--- ../old/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
++++ ./appsrc/Makefile.am	2009-07-04 22:45:53.000000000 +0200
+@@ -19,17 +19,4 @@
+ #  
+ #  
+ 
+-SUBDIRS = \
+-	ODS-Framework \
+-	ODS-Addressbook \
+-	ODS-Blog \
+-	ODS-Bookmark \
+-	ODS-Briefcase \
+-	ODS-Calendar \
+-	ODS-Community \
+-	ODS-Discussion \
+-	ODS-FeedManager \
+-	ODS-Gallery \
+-	ODS-Polls \
+-	ODS-WebMail \
+-	ODS-Wiki
++SUBDIRS = ODS-Framework ODS-Addressbook ODS-Blog ODS-Bookmark ODS-Briefcase ODS-Calendar ODS-Community ODS-Discussion ODS-FeedManager ODS-Gallery ODS-Polls ODS-WebMail ODS-Wiki
+diff -ru ../old/libsrc/Wi/bif_file.c ./libsrc/Wi/bif_file.c
+--- ../old/libsrc/Wi/bif_file.c	2009-04-19 23:48:55.000000000 +0200
++++ ./libsrc/Wi/bif_file.c	2009-06-24 22:03:12.000000000 +0200
+@@ -57,7 +57,6 @@
+ #endif
+ 
+ #include "zlib.h"
+-#include "zutil.h"
+ #include "srvmultibyte.h"
+ 
+ #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */
+@@ -4411,7 +4410,7 @@
+   level = 6;
+ 
+   err = deflateInit2 (&(s->stream), level,
+-      Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
++      Z_DEFLATED, -MAX_WBITS, 9, strategy);
+ 
+   s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE);
+   if (err != Z_OK || s->outbuf == Z_NULL)
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild
new file mode 100644
index 0000000000..70d1cb0d02
--- /dev/null
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit virtuoso
+
+DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+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+="
+		$(use_enable static-libs static)
+		--without-iodbc
+	"
+
+	virtuoso_src_configure
+}
+
+src_install() {
+	virtuoso_src_install
+
+	# Remove libtool files
+	if ! use static-libs; then
+		local libdir
+		for libdir in $(get_all_libdirs); do
+			rm -f "${D}/${ROOT}usr/${libdir}"/*.la || die
+		done
+	fi
+}
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index f30461b7b3..85ce8be1c1 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,4 +1,7 @@
+AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
 AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
+DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4
 DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac
+EBUILD virtuoso-server-5.0.12.ebuild 2183 RMD160 eb4181a03d75b660fd1fd06d3421d70a87902574 SHA1 ee6a1976e0c4f82965a9dff30b55ef199ede9415 SHA256 99792445d2951d085aec4039c73dae57fb6c317b5936f1eb527e46acfbd46584
 EBUILD virtuoso-server-6.0.0.ebuild 2183 RMD160 eb4181a03d75b660fd1fd06d3421d70a87902574 SHA1 ee6a1976e0c4f82965a9dff30b55ef199ede9415 SHA256 99792445d2951d085aec4039c73dae57fb6c317b5936f1eb527e46acfbd46584
 MISC metadata.xml 907 RMD160 3067070a943fe97201e2a1393d9d931d233cc233 SHA1 054c86756d2e1c7f599d97878c93da42a9ed25b9 SHA256 3b44481f91478f31d0fd1db549290c3d4d089410985f081101a336d6184631f5
diff --git a/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch b/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch
new file mode 100644
index 0000000000..3e4d012e02
--- /dev/null
+++ b/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch
@@ -0,0 +1,64 @@
+diff -ru ../old/configure.in ./configure.in
+--- ../old/configure.in	2009-04-21 18:28:32.000000000 +0200
++++ ./configure.in	2009-07-02 07:24:11.000000000 +0200
+@@ -606,18 +607,6 @@
+ ##									##
+ ##########################################################################
+ 
+-AC_ARG_WITH(debug, [dnl
+-AC_HELP_STRING([--with-debug], [debugging code])dnl
+-], [ with_debug="$withval" ],
+-   [ with_debug="no" ])
+-if test "x$with_debug" = "xyes"; then
+-    CCOPT="-g"
+-    AM_LDFLAGS="-g"
+-else
+-    CCOPT=""
+-    AM_LDFLAGS="-s"
+-fi
+-
+ AC_CHECKING([default compiler values])
+ if eval "${CC-cc} $CFLAGS $AM_LDFLAGS -o binsrc/config/ccdefs binsrc/config/ccdefs.c" ; then
+     eval `binsrc/config/ccdefs`
+diff -ru ../old/appsrc/Makefile.am ./appsrc/Makefile.am
+--- ../old/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
++++ ./appsrc/Makefile.am	2009-07-04 22:45:53.000000000 +0200
+@@ -19,17 +19,4 @@
+ #  
+ #  
+ 
+-SUBDIRS = \
+-	ODS-Framework \
+-	ODS-Addressbook \
+-	ODS-Blog \
+-	ODS-Bookmark \
+-	ODS-Briefcase \
+-	ODS-Calendar \
+-	ODS-Community \
+-	ODS-Discussion \
+-	ODS-FeedManager \
+-	ODS-Gallery \
+-	ODS-Polls \
+-	ODS-WebMail \
+-	ODS-Wiki
++SUBDIRS = ODS-Framework ODS-Addressbook ODS-Blog ODS-Bookmark ODS-Briefcase ODS-Calendar ODS-Community ODS-Discussion ODS-FeedManager ODS-Gallery ODS-Polls ODS-WebMail ODS-Wiki
+diff -ru ../old/libsrc/Wi/bif_file.c ./libsrc/Wi/bif_file.c
+--- ../old/libsrc/Wi/bif_file.c	2009-04-19 23:48:55.000000000 +0200
++++ ./libsrc/Wi/bif_file.c	2009-06-24 22:03:12.000000000 +0200
+@@ -57,7 +57,6 @@
+ #endif
+ 
+ #include "zlib.h"
+-#include "zutil.h"
+ #include "srvmultibyte.h"
+ 
+ #define FS_MAX_STRING	(10L * 1024L * 1024L)	/* allow files up to 10 MB */
+@@ -4411,7 +4410,7 @@
+   level = 6;
+ 
+   err = deflateInit2 (&(s->stream), level,
+-      Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
++      Z_DEFLATED, -MAX_WBITS, 9, strategy);
+ 
+   s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE);
+   if (err != Z_OK || s->outbuf == Z_NULL)
diff --git a/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild b/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild
new file mode 100644
index 0000000000..617330a251
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos ldap readline static-libs"
+
+# zeroconf support looks like broken - disabling
+# 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:0
+	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
+"
+
+src_prepare() {
+	if ! use static-libs; then
+		sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+			|| die "failed to disable installation of static lib"
+	fi
+
+	virtuoso_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		$(use_enable kerberos krb)
+		$(use_enable ldap openldap)
+		$(use_with readline)
+		$(use_enable static-libs static)
+		--disable-rendezvous
+		--disable-hslookup
+		--without-iodbc
+	"
+
+	virtuoso_src_configure
+}
+
+src_install() {
+	virtuoso_src_install
+
+	# Rename isql executables (conflicts with unixODBC)
+	mv "${D}/${ROOT}usr/bin/isql" "${D}/${ROOT}usr/bin/isql-v" || die
+	mv "${D}/${ROOT}usr/bin/isqlw" "${D}/${ROOT}usr/bin/isqlw-v" || die
+
+	dodoc AUTHORS ChangeLog CREDITS INSTALL NEWS README || die "dodoc failed"
+
+	keepdir "${ROOT}var/lib/virtuoso/db"
+}
+
+pkg_postinst() {
+	echo
+	einfo "To start the database server:"
+	echo
+	einfo "# cd ${ROOT}var/lib/virtuoso/db"
+	einfo "# virtuoso-t -f &"
+	echo
+	einfo "Then you should be able to access http://localhost:8890/"
+	einfo "and the conductor VAD at http://localhost:8890/conductor/."
+	einfo "The default login is dba:dba"
+	echo
+	einfo "The command line interface can be accessed with"
+	echo
+	einfo "$ isql-v 1111 dba dba"
+	echo
+}