Remove unused patches

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

5 files changed, 9 insertions, 244 deletions

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/Manifest b/dev-db/firebird/Manifest
index 539fdb78bece..adef0a20ab11 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -4,9 +4,6 @@ AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9
 AUX firebird-2.0.3.12981.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
 AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd209920cb434940a SHA1 250dcbc322a88b3c8c741ea6e58c637ddf44d066 SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
-AUX firebird-2.0.4.13130.1-deps-flags-libs.patch 4203 RMD160 161ab78880b17e2275c2efa76c656522eec8ae48 SHA1 8958d7ca6f394e18eef284e7676de3e6e977ad4d SHA256 3bb39901e22dff3350451c2e7953c71c988c7ec6be1e12386c410ca66644a499
-AUX firebird-2.1.1.17910.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
-AUX firebird-2.1.1.17910.0-gcc-icu-declare.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
 AUX firebird-2.1.2.18118.0-deps-flags-libs.patch 4508 RMD160 d936cfa5bcfdf195a0278327ec0c51fb106b5d56 SHA1 a04aed09a40775c072fb8a2ac8a941a5aaf99f81 SHA256 730189d644dc2a41e3f54839535ad3b84f4af9d02ee6064226175b5ee6aecdb9
 AUX firebird-2.1.2.18118.0-gcc-icu-declare.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
 AUX firebird-2.5.0.26074.0-client.patch 646 RMD160 de9d438c97aa2b4dc5c0a9ae061b37f87fd2abc5 SHA1 42b490a52ed4974f9e1906b96310e1e75866cb34 SHA256 444776a49e5155fb311c487b5e7f22ff3422858191d249a90f261fb6e9cdd0b5
@@ -27,5 +24,5 @@ DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 9996 RMD160 45e38ad5115b01a2f90b8a6b2a6871509830d960 SHA1 8dd4b923a93b92d1d61f248f41c3230f0a36adbc SHA256 dc135be695e8f5fff58899c39aa85237891965dc9c77c4281ac86bbbddf28d6c
 EBUILD firebird-2.1.3.18185.0.ebuild 10266 RMD160 a816e0cf73e27aaecd74e1dd4a07f9b0a45252d8 SHA1 88fc465b2dab15bc8de1ddd10522b12c1ae05c7a SHA256 defcca6e5382a1646136a5b7b42d147f365f4a60d0f7e25e7808e21f2b6d7141
 EBUILD firebird-2.5.0.26074.0.ebuild 8550 RMD160 6d66d90f790154eac14f7fd2016a3324fcf5f2f1 SHA1 e33d41e8689ebe5cb18993093ad2c38257442d96 SHA256 3027f080cf0e00a407b67cfe746874e2691628c8ac867cd57fda57d315b41d1c
-MISC ChangeLog 23244 RMD160 eb312281bf14ec3b0f5d5dd2250f78cdcb08a5b6 SHA1 a5126490697bdbed2ffdf8df588a75ec4bc4f129 SHA256 9631afc91b0117b3b34b2bd19fdd0d8187749f276e0e409856a0a7123366b4ed
+MISC ChangeLog 23484 RMD160 81d50c96e266da9e9edda588d5cd32b0eb97e070 SHA1 83d55a20eae814d17d436a850cd7e445b35a530b SHA256 528b726c036e1f8bf63f76e9da4eaec8fcd1f513316cc7691c7bfed40087f81c
 MISC metadata.xml 813 RMD160 8b53b8cd6708adba4d58d1f3f74995c27ba75c54 SHA1 e8bb87ce727a001c7fa55979d0ed18275e8a6058 SHA256 465ceb3f7c3932611ec0a9ceda264b32a9f5aa3c96ca581273d266898c82ec58
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);