From c2be337e2210d38cf02d0e3e29c51d1912f138b4 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Thu, 24 Nov 2011 00:53:23 +0000 Subject: [PATCH] Version bump, remove 6.1.3-r1, add virtuoso-server-6.1.4.ebuild} | 8 ++--- 6 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch rename dev-db/virtuoso-server/{virtuoso-server-6.1.3-r1.ebuild => virtuoso-server-6.1.4.ebuild} (90%) diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog index e55cb43ca1d3..883da169f1bf 100644 --- a/dev-db/virtuoso-server/ChangeLog +++ b/dev-db/virtuoso-server/ChangeLog @@ -1,6 +1,14 @@ # 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.24 2011/09/21 22:25:23 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.25 2011/11/24 00:53:23 reavertm Exp $ + +*virtuoso-server-6.1.4 (24 Nov 2011) + + 24 Nov 2011; Maciej Mrozowski + +files/virtuoso-server-6.1.4-unbundle-minizip.patch, + +virtuoso-server-6.1.4.ebuild, -virtuoso-server-6.1.3-r1.ebuild, + virtuoso-server-6.1.2.ebuild, virtuoso-server-6.1.3.ebuild: + Version bump, remove 6.1.3-r1, add virtuoso-server-6.1.3-r1.ebuild, diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest index 393355f4df49..3affce84bb2f 100644 --- a/dev-db/virtuoso-server/Manifest +++ b/dev-db/virtuoso-server/Manifest @@ -3,19 +3,22 @@ Hash: SHA1 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 +AUX virtuoso-server-6.1.4-unbundle-minizip.patch 1399 RMD160 8382d224efc11b35183de8ae2b8fedbc58c80a25 SHA1 390442aa7e99deb7f8d44962039a64275edfac12 SHA256 8f78723b086f0cedf0df274bf4a97b3cf6d177e3c3901ae542961bb6fc1a8c2f 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 VOS-genpatches-6.1.4.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 1930 RMD160 02bd84383d9ea09ccf008e8c569e0f3d4859904b SHA1 3a59b582fb632d19202c3b0805ddf334d62b660b SHA256 62ad55003426e375bf83183a02875b280621f3fd481f68218c437a517c9ab8e9 -EBUILD virtuoso-server-6.1.3-r1.ebuild 1983 RMD160 5eb18eefbd424ac281f3fb59367cba9ad9feb7f9 SHA1 991f631b0ff173bbfebbc594d7227013c0302877 SHA256 188afbcf69e270a19ef21af2c3044377bea30baac315260d9b74311d7c9d1576 -EBUILD virtuoso-server-6.1.3.ebuild 1932 RMD160 792e2140a34314f621858f0f8f5ede02cf92e04c SHA1 7c409fe62a705b4c0fa8c02eb3be4a044979d623 SHA256 6e602734f0ee40fc04e18e3c367a69f0a7f42148c7e6dd340d6b28cee7eb95ec -MISC ChangeLog 3711 RMD160 be6e7a468c09add5cb85efc08c1c93699b6af196 SHA1 9b94ae92e19c03cfc73b56db5ba32bec535a150f SHA256 4623614a45837ae33976c06a41fb207ba0e212d5d2a15835492f00631e2ff7d3 +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.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 metadata.xml 776 RMD160 8fd1645181fcb1b15dc92abd6ab04353c8875d6f SHA1 1bd47782d6572dc306feb87f55874cd4d82c6c65 SHA256 4ed0f7b3a3499245c57ec212a148bbb28fec2b14bde2e49a890ba86a3ddbaca6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk56ZFYACgkQFuHa/bHpVdt3rwCfar+XA3MpCeYVXxkwsasKM+X9 -McIAoJOjYMvhZSIg/x6Ury4LwGqG2KGP -=ihq1 +iEYEARECAAYFAk7NlYcACgkQFuHa/bHpVdsvKwCeNynmIfH2GosFhCWyt7+6Q1d8 +CXYAoJRVWYkreSFGzmt2COsip4qz1jsK +=2Cnc -----END PGP SIGNATURE----- diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch new file mode 100644 index 000000000000..143c35905b21 --- /dev/null +++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch @@ -0,0 +1,36 @@ +diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in +--- virtuoso-opensource-6.1.4.orig/configure.in 2011-11-20 03:38:18.000000000 +0400 ++++ virtuoso-opensource-6.1.4/configure.in 2011-11-20 03:42:44.000000000 +0400 +@@ -1550,14 +1550,15 @@ + then + AC_CHECK_HEADER(zlib.h) + AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) ++ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) + fi + if test "x$with_zlib" = "xinternal" + then + ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' + ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' + else +- ZLIB_INC="" +- ZLIB_LIB="-lz" ++ ZLIB_INC=`pkg-config --cflags zlib minizip` ++ ZLIB_LIB=`pkg-config --libs zlib minizip` + fi + AC_SUBST(ZLIB_INC) + AC_SUBST(ZLIB_LIB) +diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c +--- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c 2011-10-26 17:54:19.000000000 +0400 ++++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c 2011-11-20 03:44:36.000000000 +0400 +@@ -6167,10 +6167,7 @@ + #define fopen64 fopen + #endif + +-#include "zlib/contrib/minizip/unzip.h" +-#include "zlib/contrib/minizip/ioapi.h" +-#include "zlib/contrib/minizip/ioapi.c" +-#include "zlib/contrib/minizip/unzip.c" ++#include "unzip.h" + + static caddr_t + bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild index 62aee17c8040..8b55b864e35f 100644 --- a/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild +++ b/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild @@ -1,6 +1,6 @@ # 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.2.ebuild,v 1.6 2011/09/21 19:39:12 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.2.ebuild,v 1.7 2011/11/24 00:53:23 reavertm Exp $ EAPI="3" @@ -28,6 +28,7 @@ COMMON_DEPEND=" readline? ( sys-libs/readline:0 ) " DEPEND="${COMMON_DEPEND} + =sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 " diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild index 88443157f650..326a74f0e51c 100644 --- a/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild +++ b/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.5 2011/09/21 19:39:12 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3.ebuild,v 1.6 2011/11/24 00:53:23 reavertm Exp $ EAPI=4 @@ -28,6 +28,7 @@ COMMON_DEPEND=" readline? ( sys-libs/readline:0 ) " DEPEND="${COMMON_DEPEND} + =sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 " diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild similarity index 90% rename from dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild rename to dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild index cd773a2ddecb..43c667fcd2d9 100644 --- a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r1.ebuild +++ b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild @@ -1,6 +1,6 @@ # 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.3 2011/09/21 22:25:23 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild,v 1.1 2011/11/24 00:53:23 reavertm Exp $ EAPI=4 @@ -26,11 +26,12 @@ COMMON_DEPEND=" readline? ( sys-libs/readline:0 ) " DEPEND="${COMMON_DEPEND} + sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 " RDEPEND="${COMMON_DEPEND} - >=dev-db/virtuoso-odbc-${PV}:${SLOT} + ~dev-db/virtuoso-odbc-${PV}:${SLOT} " VOS_EXTRACT=" @@ -50,8 +51,7 @@ VOS_EXTRACT=" DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README) PATCHES=( - "${FILESDIR}/${P}-unicode.patch" - "${FILESDIR}/${P}-unbundle-minizip.patch" + "${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch" ) src_prepare() { -- 2.26.2