diff options
19 files changed, 247 insertions, 158 deletions
diff --git a/Documentation/package.keywords/kde-4.4.9999.d/more-deps b/Documentation/package.keywords/kde-4.4.9999.d/more-deps index ef98897fe49..fe95f2a5f5d 100644 --- a/Documentation/package.keywords/kde-4.4.9999.d/more-deps +++ b/Documentation/package.keywords/kde-4.4.9999.d/more-deps @@ -1,8 +1,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-4.4.9999.keywords b/Documentation/package.keywords/kde-4.4.9999.keywords index 7cd1898f9a4..717f3643244 100644 --- a/Documentation/package.keywords/kde-4.4.9999.keywords +++ b/Documentation/package.keywords/kde-4.4.9999.keywords @@ -287,8 +287,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-4.4.d/more-deps b/Documentation/package.keywords/kde-4.4.d/more-deps index ef98897fe49..fe95f2a5f5d 100644 --- a/Documentation/package.keywords/kde-4.4.d/more-deps +++ b/Documentation/package.keywords/kde-4.4.d/more-deps @@ -1,8 +1,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords index c08f17f5c18..2b9d1b300a6 100644 --- a/Documentation/package.keywords/kde-4.4.keywords +++ b/Documentation/package.keywords/kde-4.4.keywords @@ -287,8 +287,8 @@ kde-base/kdewebdev-meta:4.4 =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-live.base/more-deps b/Documentation/package.keywords/kde-live.base/more-deps index ef98897fe49..fe95f2a5f5d 100644 --- a/Documentation/package.keywords/kde-live.base/more-deps +++ b/Documentation/package.keywords/kde-live.base/more-deps @@ -1,8 +1,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-live.d/more-deps b/Documentation/package.keywords/kde-live.d/more-deps index ef98897fe49..fe95f2a5f5d 100644 --- a/Documentation/package.keywords/kde-live.d/more-deps +++ b/Documentation/package.keywords/kde-live.d/more-deps @@ -1,8 +1,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords index 11e02095ea6..c925c5e7c84 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -304,8 +304,8 @@ =app-admin/system-config-printer-common-1.1* =app-misc/hal-cups-utils-0.6* ~app-text/poppler-0.12.3 -~dev-db/virtuoso-odbc-5.0.12 -~dev-db/virtuoso-server-5.0.12 +~dev-db/virtuoso-odbc-5.0.13 +~dev-db/virtuoso-server-5.0.13 dev-libs/libattica ~dev-libs/shared-desktop-ontologies-0.2 =dev-python/pycups-1.9* diff --git a/dev-db/virtuoso-jdbc/Manifest b/dev-db/virtuoso-jdbc/Manifest index 7844dfc44c3..9f3fbc8d521 100644 --- a/dev-db/virtuoso-jdbc/Manifest +++ b/dev-db/virtuoso-jdbc/Manifest @@ -1,4 +1,7 @@ +AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a +DIST virtuoso-opensource-5.0.13.tar.gz 63923387 RMD160 1275cccd701f43437082c3c49ff1e02768baddb1 SHA1 dbaa870d654a1637e4f8011e29c9a48336169b25 SHA256 c4afb385e15dc2a8f73549f0ef67a292fe3350090bdf32c424d26b878a80f63f DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac +EBUILD virtuoso-jdbc-5.0.13.ebuild 526 RMD160 ee8fd168de64b78d1cf9d7a0f1943b0e6a7d8b2c SHA1 395d39e535584e0d75cde5c75c83a3efe54a4ecf SHA256 77115dd57766b74959f1c5efbcb91a9f4f86439b008cce29c81c9e2dd575a2cc EBUILD virtuoso-jdbc-6.0.0.ebuild 526 RMD160 ee8fd168de64b78d1cf9d7a0f1943b0e6a7d8b2c SHA1 395d39e535584e0d75cde5c75c83a3efe54a4ecf SHA256 77115dd57766b74959f1c5efbcb91a9f4f86439b008cce29c81c9e2dd575a2cc MISC metadata.xml 254 RMD160 5b019c6857b4f16e448b37bb41a23abf95aeaff0 SHA1 6dd78589487c63dfe4d45792c3064f9c7f9de417 SHA256 291d2bc4bebfae761cbb4df4e2cc50664e6de12ec7a11f8cb07e71098e70bd6c diff --git a/dev-db/virtuoso-jdbc/files/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-jdbc/files/5.0.13/5.0.13-common.patch new file mode 100644 index 00000000000..73ac5111de1 --- /dev/null +++ b/dev-db/virtuoso-jdbc/files/5.0.13/5.0.13-common.patch @@ -0,0 +1,62 @@ +diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am +--- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am 2007-05-07 15:23:31.000000000 +0200 ++++ ./appsrc/Makefile.am 2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in +--- ../virtuoso-opensource-5.0.13/configure.in 2010-02-03 21:35:24.000000000 +0100 ++++ ./configure.in 2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am +--- ../virtuoso-opensource-5.0.13/Makefile.am 2010-02-03 19:15:44.000000000 +0100 ++++ ./Makefile.am 2010-02-04 02:27:51.497811162 +0100 +@@ -25,14 +25,6 @@ + + SUBDIRS = . docsrc libsrc binsrc appsrc + +-dist_doc_DATA = \ +- AUTHORS \ +- COPYING \ +- CREDITS \ +- INSTALL \ +- LICENSE \ +- NEWS \ +- README* + + # ---------------------------------------------------------------------- + # diff --git a/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.13.ebuild b/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.13.ebuild new file mode 100644 index 00000000000..0d11c4d8918 --- /dev/null +++ b/dev-db/virtuoso-jdbc/virtuoso-jdbc-5.0.13.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit virtuoso java-pkg-2 + +DESCRIPTION="JDBC driver for OpenLink Virtuoso Open-Source Edition" + +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=virtual/jdk-1.6.0 +" +RDEPEND=" + >=virtual/jre-1.6.0 +" + +VOS_EXTRACT=" + libsrc/JDBCDriverType4 +" + +src_prepare() { + java-pkg-2_src_prepare + virtuoso_src_prepare +} + +src_configure() { + myconf+=" + --with-jdk4=$(java-config-2 -O) + " + + virtuoso_src_configure +} diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest index f0e066a5f55..2b6be3b738e 100644 --- a/dev-db/virtuoso-odbc/Manifest +++ b/dev-db/virtuoso-odbc/Manifest @@ -1,7 +1,7 @@ -AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a +AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a -DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4 +DIST virtuoso-opensource-5.0.13.tar.gz 63923387 RMD160 1275cccd701f43437082c3c49ff1e02768baddb1 SHA1 dbaa870d654a1637e4f8011e29c9a48336169b25 SHA256 c4afb385e15dc2a8f73549f0ef67a292fe3350090bdf32c424d26b878a80f63f DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac -EBUILD virtuoso-odbc-5.0.12.ebuild 750 RMD160 691fc1e92eaaf99e85cbb63a0f370ba135c1121d SHA1 2490bcc6fdb637eea661f061475e1dbd92c6f678 SHA256 889107d8f8ba38367c812861ef4ed1136ac5cd21d6db05fd92e8a742dd87e3d9 +EBUILD virtuoso-odbc-5.0.13.ebuild 750 RMD160 691fc1e92eaaf99e85cbb63a0f370ba135c1121d SHA1 2490bcc6fdb637eea661f061475e1dbd92c6f678 SHA256 889107d8f8ba38367c812861ef4ed1136ac5cd21d6db05fd92e8a742dd87e3d9 EBUILD virtuoso-odbc-6.0.0.ebuild 750 RMD160 691fc1e92eaaf99e85cbb63a0f370ba135c1121d SHA1 2490bcc6fdb637eea661f061475e1dbd92c6f678 SHA256 889107d8f8ba38367c812861ef4ed1136ac5cd21d6db05fd92e8a742dd87e3d9 MISC metadata.xml 254 RMD160 5b019c6857b4f16e448b37bb41a23abf95aeaff0 SHA1 6dd78589487c63dfe4d45792c3064f9c7f9de417 SHA256 291d2bc4bebfae761cbb4df4e2cc50664e6de12ec7a11f8cb07e71098e70bd6c diff --git a/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch b/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch deleted file mode 100644 index 3e4d012e020..00000000000 --- a/dev-db/virtuoso-odbc/files/5.0.12/5.0.12-common.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ru ../old/configure.in ./configure.in ---- ../old/configure.in 2009-04-21 18:28:32.000000000 +0200 -+++ ./configure.in 2009-07-02 07:24:11.000000000 +0200 -@@ -606,18 +607,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 ../old/appsrc/Makefile.am ./appsrc/Makefile.am ---- ../old/appsrc/Makefile.am 2007-05-07 15:23:31.000000000 +0200 -+++ ./appsrc/Makefile.am 2009-07-04 22:45:53.000000000 +0200 -@@ -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 ../old/libsrc/Wi/bif_file.c ./libsrc/Wi/bif_file.c ---- ../old/libsrc/Wi/bif_file.c 2009-04-19 23:48:55.000000000 +0200 -+++ ./libsrc/Wi/bif_file.c 2009-06-24 22:03:12.000000000 +0200 -@@ -57,7 +57,6 @@ - #endif - - #include "zlib.h" --#include "zutil.h" - #include "srvmultibyte.h" - - #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ -@@ -4411,7 +4410,7 @@ - level = 6; - - err = deflateInit2 (&(s->stream), level, -- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); -+ Z_DEFLATED, -MAX_WBITS, 9, strategy); - - s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE); - if (err != Z_OK || s->outbuf == Z_NULL) diff --git a/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch new file mode 100644 index 00000000000..73ac5111de1 --- /dev/null +++ b/dev-db/virtuoso-odbc/files/5.0.13/5.0.13-common.patch @@ -0,0 +1,62 @@ +diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am +--- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am 2007-05-07 15:23:31.000000000 +0200 ++++ ./appsrc/Makefile.am 2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in +--- ../virtuoso-opensource-5.0.13/configure.in 2010-02-03 21:35:24.000000000 +0100 ++++ ./configure.in 2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am +--- ../virtuoso-opensource-5.0.13/Makefile.am 2010-02-03 19:15:44.000000000 +0100 ++++ ./Makefile.am 2010-02-04 02:27:51.497811162 +0100 +@@ -25,14 +25,6 @@ + + SUBDIRS = . docsrc libsrc binsrc appsrc + +-dist_doc_DATA = \ +- AUTHORS \ +- COPYING \ +- CREDITS \ +- INSTALL \ +- LICENSE \ +- NEWS \ +- README* + + # ---------------------------------------------------------------------- + # diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.13.ebuild index 47ab02f9afa..47ab02f9afa 100644 --- a/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.12.ebuild +++ b/dev-db/virtuoso-odbc/virtuoso-odbc-5.0.13.ebuild diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest index a7d48afdf37..1b8250d718d 100644 --- a/dev-db/virtuoso-server/Manifest +++ b/dev-db/virtuoso-server/Manifest @@ -1,7 +1,7 @@ -AUX 5.0.12/5.0.12-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a +AUX 5.0.13/5.0.13-common.patch 1853 RMD160 7dfa5128808e9bd8c8a2393f6de3b3007d922e50 SHA1 c6d52f93178ac1fcfae554d8e62c2dd4a5e6cd74 SHA256 818f6fbf6035478c745737b4b943d8f50802fbdac3c68ac29e71a7c47d65547c AUX 6.0.0/6.0.0-common.patch 1977 RMD160 7362fc1dbfba9cb7be3cabf20963e8128ac9285f SHA1 c5dfa6638cd925328f3db3b2eb30b13d10caac58 SHA256 61a63d31faed59366ec174790d093097bdb26f10e0f35344f088a9d59d86809a -DIST virtuoso-opensource-5.0.12.tar.gz 65186909 RMD160 f8c4f7d229d8ce75a7abec74d15517e92c49694b SHA1 7e4a27b7a133ded8aa6c7c8834e72012582ff29a SHA256 db78f2256bb0d22ab253af78f9de05cf5c34e8a82b8d91dae454543af8ef9ec4 +DIST virtuoso-opensource-5.0.13.tar.gz 63923387 RMD160 1275cccd701f43437082c3c49ff1e02768baddb1 SHA1 dbaa870d654a1637e4f8011e29c9a48336169b25 SHA256 c4afb385e15dc2a8f73549f0ef67a292fe3350090bdf32c424d26b878a80f63f DIST virtuoso-opensource-6.0.0.tar.gz 68235850 RMD160 16a0fb068f01a5d05e501a5f113a7675477e32c8 SHA1 511c3353201587b7921a107de48c2866b051be2f SHA256 e6c44aa8154f28ba7068b0846e94e9eaab599a986d0da62a367d20c79a3d3cac -EBUILD virtuoso-server-5.0.12.ebuild 2210 RMD160 30d9202bfe36a01e24edaf50520a3172185dc411 SHA1 383e79f7056f5470c758dc79e047b24ce00eb87d SHA256 de62fb828a3ccaf992650d18f9656b692aa7ada602204066f001da87f8cfa27c +EBUILD virtuoso-server-5.0.13.ebuild 2210 RMD160 30d9202bfe36a01e24edaf50520a3172185dc411 SHA1 383e79f7056f5470c758dc79e047b24ce00eb87d SHA256 de62fb828a3ccaf992650d18f9656b692aa7ada602204066f001da87f8cfa27c EBUILD virtuoso-server-6.0.0.ebuild 2210 RMD160 30d9202bfe36a01e24edaf50520a3172185dc411 SHA1 383e79f7056f5470c758dc79e047b24ce00eb87d SHA256 de62fb828a3ccaf992650d18f9656b692aa7ada602204066f001da87f8cfa27c MISC metadata.xml 775 RMD160 a7f1f3ce2ef51c602d2d2958957616fcc919f387 SHA1 e13c67e3edc57c76038546e71e18f53243e8d71d SHA256 533745d604ee750e2d00d65448014b1c060f605a60707f5452528ca6512096fd diff --git a/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch b/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch deleted file mode 100644 index 3e4d012e020..00000000000 --- a/dev-db/virtuoso-server/files/5.0.12/5.0.12-common.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ru ../old/configure.in ./configure.in ---- ../old/configure.in 2009-04-21 18:28:32.000000000 +0200 -+++ ./configure.in 2009-07-02 07:24:11.000000000 +0200 -@@ -606,18 +607,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 ../old/appsrc/Makefile.am ./appsrc/Makefile.am ---- ../old/appsrc/Makefile.am 2007-05-07 15:23:31.000000000 +0200 -+++ ./appsrc/Makefile.am 2009-07-04 22:45:53.000000000 +0200 -@@ -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 ../old/libsrc/Wi/bif_file.c ./libsrc/Wi/bif_file.c ---- ../old/libsrc/Wi/bif_file.c 2009-04-19 23:48:55.000000000 +0200 -+++ ./libsrc/Wi/bif_file.c 2009-06-24 22:03:12.000000000 +0200 -@@ -57,7 +57,6 @@ - #endif - - #include "zlib.h" --#include "zutil.h" - #include "srvmultibyte.h" - - #define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */ -@@ -4411,7 +4410,7 @@ - level = 6; - - err = deflateInit2 (&(s->stream), level, -- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); -+ Z_DEFLATED, -MAX_WBITS, 9, strategy); - - s->stream.next_out = s->outbuf = (Byte *) dk_alloc (Z_BUFSIZE); - if (err != Z_OK || s->outbuf == Z_NULL) diff --git a/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch b/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch new file mode 100644 index 00000000000..73ac5111de1 --- /dev/null +++ b/dev-db/virtuoso-server/files/5.0.13/5.0.13-common.patch @@ -0,0 +1,62 @@ +diff -ru ../virtuoso-opensource-5.0.13/appsrc/Makefile.am ./appsrc/Makefile.am +--- ../virtuoso-opensource-5.0.13/appsrc/Makefile.am 2007-05-07 15:23:31.000000000 +0200 ++++ ./appsrc/Makefile.am 2010-02-04 02:26:39.233264458 +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-5.0.13/configure.in ./configure.in +--- ../virtuoso-opensource-5.0.13/configure.in 2010-02-03 21:35:24.000000000 +0100 ++++ ./configure.in 2010-02-04 02:26:39.232260962 +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-5.0.13/Makefile.am ./Makefile.am +--- ../virtuoso-opensource-5.0.13/Makefile.am 2010-02-03 19:15:44.000000000 +0100 ++++ ./Makefile.am 2010-02-04 02:27:51.497811162 +0100 +@@ -25,14 +25,6 @@ + + SUBDIRS = . docsrc libsrc binsrc appsrc + +-dist_doc_DATA = \ +- AUTHORS \ +- COPYING \ +- CREDITS \ +- INSTALL \ +- LICENSE \ +- NEWS \ +- README* + + # ---------------------------------------------------------------------- + # diff --git a/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild b/dev-db/virtuoso-server/virtuoso-server-5.0.13.ebuild index 0d5096cd9f8..0d5096cd9f8 100644 --- a/dev-db/virtuoso-server/virtuoso-server-5.0.12.ebuild +++ b/dev-db/virtuoso-server/virtuoso-server-5.0.13.ebuild diff --git a/eclass/virtuoso.eclass b/eclass/virtuoso.eclass index 50418e54088..b4d24f98e12 100644 --- a/eclass/virtuoso.eclass +++ b/eclass/virtuoso.eclass @@ -4,7 +4,7 @@ # @ECLASS: virtuoso.eclass # @MAINTAINER: -# Maciej Mrozowski <reavertm@poczta.fm> +# Maciej Mrozowski <reavertm@gentoo.org> # # @BLURB: Provides splitting functionality for Virtuoso # @DESCRIPTION: @@ -116,20 +116,12 @@ virtuoso_src_configure() { export SERVER=${EPREFIX}/usr/bin/virtuoso-t fi - # Version specific options - case ${PV} in - 5.0.11) - ;; - *) - myconf+=" --without-internal-zlib" - ;; - esac - econf \ --with-layout=gentoo \ --localstatedir=${EPREFIX}/var \ --enable-shared \ --with-pthreads \ + --without-internal-zlib \ ${myconf} } |