ppc/ppc64 stable wrt bug#435080. kick older.

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

7 files changed, 15 insertions, 147 deletions

diff --git a/dev-db/virtuoso-odbc/ChangeLog b/dev-db/virtuoso-odbc/ChangeLog
index e81962b074d0..036043dba406 100644
--- a/dev-db/virtuoso-odbc/ChangeLog
+++ b/dev-db/virtuoso-odbc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/virtuoso-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.36 2012/09/17 10:31:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/ChangeLog,v 1.37 2012/09/20 17:45:26 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> -virtuoso-odbc-6.1.4.ebuild,
+  virtuoso-odbc-6.1.6.ebuild:
+  ppc/ppc64 stable wrt bug#435080. kick older.
 
   17 Sep 2012; Agostino Sarubbo <ago@gentoo.org> virtuoso-odbc-6.1.6.ebuild:
   Stable for amd64, wrt bug #435080
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
deleted file mode 100644
index 70b2bdb8b4a4..000000000000
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild,v 1.7 2012/05/23 08:28:22 jdhore Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-VOS_EXTRACT="
-	libsrc/Dk
-	libsrc/Thread
-	libsrc/odbcsdk
-	libsrc/util
-	binsrc/driver
-"
-
-src_configure() {
-	myconf+="
-		--disable-static
-		--without-iodbc
-	"
-
-	virtuoso_src_configure
-}
-
-src_install() {
-	virtuoso_src_install
-
-	# Remove libtool files
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild
index c58474d3f912..9dec32ec0224 100644
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild,v 1.3 2012/09/17 10:31:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.6.ebuild,v 1.4 2012/09/20 17:45:26 scarabeus Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit virtuoso
 
 DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-db/virtuoso-server/ChangeLog b/dev-db/virtuoso-server/ChangeLog
index d3fe9df5d422..1a294515adeb 100644
--- a/dev-db/virtuoso-server/ChangeLog
+++ b/dev-db/virtuoso-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/virtuoso-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.43 2012/09/17 10:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/ChangeLog,v 1.44 2012/09/20 17:45:54 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/virtuoso-server-6.1.4-strncat-overflow.patch,
+  -virtuoso-server-6.1.4-r1.ebuild, virtuoso-server-6.1.6.ebuild:
+  ppc/ppc64 stable wrt bug#435080. kick older.
 
   17 Sep 2012; Agostino Sarubbo <ago@gentoo.org> virtuoso-server-6.1.6.ebuild:
   Stable for amd64, wrt bug #435080
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch
deleted file mode 100644
index 432482171289..000000000000
--- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-strncat-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c
-+++ virtuoso-opensource-6.1.4/libsrc/Wi/http_client.c
-@@ -423,7 +423,7 @@
-   socksreq[8] = 0; /* no name */
-   if (name)
-     {
--      strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8);
-+      strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 9);
-       socksreq[sizeof (socksreq) - 1] = 0;
-       packetsize = 9 + strlen ((char *) socksreq + 8);
-     }
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
deleted file mode 100644
index 71c6b6573f3a..000000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 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.4-r1.ebuild,v 1.6 2012/05/23 08:27:53 jdhore Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~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-1.2.5.1-r2:0[minizip]
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk
-	>=sys-devel/bison-2.3
-	>=sys-devel/flex-2.5.33
-	virtual/pkgconfig
-"
-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}/${PN}-6.1.4-unbundle-minizip.patch"
-	"${FILESDIR}/${PN}-6.1.4-strncat-overflow.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
-}
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild
index 0afc9cd7a883..4bd57f8417b5 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.6.ebuild,v 1.4 2012/09/17 10:32:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.6.ebuild,v 1.5 2012/09/20 17:45:54 scarabeus Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ inherit virtuoso
 
 DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="kerberos ldap readline"
 
 # Bug 305077