[dev-db/virtuoso-*] Version bump 6.1.0 (p.masked)

4 files changed, 65 insertions, 67 deletions

diff --git a/dev-db/virtuoso-jdbc/Manifest b/dev-db/virtuoso-jdbc/Manifest
index 9f3fbc8d52..47d93d9d71 100644
--- a/dev-db/virtuoso-jdbc/Manifest
+++ b/dev-db/virtuoso-jdbc/Manifest
@@ -1,7 +1,7 @@
 AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c
-AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a
+AUX 6.1.0/6.1.0-common.patch 1847 RMD160 8b7b61e8a81a439d8d3393478b9553466852a319 SHA1 d9b1a7b87218329b27d1688ea2af9effa71bfde4 SHA256 1a4321642fbc7dfc1e82df5613b15d14c7fd2758daa1e30de83e35d36e23c479
 DIST virtuoso-opensource-5.0.13.tar.gz 63923387 RMD160 1275cccd701f43437082c3c49ff1e02768baddb1 SHA1 dbaa870d654a1637e4f8011e29c9a48336169b25 SHA256 c4afb385e15dc2a8f73549f0ef67a292fe3350090bdf32c424d26b878a80f63f
-DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac
+DIST virtuoso-opensource-6.1.0.tar.gz 70162123 RMD160 55caaa4c09815dcbb2150d37b9c0ef2a0c01b4a8 SHA1 11d68d3b8d7fef05017eaba6dcc86050db71d211 SHA256 6495885b56653e759d43bd58d5ac5ca0f335de85c47e7997ad44857924599acf
 EBUILD virtuoso-jdbc-5.0.13.ebuild 526 RMD160 ee8fd168de64b78d1cf9d7a0f1943b0e6a7d8b2c SHA1 395d39e535584e0d75cde5c75c83a3efe54a4ecf SHA256 77115dd57766b74959f1c5efbcb91a9f4f86439b008cce29c81c9e2dd575a2cc
-EBUILD virtuoso-jdbc-6.0.0.ebuild 526 RMD160 ee8fd168de64b78d1cf9d7a0f1943b0e6a7d8b2c SHA1 395d39e535584e0d75cde5c75c83a3efe54a4ecf SHA256 77115dd57766b74959f1c5efbcb91a9f4f86439b008cce29c81c9e2dd575a2cc
+EBUILD virtuoso-jdbc-6.1.0.ebuild 526 RMD160 ee8fd168de64b78d1cf9d7a0f1943b0e6a7d8b2c SHA1 395d39e535584e0d75cde5c75c83a3efe54a4ecf SHA256 77115dd57766b74959f1c5efbcb91a9f4f86439b008cce29c81c9e2dd575a2cc
 MISC metadata.xml 254 RMD160 5b019c6857b4f16e448b37bb41a23abf95aeaff0 SHA1 6dd78589487c63dfe4d45792c3064f9c7f9de417 SHA256 291d2bc4bebfae761cbb4df4e2cc50664e6de12ec7a11f8cb07e71098e70bd6c
diff --git a/dev-db/virtuoso-jdbc/files/6.0.0/6.0.0-common.patch b/dev-db/virtuoso-jdbc/files/6.0.0/6.0.0-common.patch
deleted file mode 100644
index 3e4d012e02..0000000000
--- a/dev-db/virtuoso-jdbc/files/6.0.0/6.0.0-common.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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-jdbc/files/6.1.0/6.1.0-common.patch b/dev-db/virtuoso-jdbc/files/6.1.0/6.1.0-common.patch
new file mode 100644
index 0000000000..abc2aded35
--- /dev/null
+++ b/dev-db/virtuoso-jdbc/files/6.1.0/6.1.0-common.patch
@@ -0,0 +1,62 @@
+diff -ru ../virtuoso-opensource-6.1.0/appsrc/Makefile.am ./appsrc/Makefile.am
+--- ../virtuoso-opensource-6.1.0/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
++++ ./appsrc/Makefile.am	2010-02-04 03:29:07.355245690 +0100
+@@ -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 ../virtuoso-opensource-6.1.0/configure.in ./configure.in
+--- ../virtuoso-opensource-6.1.0/configure.in	2010-02-03 21:49:18.000000000 +0100
++++ ./configure.in	2010-02-04 03:29:07.406282543 +0100
+@@ -608,18 +608,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 ../virtuoso-opensource-6.1.0/Makefile.am ./Makefile.am
+--- ../virtuoso-opensource-6.1.0/Makefile.am	2010-02-03 17:09:01.000000000 +0100
++++ ./Makefile.am	2010-02-04 03:29:07.414281441 +0100
+@@ -25,14 +25,6 @@
+ 
+ SUBDIRS = . docsrc libsrc binsrc appsrc
+ 
+-dist_doc_DATA = \
+-	AUTHORS \
+-	COPYING \
+-	CREDITS \
+-	INSTALL \
+-	LICENSE \
+-	NEWS \
+-	README*
+ 
+ # ----------------------------------------------------------------------
+ #
diff --git a/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.0.0.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.0.ebuild
index 0d11c4d891..0d11c4d891 100644
--- a/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.0.0.ebuild
+++ b/dev-db/virtuoso-jdbc/virtuoso-jdbc-6.1.0.ebuild