Version bump 6.1.2, remove unnecessary static-libs USE flag

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 97 insertions, 11 deletions

diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index 9a74915ace14..377057f11fb5 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.11 2010/06/27 08:46:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.12 2010/07/14 05:45:43 reavertm Exp $
+
+*virtuoso-server-6.1.2 (14 Jul 2010)
+
+  14 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  virtuoso-server-6.1.1.ebuild, +virtuoso-server-6.1.2.ebuild:
+  Version bump 6.1.2, remove unnecessary static-libs USE flag
 
   27 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   virtuoso-server-6.1.1.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
index d8c7089f2614..5789ab3cced8 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2010/06/27 08:46:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.1.ebuild,v 1.6 2010/07/14 05:45:43 reavertm Exp $
 
 EAPI="3"
 
@@ -9,8 +9,9 @@ inherit virtuoso
 DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline static-libs"
+IUSE="kerberos ldap readline"
 
+# Bug 305077
 RESTRICT="test"
 
 # zeroconf support looks like broken - disabling - last checked around 5.0.12
@@ -46,11 +47,11 @@ VOS_EXTRACT="
 	binsrc/tests
 "
 
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
+
 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
+	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+		|| die "failed to disable installation of static lib"
 
 	virtuoso_src_prepare
 }
@@ -60,9 +61,9 @@ src_configure() {
 		$(use_enable kerberos krb)
 		$(use_enable ldap openldap)
 		$(use_with readline)
-		$(use_enable static-libs static)
-		--disable-rendezvous
+		--disable-static
 		--disable-hslookup
+		--disable-rendezvous
 		--without-iodbc
 	"
 
@@ -76,7 +77,5 @@ src_install() {
 	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
 }
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild
new file mode 100644
index 000000000000..6cf423d9b8ed
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild
@@ -0,0 +1,81 @@
+# 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.2.ebuild,v 1.1 2010/07/14 05:45:43 reavertm Exp $
+
+EAPI="3"
+
+inherit virtuoso
+
+DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="kerberos ldap readline"
+
+# Bug 305077
+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
+"
+
+DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
+
+src_prepare() {
+	sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
+		|| die "failed to disable installation of static lib"
+
+	virtuoso_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		$(use_enable kerberos krb)
+		$(use_enable ldap openldap)
+		$(use_with readline)
+		--disable-static
+		--disable-hslookup
+		--disable-rendezvous
+		--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
+
+	keepdir /var/lib/virtuoso/db
+}