Re-add a stable-compatible version patched against the unicode bug

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

3 files changed, 109 insertions, 6 deletions

diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index 883da169f1bf..15f74fdeeaac 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.25 2011/11/24 00:53:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.26 2011/12/10 17:41:47 dilfridge Exp $
+
+*virtuoso-server-6.1.3-r2 (10 Dec 2011)
+
+  10 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +virtuoso-server-6.1.3-r2.ebuild:
+  Re-add a stable-compatible version patched against the unicode bug
 
 *virtuoso-server-6.1.4 (24 Nov 2011)
 
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index 3affce84bb2f..aa870ab87f98 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX virtuoso-server-6.1.3-unbundle-minizip.patch 1239 RMD160 d42e80924d643c4dfa08ed6f55aa811d8f8e00a3 SHA1 025c9f8d85ac7616bbab09b62a9bf1f9f3553a14 SHA256 54d628c1d2e4748ec16e1a4e98fb5da4b5257c0dd49bb73621cff80669d02056
 AUX virtuoso-server-6.1.3-unicode.patch 850 RMD160 06b449b58f768be1d11fbf496adef5f40edf277d SHA1 8b9ad92b605a8bfcbd50c8684bde89a6ad22a9ee SHA256 7feea9e5b730dc0716b284fa968ef7121ba5897aafdece16d07ee5e135947d26
@@ -11,14 +11,25 @@ DIST virtuoso-opensource-6.1.2.tar.gz 72303185 RMD160 3aaeeca67fa5ac7d6c60017b58
 DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
 DIST virtuoso-opensource-6.1.4.tar.gz 100595847 RMD160 e62ec1b42be591747bfa04bab7b196afccf5a84a SHA1 39b2ad28e7ee58b5bca1ba8ff8365266dfa55fa7 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e
 EBUILD virtuoso-server-6.1.2.ebuild 1952 RMD160 982b1f74019c9a35c1049059ca75d44d16ee00a6 SHA1 9771ddcffef4b14dbbc455352634718f1167772f SHA256 b608187800edfd953db829832bc37a56b9ac6e83e6f6e143cf9e60afd50819da
+EBUILD virtuoso-server-6.1.3-r2.ebuild 2005 RMD160 9223b3c7e3f8bb539ac0b52809677cb8e5b67251 SHA1 54039f93276e6d6765b4bb306c68a541677daec0 SHA256 957c80a390a7fbeb4c647a8f6264aaf33e75eefde2e92baf5c3c399fb560185d
 EBUILD virtuoso-server-6.1.3.ebuild 1954 RMD160 7eb4e6ce3c07f0b5ec2ce068d065f4a7bf412471 SHA1 0a27c19901433df0425eacb3552f658a641dc922 SHA256 b4f7bc74bfcbe8213bc69bb656778c8e0a670a20ae637ecdbe3aa89c8da275e8
 EBUILD virtuoso-server-6.1.4.ebuild 1967 RMD160 7c7847f2c2848a1cd1dc6e4293b6d78fe0df7254 SHA1 d774d0de6abe45ae862a7097d6472fa67e223a49 SHA256 218d8b03aa4bdc0d188811ab1ef9203825f8e21be3c770af93c257507c66214d
-MISC ChangeLog 4059 RMD160 375bc6778a0810d27799148b5b65ba10c9c60044 SHA1 9f62833c6b42ca75dd22d1e71a59a63752e3306f SHA256 385788635fca33cd36eeb93afe9ab6d217102cd5a4877d787e9e32eee8fb8d48
+MISC ChangeLog 4264 RMD160 614d7a049dba8953da2d2472a4be237d04c8cee9 SHA1 6ecb6dac1ba887b26a23e281540bb719da77ccbd SHA256 a142e6049b0e4d71c6d65f30423728a4059af75ae12da07ea4ebc1978018db32
 MISC metadata.xml 776 RMD160 8fd1645181fcb1b15dc92abd6ab04353c8875d6f SHA1 1bd47782d6572dc306feb87f55874cd4d82c6c65 SHA256 4ed0f7b3a3499245c57ec212a148bbb28fec2b14bde2e49a890ba86a3ddbaca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7NlYcACgkQFuHa/bHpVdsvKwCeNynmIfH2GosFhCWyt7+6Q1d8
-CXYAoJRVWYkreSFGzmt2COsip4qz1jsK
-=2Cnc
+iQIcBAEBCgAGBQJO45npAAoJENwGBM22xffeMwcP/0zBgIYiZ7YSICO7KKK2dACU
+SHzcnLB5OfjPdg1KqspvbRkhh8s7G3d3Q05P+FymdL6CGdCkjXBacEIh8V1MU5q2
+MWp/5HM3QTJkU0NmfvmGz/G/XkwpEynBNW78HCZWmNKTGnsTkjuPYLuCOXUNF5tf
+3m65rn+OJBKQ+tzQMRKcY92R5AlwIZCtqHPjXEkvDOjd8VmlJjNVhU+ZwOJtQsrw
+a8YUSD7D+OUuCBPiALsRDhe0eefB/g36vJkpQaKFtEqwTo9a/ECJifmdN9R4sQgb
+nIaURkXABQYXBlb+9ZAi6IKsgRhrmw79o+A5PwRMWVu6vSa4/ocZCCDbOEiJZK46
+FgfQ2UY7RHgGuD/6PHsGRY6jXb4/zzHsez/CULpXWesOL5b8GZ7GJZC4L5RNgIUS
+9w9XVlp8X2dvFEtl12GccO8ybG0MyY7hbrtrDrV+08koeLkj/VDzzhl18QuPdj2V
+kikRfQk28qyV5IQ3iCbcOnvZU3qAuu2QSP+69iU3gogfcA31StH62gzdwCXU27Fz
+Io9TcEn3DGxgiETg5tBi5yVRn4eAa4cWEP57fGS/VOAgO5LkH5HLSrn60PnidrH0
+eTWdfNxP/4CTZgFsm/31TfB3/0mmzNk60zJ7yGHQ+gJ2rKHpt+kUctNeoiFHFUG3
+PtgjgeLqLh21ovc4eI/R
+=LFyC
 -----END PGP SIGNATURE-----
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild
new file mode 100644
index 000000000000..039686d103c0
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 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.3-r2.ebuild,v 1.1 2011/12/10 17:41:47 dilfridge Exp $
+
+EAPI=4
+
+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"
+
+# Version restriction on sys-libs/zlib, bug #383349
+
+# 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-1.2.5.1-r1:0
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	<sys-apps/gawk-4.0.0
+	>=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)
+
+PATCHES=( "${FILESDIR}/${P}-unicode.patch" )
+
+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
+}