From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Tue, 6 Apr 2010 17:32:35 +0000 (+0000)
Subject: Version bump 6.1.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0630eaccc63542b99532207461a2d9b262a8f73b;p=gentoo.git

Version bump 6.1.1
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/dev-db/virtuoso-odbc/ChangeLog b/dev-db/virtuoso-odbc/ChangeLog
index 891956ece0b9..c605e84b3b1f 100644
--- a/dev-db/virtuoso-odbc/ChangeLog
+++ b/dev-db/virtuoso-odbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/virtuoso-odbc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.4 2010/02/16 17:12:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.5 2010/04/06 17:31:23 reavertm Exp $
+
+*virtuoso-odbc-6.1.1 (06 Apr 2010)
+
+  06 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +virtuoso-odbc-6.1.1.ebuild:
+  Version bump 6.1.1
 
   16 Feb 2010; Joseph Jezak <josejx@gentoo.org> virtuoso-odbc-6.1.0.ebuild:
   Marked ~ppc/~ppc64 for bug #304365.
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.1.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.1.ebuild
new file mode 100644
index 000000000000..e50bc0e23f72
--- /dev/null
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 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.1.ebuild,v 1.1 2010/04/06 17:31:23 reavertm Exp $
+
+EAPI="3"
+
+inherit virtuoso
+
+DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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 "${ED}/usr/${libdir}"/*.la || die
+		done
+	fi
+}
diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index 0156a615546c..8936efe671ed 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2010/02/23 00:53:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.6 2010/04/06 17:32:35 reavertm Exp $
+
+*virtuoso-server-6.1.1 (06 Apr 2010)
+
+  06 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +virtuoso-server-6.1.1.ebuild:
+  Version bump 6.1.1
 
   23 Feb 2010; Maciej Mrozowski <reavertm@gentoo.org>
   virtuoso-server-6.1.0.ebuild:
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild
new file mode 100644
index 000000000000..3c62c30034fd
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild
@@ -0,0 +1,82 @@
+# 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.1.ebuild,v 1.1 2010/04/06 17:32:35 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 - 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: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 "${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
+}