[dev-db/virtuoso-*] Removed 5.0.13, added virtuosoconverter

14 files changed, 154 insertions, 397 deletions

diff --git a/dev-db/virtuoso-jdbc/Manifest b/dev-db/virtuoso-jdbc/Manifest
index 47d93d9d71a..28a1620bcff 100644
--- a/dev-db/virtuoso-jdbc/Manifest
+++ b/dev-db/virtuoso-jdbc/Manifest
@@ -1,7 +1,4 @@
-AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c
 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.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.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/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-jdbc/files/5.0.13/5.0.13-common.patch
deleted file mode 100644
index 73ac5111de1..00000000000
--- a/dev-db/virtuoso-jdbc/files/5.0.13/5.0.13-common.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am
---- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
-+++ ./appsrc/Makefile.am	2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in
---- ../virtuoso-opensource-5.0.13/configure.in	2010-02-03 21:35:24.000000000 +0100
-+++ ./configure.in	2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am
---- ../virtuoso-opensource-5.0.13/Makefile.am	2010-02-03 19:15:44.000000000 +0100
-+++ ./Makefile.am	2010-02-04 02:27:51.497811162 +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-5.0.13.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.13.ebuild
deleted file mode 100644
index 0d11c4d8918..00000000000
--- a/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit virtuoso java-pkg-2
-
-DESCRIPTION="JDBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=virtual/jdk-1.6.0
-"
-RDEPEND="
-	>=virtual/jre-1.6.0
-"
-
-VOS_EXTRACT="
-	libsrc/JDBCDriverType4
-"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	virtuoso_src_prepare
-}
-
-src_configure() {
-	myconf+="
-		--with-jdk4=$(java-config-2 -O)
-	"
-
-	virtuoso_src_configure
-}
diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest
index 4417a76f697..4bcc0f23e82 100644
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@@ -1,7 +1,4 @@
-AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c
 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.1.0.tar.gz 70162123 RMD160 55caaa4c09815dcbb2150d37b9c0ef2a0c01b4a8 SHA1 11d68d3b8d7fef05017eaba6dcc86050db71d211 SHA256 6495885b56653e759d43bd58d5ac5ca0f335de85c47e7997ad44857924599acf
-EBUILD virtuoso-odbc-5.0.13.ebuild 750 RMD160 691fc1e92eaaf99e85cbb63a0f370ba135c1121d SHA1 2490bcc6fdb637eea661f061475e1dbd92c6f678 SHA256 889107d8f8ba38367c812861ef4ed1136ac5cd21d6db05fd92e8a742dd87e3d9
 EBUILD virtuoso-odbc-6.1.0.ebuild 750 RMD160 691fc1e92eaaf99e85cbb63a0f370ba135c1121d SHA1 2490bcc6fdb637eea661f061475e1dbd92c6f678 SHA256 889107d8f8ba38367c812861ef4ed1136ac5cd21d6db05fd92e8a742dd87e3d9
 MISC metadata.xml 254 RMD160 5b019c6857b4f16e448b37bb41a23abf95aeaff0 SHA1 6dd78589487c63dfe4d45792c3064f9c7f9de417 SHA256 291d2bc4bebfae761cbb4df4e2cc50664e6de12ec7a11f8cb07e71098e70bd6c
diff --git a/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch
deleted file mode 100644
index 73ac5111de1..00000000000
--- a/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am
---- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
-+++ ./appsrc/Makefile.am	2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in
---- ../virtuoso-opensource-5.0.13/configure.in	2010-02-03 21:35:24.000000000 +0100
-+++ ./configure.in	2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am
---- ../virtuoso-opensource-5.0.13/Makefile.am	2010-02-03 19:15:44.000000000 +0100
-+++ ./Makefile.am	2010-02-04 02:27:51.497811162 +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-odbc/virtuoso-odbc-5.0.13.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.13.ebuild
deleted file mode 100644
index 47ab02f9afa..00000000000
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.13.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 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() {
-	use prefix || ED="${D}"
-
-	virtuoso_src_install
-
-	# Remove libtool files
-	if ! use static-libs; then
-		local libdir
-		for libdir in $(get_all_libdirs); do
-			rm -f "${ED}/usr/${libdir}"/*.la || die
-		done
-	fi
-}
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index 1af70058b2a..8dce2acc9a2 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,7 +1,4 @@
-AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c
 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.1.0.tar.gz 70162123 RMD160 55caaa4c09815dcbb2150d37b9c0ef2a0c01b4a8 SHA1 11d68d3b8d7fef05017eaba6dcc86050db71d211 SHA256 6495885b56653e759d43bd58d5ac5ca0f335de85c47e7997ad44857924599acf
-EBUILD virtuoso-server-5.0.13.ebuild 2210 RMD160 30d9202bfe36a01e24edaf50520a3172185dc411 SHA1 383e79f7056f5470c758dc79e047b24ce00eb87d SHA256 de62fb828a3ccaf992650d18f9656b692aa7ada602204066f001da87f8cfa27c
-EBUILD virtuoso-server-6.1.0.ebuild 2210 RMD160 30d9202bfe36a01e24edaf50520a3172185dc411 SHA1 383e79f7056f5470c758dc79e047b24ce00eb87d SHA256 de62fb828a3ccaf992650d18f9656b692aa7ada602204066f001da87f8cfa27c
+EBUILD virtuoso-server-6.1.0.ebuild 2497 RMD160 4e52f5a9772c4339760a7bbb5b6511dd1d52c42c SHA1 d2d3a3ed7cbd6393cdced6c7440724713772275b SHA256 7cccd6f7c1c12568962b3704c8f27a66873696fbe84e6b0dc414e33c858b623c
 MISC metadata.xml 775 RMD160 a7f1f3ce2ef51c602d2d2958957616fcc919f387 SHA1 e13c67e3edc57c76038546e71e18f53243e8d71d SHA256 533745d604ee750e2d00d65448014b1c060f605a60707f5452528ca6512096fd
diff --git a/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch
deleted file mode 100644
index 73ac5111de1..00000000000
--- a/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am
---- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am	2007-05-07 15:23:31.000000000 +0200
-+++ ./appsrc/Makefile.am	2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in
---- ../virtuoso-opensource-5.0.13/configure.in	2010-02-03 21:35:24.000000000 +0100
-+++ ./configure.in	2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am
---- ../virtuoso-opensource-5.0.13/Makefile.am	2010-02-03 19:15:44.000000000 +0100
-+++ ./Makefile.am	2010-02-04 02:27:51.497811162 +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-server/virtuoso-server-5.0.13.ebuild b/dev-db/virtuoso-server/virtuoso-server-5.0.13.ebuild
deleted file mode 100644
index 0d5096cd9f8..00000000000
--- a/dev-db/virtuoso-server/virtuoso-server-5.0.13.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 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() {
-	use prefix || ED="${D}"
-
-	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
-
-	dodoc AUTHORS ChangeLog CREDITS INSTALL NEWS README || die "dodoc failed"
-
-	keepdir /var/lib/virtuoso/db
-}
-
-pkg_postinst() {
-	use prefix || EROOT="${ROOT}"
-
-	echo
-	einfo "To start the database server:"
-	echo
-	einfo "# cd ${EROOT}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
-}
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.0.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.0.ebuild
index 0d5096cd9f8..28d57569083 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.0.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.0.ebuild
@@ -44,6 +44,12 @@ VOS_EXTRACT="
 	binsrc/tests
 "
 
+pkg_setup() {
+	if has_version '<dev-db/virtuoso-server-6.0.0' && has_version 'kde-base/nepomuk'; then
+		VIRTUOSO_UPGRADE=1
+	fi
+}
+
 src_prepare() {
 	if ! use static-libs; then
 		sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
@@ -82,20 +88,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	use prefix || EROOT="${ROOT}"
-
-	echo
-	einfo "To start the database server:"
-	echo
-	einfo "# cd ${EROOT}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
+	if [[ -n ${VIRTUOSO_UPGRADE} ]]; then
+		echo
+		ewarn "You're upgrading from Virtuoso V5. Note that your existing Nepomuk Virtuoso databases"
+		ewarn "will not work with Virtuoso V6 release unless you do one of the following:"
+		ewarn "a) Convert existing databases to V6 format:"
+		ewarn "  (as root) # emerge -1 dev-db/virtuosoconverter"
+		ewarn "  (as user) $ virtuosoconverter --auto"
+		ewarn "  (as root) # emerge -C virtuosoconverter"
+		ewarn "b) Remove existing databases:"
+		ewarn "  (as user) $ rm -r \${HOME}/.kde4/share/apps/nepomuk/repository/main/data/virtuosobackend"
+		echo
+	fi
 }
diff --git a/dev-db/virtuosoconverter/Manifest b/dev-db/virtuosoconverter/Manifest
new file mode 100644
index 00000000000..beadd414bca
--- /dev/null
+++ b/dev-db/virtuosoconverter/Manifest
@@ -0,0 +1,5 @@
+AUX virtuosoconverter-1.0-cmake.patch 2062 RMD160 1b8978608c7033adf24dd560da73800eb615bdcd SHA1 efe1d260d8186efbb46ab919ce67a3180e9bb2a4 SHA256 51e57c3f0e5fa84e514e4ac1096830f516e99f948238679e237c0b56ada16209
+DIST 119661-virtuosoconverter-1.0.tar.bz2 11591 RMD160 3cce8386b0d394b0a5781613a70caf6f3727436e SHA1 abc0ab1cdcb1fb17c6fde9d74e99df6086a4c251 SHA256 000750160c7953dd92ed09a5717225c7d1d7ddcd60fb11ac7e9bb133b2815b26
+DIST virtuoso-opensource-5.0.13.tar.gz 63923387 RMD160 1275cccd701f43437082c3c49ff1e02768baddb1 SHA1 dbaa870d654a1637e4f8011e29c9a48336169b25 SHA256 c4afb385e15dc2a8f73549f0ef67a292fe3350090bdf32c424d26b878a80f63f
+EBUILD virtuosoconverter-1.0.ebuild 1625 RMD160 ed894c6b740d78e22ceb8975c0e52680b3e7f319 SHA1 0367148614af1600d4bca3d5e3d43cd89b44a4fb SHA256 0fd9d7c4125e3d6274c102217353a76868f0a9e2beb833e61c7d24439b951ddf
+MISC metadata.xml 255 RMD160 a560df45a556ec988f15b81b886494bef871605a SHA1 43ab29fe9b9be52d71347179e62a087f5c959907 SHA256 0783ed6e9fe482ef59895af90133639bd3296d33c6b7103e52615910697cdbc1
diff --git a/dev-db/virtuosoconverter/files/virtuosoconverter-1.0-cmake.patch b/dev-db/virtuosoconverter/files/virtuosoconverter-1.0-cmake.patch
new file mode 100644
index 00000000000..8609993d101
--- /dev/null
+++ b/dev-db/virtuosoconverter/files/virtuosoconverter-1.0-cmake.patch
@@ -0,0 +1,45 @@
+diff -ru ../virtuosoconverter-1.0/CMakeLists.txt ./CMakeLists.txt
+--- ../virtuosoconverter-1.0/CMakeLists.txt	2010-02-03 14:03:30.000000000 +0100
++++ ./CMakeLists.txt	2010-02-04 16:06:28.344773799 +0100
+@@ -53,40 +53,7 @@
+ # build Virtuoso5 the ugly way
+ #
+ 
+-# Check if the source tree does already contain the v5 sources. If not -> download them
+-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/virtuoso-opensource-5.0.12.tar.gz)
+-  set(VIRTUOSO_V5_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/virtuoso-opensource-5.0.12.tar.gz)
+-else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/virtuoso-opensource-5.0.12.tar.gz)
+-  set(VIRTUOSO_V5_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/virtuoso-opensource-5.0.12.tar.gz)
+-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/virtuoso-opensource-5.0.12.tar.gz)
+-
+-set(VIRTUOSO_V5_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/virtuoso-opensource-5.0.12)
+-
+-add_custom_command(
+-  OUTPUT ${VIRTUOSO_V5_SOURCE}
+-  COMMAND wget http://sourceforge.net/projects/virtuoso/files/virtuoso/5.0.12/virtuoso-opensource-5.0.12.tar.gz/download
+-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-  COMMENT "Downloading Virtuoso 5 sources...")
+-  
+-add_custom_command(
+-  OUTPUT ${VIRTUOSO_V5_SOURCE_DIR}/Makefile.am
+-  COMMAND tar xzf ${VIRTUOSO_V5_SOURCE}
+-  DEPENDS ${VIRTUOSO_V5_SOURCE}
+-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-  COMMENT "Extracting Virtuoso 5 sources...")
+-
+-add_custom_command(
+-  OUTPUT ${VIRTUOSO_V5_SOURCE_DIR}/Makefile
+-  COMMAND ${VIRTUOSO_V5_SOURCE_DIR}/configure --disable-all-vads --disable-wbxml2 --disable-imsg --disable-openldap --disable-imagemagick
+-  DEPENDS ${VIRTUOSO_V5_SOURCE_DIR}/Makefile.am
+-  WORKING_DIRECTORY ${VIRTUOSO_V5_SOURCE_DIR}
+-  COMMENT "Configuring Virtuoso 5 sources...")
+-
+-add_custom_target(virtuoso-t ALL
+-  COMMAND make
+-  DEPENDS ${VIRTUOSO_V5_SOURCE_DIR}/Makefile
+-  WORKING_DIRECTORY ${VIRTUOSO_V5_SOURCE_DIR}
+-  COMMENT "Building Virtuoso 5 sources...")
++set(VIRTUOSO_V5_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../virtuoso-opensource-5.0.13)
+ 
+ install(
+   PROGRAMS ${VIRTUOSO_V5_SOURCE_DIR}/binsrc/virtuoso/virtuoso-t 
diff --git a/dev-db/virtuosoconverter/metadata.xml b/dev-db/virtuosoconverter/metadata.xml
new file mode 100644
index 00000000000..a968ff19bc5
--- /dev/null
+++ b/dev-db/virtuosoconverter/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<maintainer>
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-db/virtuosoconverter/virtuosoconverter-1.0.ebuild b/dev-db/virtuosoconverter/virtuosoconverter-1.0.ebuild
new file mode 100644
index 00000000000..9d77ea08df5
--- /dev/null
+++ b/dev-db/virtuosoconverter/virtuosoconverter-1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit kde4-base
+
+VIRTUOSO_RELEASE='virtuoso-opensource-5.0.13'
+DESCRIPTION="Nepomuk database from Virtuoso V5 to V6 converter"
+HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=119661"
+SRC_URI="
+http://kde-apps.org/CONTENT/content-files/119661-${P}.tar.bz2
+mirror://sourceforge/virtuoso/${VIRTUOSO_RELEASE}.tar.gz
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+COMMON_DEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/openssl-0.9.7i:0
+	>=dev-libs/soprano-2.3.68[dbus,raptor,virtuoso]
+	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop]
+	sys-libs/zlib:0
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/bison-2.3
+	>=sys-devel/flex-2.5.33
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+src_configure() {
+	# Configure Virtuoso V5
+	pushd "${WORKDIR}/${VIRTUOSO_RELEASE}" > /dev/null || die
+	econf \
+		--disable-all-vads \
+		--disable-hslookup \
+		--disable-imagemagick \
+		--disable-imsg \
+		--disable-openldap \
+		--disable-pldebug \
+		--disable-ruby \
+		--disable-static \
+		--disable-wbxml2 \
+		--without-internal-zlib \
+		--with-pthreads \
+		--enable-shared
+
+	popd > /dev/null || die
+
+	kde4-base_src_configure
+}
+
+src_compile() {
+	pushd "${WORKDIR}/${VIRTUOSO_RELEASE}" > /dev/null || die
+	emake || die 'failed to build Virtuoso V5'
+	popd /dev/null || die
+
+	kde4-base_src_compile
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "To convert your existing Nepomuk database, run for each user:"
+	elog "$ virtuosoconverter --auto"
+	echo
+}