Add patch for unicode regression, see kdebug 271664 for details

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

4 files changed, 129 insertions, 7 deletions

diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index a0979c963caa..a4e4d31a0eb9 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.21 2011/09/05 13:49:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.22 2011/09/08 22:42:51 dilfridge Exp $
+
+*virtuoso-server-6.1.3-r1 (08 Sep 2011)
+
+  08 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +virtuoso-server-6.1.3-r1.ebuild, +files/virtuoso-server-6.1.3-unicode.patch:
+  Add patch for unicode regression, see kdebug 271664 for details
 
   05 Sep 2011; Tony Vroon <chainsaw@gentoo.org> virtuoso-server-6.1.3.ebuild:
   Marked stable on AMD64 based on arch testing by Ian "idella4" Delaney in bug
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index d0a818e93811..3cdf77a8bb62 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX virtuoso-server-6.1.3-unicode.patch 850 RMD160 06b449b58f768be1d11fbf496adef5f40edf277d SHA1 8b9ad92b605a8bfcbd50c8684bde89a6ad22a9ee SHA256 7feea9e5b730dc0716b284fa968ef7121ba5897aafdece16d07ee5e135947d26
 DIST VOS-genpatches-6.1.2.tar.bz2 1080 RMD160 f7ac395fa271cf08fd14c4709d5a5aa7b0d3876a SHA1 be40a0aae399c1dde6b9a09c081aa378495356ef SHA256 7f2078e18702bf078ee6af81a4b83e7fedee1250e192e0ab986dcb535319267a
 DIST VOS-genpatches-6.1.3.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
 DIST virtuoso-opensource-6.1.2.tar.gz 72303185 RMD160 3aaeeca67fa5ac7d6c60017b58c0f830afc9ce7e SHA1 fdcc79c230aaa6f63d2796659ec96ebfc571ac97 SHA256 6838e41a6ee688f08d92e7299eaf75f9c63a4b9f6f6a27eace9a9921b008ad56
 DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
 EBUILD virtuoso-server-6.1.2.ebuild 1864 RMD160 7aef0f6cb8c2aec1b801d30c2306dc09c63f9d36 SHA1 aad6b1bdcf8e63766014b9e595c2df381bae1cfa SHA256 8f83ed4fc0a8238737a1ec14272c27beefa123bc2cf1c17bd88fc3e51d315a3d
+EBUILD virtuoso-server-6.1.3-r1.ebuild 1918 RMD160 0f9f58eedd2a621b54a1985af714277efebd2069 SHA1 08ea2d26bd504d094f87548bbdb5475ecc3f9cce SHA256 c82f576b4c2b232c5188d02161dbdabd8327b56322f397fd0db5c44b1dbf6818
 EBUILD virtuoso-server-6.1.3.ebuild 1867 RMD160 fbca8704bb1a165b90eefbd535ca27407e1f54b3 SHA1 84e9d4710adc8499e3c3c597ae5f4aeaba2dba50 SHA256 53878cb1cc53d0ef5d54df9afbf107059280f2f0cff98bc50866798d6d9dd5f1
-MISC ChangeLog 3070 RMD160 b69de3eee1808ee8495102ef1d47f2d43bc5aace SHA1 49438c646f5d9411d4c9df19941e231b3f76b459 SHA256 06d80703df34b5eb5ff39a4f165a2fbfe0f22f1e9634db7211f6c792a2e97118
+MISC ChangeLog 3316 RMD160 3151fdf55b21167ee5448fdc31c7fa5c5954cdcb SHA1 34419ec7def26cd3d9164e7c0b72d779a2d2b95f SHA256 65f78fb9ad77399118b3192ea0e889a39d12eab6c12304cb9a16e094f2041e58
 MISC metadata.xml 776 RMD160 8fd1645181fcb1b15dc92abd6ab04353c8875d6f SHA1 1bd47782d6572dc306feb87f55874cd4d82c6c65 SHA256 4ed0f7b3a3499245c57ec212a148bbb28fec2b14bde2e49a890ba86a3ddbaca6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5k04AACgkQp5vW4rUFj5rv5gCeI1AKFe1Q1mttBsmjOCqiEv9+
-bC8AoKmN3RI5J6UNSwopOqq7wDIkxlkH
-=NN3V
+iQIcBAEBCgAGBQJOaUUGAAoJENwGBM22xffe97UP/1NkLhpHcQMciOvTf/wKZIHQ
+CwK2xixLx8OWdRKy+noE2b3tlsQCTr1f7X2V1+PPmpyyPxdr5iRBOQmTzeohAWPL
+pCGiGvEr+Tmxk94DRRq5L8XU6sL6kXHbjmIhEg9BfnL3jfXomCEgvwOlsbTVcHfX
+vcVvf3JWS6BewK44ZAJii6rYAW6YWqWktax7qmEyaaP9zz4STYFTCbyFPnvp0U+e
+KDgDlIJ1awbdKIMzmdtFxNIf6mCfcDbSdXgB6QyXF/CA9RXQkJq94/OeyqU1XtKN
+JRMWwPmMNbjCtxMg4P+f9AZe5PX2nXhHdsShAgx1yijCJf0o7XKpktcPVCWo7x5p
+UI5e+bsl7Bgc5RjXYFL5E6/t/Khu/Gref270zA6sozLyfRaSAW6/AHOZoPi6oT8T
+1MEYQaZiptvWVpF8OeeGzBSqjhV6lH3OMNaM+NZMyGvuBrR3nLRdzqyRytVzPRcD
+WrmAamXHDOcs+OxCSFUdHmA8xZz2zGK0NQx7+BZ76aM4PXGOaB6U7ej6Q7AjdDze
+CMj0AWgl2c98mLs/9QrggRW7Fh7srlgvPfU+BoJM48CFl6hGTMAj5TUMyDEcD+iU
+nhAUJBeOKgIWS1RaUJwIZs0k4wXRCSMPf3NB2obgWMmgWSaP6GoImbUSDm2OAToh
+oHf8PuSULIDGTKCXv2bM
+=k+gO
 -----END PGP SIGNATURE-----
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
new file mode 100644
index 000000000000..30046d2332ad
--- /dev/null
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
@@ -0,0 +1,21 @@
+Index: libsrc/Wi/xqf.c
+===================================================================
+RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v
+retrieving revision 1.21.2.9
+retrieving revision 1.21.2.12
+diff -u -r1.21.2.9 -r1.21.2.12
+--- libsrc/Wi/xqf.c	3 Mar 2011 11:56:45 -0000	1.21.2.9
++++ libsrc/Wi/xqf.c	26 Aug 2011 19:34:56 -0000	1.21.2.12
+@@ -3520,6 +3552,12 @@
+   desc = xqf_str_parser_descs + desc_idx;
+   if (DV_DB_NULL == arg_dtp)
+     return NEW_DB_NULL;
++  /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
++  if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
++    {
++      res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
++      goto res_ready;
++    }
+   if (DV_STRING != arg_dtp)
+     {
+       caddr_t err = NULL;
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
new file mode 100644
index 000000000000..c6ce74ea68ab
--- /dev/null
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild
@@ -0,0 +1,83 @@
+# 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-r1.ebuild,v 1.1 2011/09/08 22:42:51 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"
+
+# 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)
+
+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
+}