# ChangeLog for dev-db/virtuoso-server
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.7 2010/05/02 09:44:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.8 2010/05/06 22:18:34 reavertm Exp $
+
+ 06 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ -files/6.1.0/6.1.0-common.patch, -virtuoso-server-6.1.0.ebuild:
+ Remove old
02 May 2010; Alexis Ballier <aballier@gentoo.org>
virtuoso-server-6.1.1.ebuild:
+++ /dev/null
-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*
-
- # ----------------------------------------------------------------------
- #
+++ /dev/null
-# Copyright 1999-2010 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.0.ebuild,v 1.4 2010/02/23 00:53:59 reavertm Exp $
-
-EAPI="3"
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline static-libs"
-
-RESTRICT="test"
-
-# 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
-"
-
-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 \
- || 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 "${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() {
- 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) Remove existing databases:"
- ewarn " (as user) $ rm -r \${HOME}/.kde4/share/apps/nepomuk/repository"
- ewarn "b) Try to 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"
- echo
- fi
-}