From b66bebd9fb42ec7d030e58f6babd14683d9ffd92 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Tue, 1 Mar 2011 20:15:08 +0000
Subject: Remove unused patches

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
---
 dev-db/firebird/ChangeLog                          |  10 +-
 .../firebird-2.0.4.13130.1-deps-flags-libs.patch   |  90 ---------------
 .../firebird-2.1.1.17910.0-deps-flags-libs.patch   | 121 ---------------------
 .../firebird-2.1.1.17910.0-gcc-icu-declare.patch   |  27 -----
 4 files changed, 8 insertions(+), 240 deletions(-)
 delete mode 100644 dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch
 delete mode 100644 dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch
 delete mode 100644 dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch

(limited to 'dev-db/firebird')

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 0e51d7e81465..d4148a5abe2f 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/firebird
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.104 2010/11/18 20:01:23 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.105 2011/03/01 20:15:08 idl0r Exp $
+
+  01 Mar 2011; Christian Ruppert <idl0r@gentoo.org>
+  -files/firebird-2.0.4.13130.1-deps-flags-libs.patch,
+  -files/firebird-2.1.1.17910.0-deps-flags-libs.patch,
+  -files/firebird-2.1.1.17910.0-gcc-icu-declare.patch:
+  Remove unused patches
 
 *firebird-2.5.0.26074.0 (18 Nov 2010)
 
diff --git a/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch
deleted file mode 100644
index 0c774a16c2e8..000000000000
--- a/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/Makefile.in.firebird Firebird-2.0.4.13130-1/builds/posix/Makefile.in.firebird
---- Firebird-2.0.4.13130-1_orig/builds/posix/Makefile.in.firebird	2008-07-23 17:52:13.000000000 -0400
-+++ Firebird-2.0.4.13130-1/builds/posix/Makefile.in.firebird	2008-07-23 17:57:05.000000000 -0400
-@@ -185,10 +185,10 @@
- # 
- 
- external_libraries:
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-+#ifeq ($(EDITLINE_FLG),Y)
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-+#endif
- 
- #---------------------------------------------------------------------------
- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
-diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/make.rules Firebird-2.0.4.13130-1/builds/posix/make.rules
---- Firebird-2.0.4.13130-1_orig/builds/posix/make.rules	2008-07-23 17:52:13.000000000 -0400
-+++ Firebird-2.0.4.13130-1/builds/posix/make.rules	2008-07-23 17:59:22.000000000 -0400
-@@ -33,7 +33,7 @@
- 
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
--CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
-+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
-@@ -88,19 +88,19 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/make.shared.targets Firebird-2.0.4.13130-1/builds/posix/make.shared.targets
---- Firebird-2.0.4.13130-1_orig/builds/posix/make.shared.targets	2008-07-23 17:52:13.000000000 -0400
-+++ Firebird-2.0.4.13130-1/builds/posix/make.shared.targets	2008-07-23 17:54:26.000000000 -0400
-@@ -57,7 +57,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/prefix.linux Firebird-2.0.4.13130-1/builds/posix/prefix.linux
---- Firebird-2.0.4.13130-1_orig/builds/posix/prefix.linux	2008-07-23 17:52:13.000000000 -0400
-+++ Firebird-2.0.4.13130-1/builds/posix/prefix.linux	2008-07-23 17:53:32.000000000 -0400
-@@ -20,7 +20,7 @@
- 
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
--PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-+PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
- DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- 
-diff -Naur Firebird-2.0.4.13130-1_orig/configure.in Firebird-2.0.4.13130-1/configure.in
---- Firebird-2.0.4.13130-1_orig/configure.in	2008-07-23 17:52:12.000000000 -0400
-+++ Firebird-2.0.4.13130-1/configure.in	2008-07-23 17:57:56.000000000 -0400
-@@ -465,7 +465,7 @@
- 			AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
- 				AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
- 					AC_MSG_ERROR(termcap support not found)))))  
--	AC_SUBST(EDITLINE_A, -leditline)
-+	AC_SUBST(EDITLINE_A, -ledit)
- 	AC_SUBST(TERMLIB)
- 	XE_APPEND(-l$TERMLIB, LIBS)
- fi
diff --git a/dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch
deleted file mode 100644
index 8bcd3ca0dfd4..000000000000
--- a/dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird	2007-10-19 11:11:36.000000000 -0400
-+++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird	2007-11-14 13:43:55.000000000 -0500
-@@ -185,14 +185,7 @@
- # 
- 
- external_libraries:
--ifeq ($(STD_ICU),false)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--endif
--ifeq ($(STD_EDITLINE),false)
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
--endif
-+
- 
- btyacc_binary: $(BTYACC)
- 
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults	2007-10-19 11:11:36.000000000 -0400
-+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults	2007-11-14 13:44:39.000000000 -0500
-@@ -229,11 +229,7 @@
- LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
- ifeq ($(EDITLINE_FLG),Y)
--  ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -leditline
--  else
--	LIBEDITLINE := $(LIB)/libeditline.a
--  endif
-+	LIBEDITLINE := -ledit
- endif
- 
- LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules	2007-11-14 14:29:58.000000000 -0500
-+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules	2007-11-14 14:30:13.000000000 -0500
-@@ -33,9 +33,6 @@
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
- CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
--ifeq ($(STD_ICU),false)
--  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
--endif
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
-@@ -69,19 +66,19 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets	2007-10-19 11:11:36.000000000 -0400
-+++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets	2007-11-14 13:46:49.000000000 -0500
-@@ -49,7 +49,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux	2007-10-19 11:11:36.000000000 -0400
-+++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux	2007-11-14 13:47:56.000000000 -0500
-@@ -21,11 +21,10 @@
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
-+COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
- DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
---- Firebird-2.1.0.16780-Beta2_orig/configure	2007-10-19 11:11:39.000000000 -0400
-+++ Firebird-2.1.0.16780-Beta2/configure	2007-11-14 13:48:51.000000000 -0500
-@@ -3928,13 +3928,13 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
--  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
--echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
- if test "${ac_cv_lib_editline_readline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-leditline  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch b/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch
deleted file mode 100644
index 1e0fc093668e..000000000000
--- a/dev-db/firebird/files/firebird-2.1.1.17910.0-gcc-icu-declare.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
-+++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
-@@ -48,6 +48,8 @@
- 					   stdlib.h (EKU) */
- #endif
- 
-+#include <new>
-+
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
- #else
-@@ -448,15 +450,6 @@
- 	);
- }
- 
--inline void* operator new(size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--inline void* operator new[](size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--
- inline void operator delete(void* mem) throw()
- {
- 	Firebird::MemoryPool::globalFree(mem);
-- 
cgit v1.2.3-65-gdbad