Version bump. Remove old.

(Portage version: 2.1.3.16)

14 files changed, 50 insertions, 205 deletions

diff --git a/dev-db/gigabase/ChangeLog b/dev-db/gigabase/ChangeLog
index fa108d8a6062..6431fc71c4fb 100644
--- a/dev-db/gigabase/ChangeLog
+++ b/dev-db/gigabase/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/gigabase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/ChangeLog,v 1.26 2007/08/31 09:49:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/ChangeLog,v 1.27 2007/11/01 12:31:56 pva Exp $
+
+*gigabase-3.60 (01 Nov 2007)
+
+  01 Nov 2007; <pva@gentoo.org>
+  -files/gigabase-3.54-cli.h-redudant-typedef-fix.patch,
+  +files/gigabase-3.60-confdefs.h-and-warnings.patch, -gigabase-3.51.ebuild,
+  -gigabase-3.55.ebuild, -gigabase-3.56.ebuild, -gigabase-3.57.ebuild,
+  -gigabase-3.58.ebuild, +gigabase-3.60.ebuild:
+  Version bump. Remove old.
 
 *gigabase-3.59 (31 Aug 2007)
 
diff --git a/dev-db/gigabase/files/digest-gigabase-3.51 b/dev-db/gigabase/files/digest-gigabase-3.51
deleted file mode 100644
index 839d483fa28d..000000000000
--- a/dev-db/gigabase/files/digest-gigabase-3.51
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74d63595a05647967985db0a0d170b8c gigabase-3.51.tar.gz 1536316
-RMD160 6b6a6f836545a75ed6bce88f107505af0a61ca2e gigabase-3.51.tar.gz 1536316
-SHA256 a2a99e67abd078e468f6c4e191ee4ab5e78d9423ee562ca5034b5c69183bfc1e gigabase-3.51.tar.gz 1536316
diff --git a/dev-db/gigabase/files/digest-gigabase-3.55 b/dev-db/gigabase/files/digest-gigabase-3.55
deleted file mode 100644
index 1448c66aa6de..000000000000
--- a/dev-db/gigabase/files/digest-gigabase-3.55
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5f3e49aa8c0613c09dcfeafc6ee8156b gigabase-3.55.tar.gz 1420974
-RMD160 4d633ad73ac6705b0b18ce50431a99de6af0a3ef gigabase-3.55.tar.gz 1420974
-SHA256 880116949e6206c78962bdca9752539c280b0ec65abee1ec4d9e8fb9a7c5c6fa gigabase-3.55.tar.gz 1420974
diff --git a/dev-db/gigabase/files/digest-gigabase-3.56 b/dev-db/gigabase/files/digest-gigabase-3.56
deleted file mode 100644
index 69c99e8dfda4..000000000000
--- a/dev-db/gigabase/files/digest-gigabase-3.56
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 baa2cb8f8efa7da4073320a143267ac8 gigabase-3.56.tar.gz 1419071
-RMD160 f7b63634f9461317e4b47cde2cb77d4e39705791 gigabase-3.56.tar.gz 1419071
-SHA256 00807759d81858cff6d64060e7a258d157a933b535a038ef13d291df6e7ae11e gigabase-3.56.tar.gz 1419071
diff --git a/dev-db/gigabase/files/digest-gigabase-3.57 b/dev-db/gigabase/files/digest-gigabase-3.57
deleted file mode 100644
index 3ef3aa429675..000000000000
--- a/dev-db/gigabase/files/digest-gigabase-3.57
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 921e415b712c70006c202ce0016cd4e0 gigabase-3.57.tar.gz 1421414
-RMD160 228e4a8ab2904fc68c65f8ab7ab8debb4ae3adc2 gigabase-3.57.tar.gz 1421414
-SHA256 97ba44c50bcc85966f4a94c3dc33094e0dea9da2116fb3cbfec6770d26f25989 gigabase-3.57.tar.gz 1421414
diff --git a/dev-db/gigabase/files/digest-gigabase-3.58 b/dev-db/gigabase/files/digest-gigabase-3.58
deleted file mode 100644
index 7dc55ec6c74e..000000000000
--- a/dev-db/gigabase/files/digest-gigabase-3.58
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ccc5218018fec4fe2a6b1c3722c5c26b gigabase-3.58.tar.gz 1421459
-RMD160 c6e681efb80bc3deecaf7441fc84aee4424b9bdd gigabase-3.58.tar.gz 1421459
-SHA256 19d0fe6354285f3085b51a8a180c1381320da3deb1bc61e833829bb3bda9c2e0 gigabase-3.58.tar.gz 1421459
diff --git a/dev-db/gigabase/files/digest-gigabase-3.60 b/dev-db/gigabase/files/digest-gigabase-3.60
new file mode 100644
index 000000000000..09cb1ccf4278
--- /dev/null
+++ b/dev-db/gigabase/files/digest-gigabase-3.60
@@ -0,0 +1,3 @@
+MD5 3f51edd8fa52e9e5a5c9b5368c5b4974 gigabase-3.60.tar.gz 1433948
+RMD160 cbde0a0c6f460d0ad0b15d904f75cf278a435002 gigabase-3.60.tar.gz 1433948
+SHA256 38ad92fe39a5cb14f544eab1a0a16207efd35aad2d3ef26a714a5e127507ac73 gigabase-3.60.tar.gz 1433948
diff --git a/dev-db/gigabase/files/gigabase-3.54-cli.h-redudant-typedef-fix.patch b/dev-db/gigabase/files/gigabase-3.54-cli.h-redudant-typedef-fix.patch
deleted file mode 100644
index 0bcff94681b8..000000000000
--- a/dev-db/gigabase/files/gigabase-3.54-cli.h-redudant-typedef-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cli.h.orig	2006-12-10 21:02:01.000000000 +0300
-+++ cli.h	2006-12-10 21:02:19.000000000 +0300
-@@ -822,8 +822,6 @@
-  */
- void GIGABASE_DLL_ENTRY cli_free_memory(int session, void* ptr);
- 
--
--typedef void* cli_transaction_context_t;
- /*********************************************************************
-  * cli_create_transaction_context
-  *    Create new transaction xontext which can be used in cli_join_transaction function
diff --git a/dev-db/gigabase/files/gigabase-3.60-confdefs.h-and-warnings.patch b/dev-db/gigabase/files/gigabase-3.60-confdefs.h-and-warnings.patch
new file mode 100644
index 000000000000..97cfa7dcdaad
--- /dev/null
+++ b/dev-db/gigabase/files/gigabase-3.60-confdefs.h-and-warnings.patch
@@ -0,0 +1,27 @@
+--- ./config.h.orig	2007-11-01 15:18:53.000000000 +0300
++++ ./config.h	2007-11-01 15:19:32.000000000 +0300
+@@ -15,9 +15,6 @@
+ #define _CRT_SECURE_NO_DEPRECATE true
+ #endif
+ 
+-// Use configuration file generated by configure script
+-#include "confdefs.h"
+-
+ #ifndef AUTOCONFIG
+ 
+ // USE_LOCALE_SETTINGS - use C locale for string comparison operations
+@@ -136,12 +133,12 @@
+ 
+ 
+ // Use reentrant version of localtime
+-#if !defined(__APPLE__) && !defined(_WIN32)
++#if !defined(__APPLE__) && !defined(_WIN32) && !defined(HAVE_LOCALTIME_R)
+ #define HAVE_LOCALTIME_R
+ #endif
+ 
+ // Use reentrant version of localtime
+-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(_AIX)
++#if !defined(__APPLE__) && !defined(_WIN32) && !defined(_AIX) && !defined(HAVE_GETHOSTBYNAME_R)
+ #define HAVE_GETHOSTBYNAME_R
+ #endif
+ 
diff --git a/dev-db/gigabase/gigabase-3.51.ebuild b/dev-db/gigabase/gigabase-3.51.ebuild
deleted file mode 100644
index fa6e783cf8c8..000000000000
--- a/dev-db/gigabase/gigabase-3.51.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.51.ebuild,v 1.4 2006/11/15 06:02:10 beandog Exp $
-
-inherit multilib
-
-DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
-HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
-SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 s390 x86"
-IUSE="doc"
-DEPEND=""
-
-S="${WORKDIR}"/gigabase
-
-src_compile() {
-	mf="${S}/Makefile"
-
-	econf || die "econf failed"
-
-	sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf}
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc CHANGES
-	use doc && dohtml GigaBASE.htm
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "The subsql binary has been renamed to subsql-gdb,"
-	elog "to avoid a name clash with the FastDB version of subsql"
-	echo
-	ewarn "Content of indices created by old (<=3.42) version of GigaBASE with"
-	ewarn "USE_LOCALE_SETTINGS enabled and using non-standard locale will be"
-	ewarn "different with format used by version 3.43 and higher. So you will"
-	ewarn "have to recreate indices in this case."
-}
diff --git a/dev-db/gigabase/gigabase-3.55.ebuild b/dev-db/gigabase/gigabase-3.55.ebuild
deleted file mode 100644
index 4be2a09172eb..000000000000
--- a/dev-db/gigabase/gigabase-3.55.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.55.ebuild,v 1.1 2007/02/27 12:27:18 pva Exp $
-
-inherit multilib
-
-DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
-HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
-SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
-IUSE="doc"
-DEPEND=""
-
-S="${WORKDIR}"/gigabase
-
-src_compile() {
-	mf="${S}/Makefile"
-
-	econf || die "econf failed"
-
-	sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf}
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc CHANGES
-	use doc && dohtml GigaBASE.htm
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "The subsql binary has been renamed to subsql-gdb,"
-	elog "to avoid a name clash with the FastDB version of subsql"
-	echo
-	ewarn "Content of indices created by old (<=3.42) version of GigaBASE with"
-	ewarn "USE_LOCALE_SETTINGS enabled and using non-standard locale will be"
-	ewarn "different with format used by version 3.43 and higher. So you will"
-	ewarn "have to recreate indices in this case."
-}
diff --git a/dev-db/gigabase/gigabase-3.56.ebuild b/dev-db/gigabase/gigabase-3.56.ebuild
deleted file mode 100644
index ecf616fbf59a..000000000000
--- a/dev-db/gigabase/gigabase-3.56.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.56.ebuild,v 1.1 2007/03/16 09:34:33 pva Exp $
-
-inherit multilib
-
-DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
-HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
-SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
-IUSE="doc"
-DEPEND=""
-
-S="${WORKDIR}"/gigabase
-
-src_compile() {
-	mf="${S}/Makefile"
-
-	econf || die "econf failed"
-
-	sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf}
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc CHANGES
-	use doc && dohtml GigaBASE.htm
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "The subsql binary has been renamed to subsql-gdb,"
-	elog "to avoid a name clash with the FastDB version of subsql"
-	echo
-	ewarn "Content of indices created by old (<=3.42) version of GigaBASE with"
-	ewarn "USE_LOCALE_SETTINGS enabled and using non-standard locale will be"
-	ewarn "different with format used by version 3.43 and higher. So you will"
-	ewarn "have to recreate indices in this case."
-}
diff --git a/dev-db/gigabase/gigabase-3.57.ebuild b/dev-db/gigabase/gigabase-3.57.ebuild
deleted file mode 100644
index 5e06e5bc3ad9..000000000000
--- a/dev-db/gigabase/gigabase-3.57.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.57.ebuild,v 1.1 2007/04/05 20:00:13 pva Exp $
-
-inherit multilib
-
-DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
-HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
-SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
-IUSE="doc"
-DEPEND=""
-
-S="${WORKDIR}"/gigabase
-
-src_compile() {
-	mf="${S}/Makefile"
-
-	econf || die "econf failed"
-
-	sed -r -i -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf}
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	einstall || die "make install failed"
-
-	dodoc CHANGES
-	use doc && dohtml GigaBASE.htm
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "The subsql binary has been renamed to subsql-gdb,"
-	elog "to avoid a name clash with the FastDB version of subsql"
-	echo
-	ewarn "Content of indices created by old (<=3.42) version of GigaBASE with"
-	ewarn "USE_LOCALE_SETTINGS enabled and using non-standard locale will be"
-	ewarn "different with format used by version 3.43 and higher. So you will"
-	ewarn "have to recreate indices in this case."
-}
diff --git a/dev-db/gigabase/gigabase-3.58.ebuild b/dev-db/gigabase/gigabase-3.60.ebuild
index 1b0b02713e7d..b62a29cc7e73 100644
--- a/dev-db/gigabase/gigabase-3.58.ebuild
+++ b/dev-db/gigabase/gigabase-3.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.58.ebuild,v 1.1 2007/05/05 15:30:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.60.ebuild,v 1.1 2007/11/01 12:31:56 pva Exp $
 
 inherit eutils libtool multilib
 
@@ -13,7 +13,15 @@ KEYWORDS="~amd64 ~s390 ~x86"
 IUSE="doc"
 DEPEND=""
 
-S="${WORKDIR}"/gigabase
+S=${WORKDIR}/gigabase
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	sed -ie 's: confdefs.h::g' Makefile.in
+	epatch "${FILESDIR}"/${P}-confdefs.h-and-warnings.patch
+}
 
 src_compile() {
 	mf="${S}/Makefile"