Updated patch to remove default hard coded cflags, accidentally removed that patch during a revision.

Package-Manager: portage-2.1.4_rc14

5 files changed, 51 insertions, 24 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index c2b6ec2c86d6..7cc315b9c383 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/firebird
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.83 2007/12/04 23:59:54 wltjr Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.84 2008/01/04 17:34:39 wltjr Exp $
+
+*firebird-2.1.0.16780_beta2-r3 (04 Jan 2008)
+
+  04 Jan 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch,
+  -firebird-2.1.0.16780_beta2-r2.ebuild,
+  +firebird-2.1.0.16780_beta2-r3.ebuild:
+  Updated patch to remove default hard coded cflags, accidentally removed that
+  patch during a revision.
 
 *firebird-2.1.0.16780_beta2-r2 (04 Dec 2007)
 *firebird-2.0.3.12981.0-r4 (04 Dec 2007)
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index b844740d3963..e18a7d711f05 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -18,10 +18,10 @@ AUX firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba1
 MD5 ecf89f096f817130287b8f42967d0b6e files/firebird-2.0.3.12981.0-paths.patch 12954
 RMD160 acac734477715e2bcf5833b7fba11be2d07455dd files/firebird-2.0.3.12981.0-paths.patch 12954
 SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7 files/firebird-2.0.3.12981.0-paths.patch 12954
-AUX firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 RMD160 603b6557b472865c1d0a9836e959c82506c9033d SHA1 5bae5306fc658243553e0265b329b9a938fe90d5 SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240
-MD5 7d3925cca75dfb73653e50819c261ca4 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880
-RMD160 603b6557b472865c1d0a9836e959c82506c9033d files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880
-SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880
+AUX firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
+MD5 e14577e8c468e4e6fcedbed209f72377 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002
+RMD160 fdb35777355c4f438669d53263d431699f6fccf5 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002
+SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002
 AUX firebird.conf.d 84 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 SHA1 dd16a06bfb864c31d53220bdb5f0e3c3687e292c SHA256 e2d60371eb14ebfc20eaa1fc19610499ab495f9bdaffbb3075454ffc6a324d70
 MD5 13a568c7c840d1bfc98661ef6b217740 files/firebird.conf.d 84
 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 files/firebird.conf.d 84
@@ -49,14 +49,14 @@ EBUILD firebird-2.0.3.12981.0-r4.ebuild 9805 RMD160 2f1116509e8715f301fde6920e1f
 MD5 414ecbacc857e1978a7ff5a9fd03fd3b firebird-2.0.3.12981.0-r4.ebuild 9805
 RMD160 2f1116509e8715f301fde6920e1f91cddb9fdc44 firebird-2.0.3.12981.0-r4.ebuild 9805
 SHA256 13d21129e438585ba2e1a16c5aed5b0d18cc4efb856c244bbeb2e3c9a86e008b firebird-2.0.3.12981.0-r4.ebuild 9805
-EBUILD firebird-2.1.0.16780_beta2-r2.ebuild 10102 RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec SHA1 3f919900a1ef94431b952b0c4e938c83b1cb8e03 SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3
-MD5 4b48ddc94ddc1b68965cf0a8c76e4814 firebird-2.1.0.16780_beta2-r2.ebuild 10102
-RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec firebird-2.1.0.16780_beta2-r2.ebuild 10102
-SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3 firebird-2.1.0.16780_beta2-r2.ebuild 10102
-MISC ChangeLog 16593 RMD160 3092db256c82cb97df568e72090f1321a5de320b SHA1 0ed2ab41af6788f80901d37b2ec4f046dc7ea421 SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a
-MD5 5102c5c7cde1a55f4ce090a53775e74b ChangeLog 16593
-RMD160 3092db256c82cb97df568e72090f1321a5de320b ChangeLog 16593
-SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a ChangeLog 16593
+EBUILD firebird-2.1.0.16780_beta2-r3.ebuild 10102 RMD160 ac496a515f895c7995da0fffa47f017b0b4d844f SHA1 2578010a96b415f94d4c564d42a8eb4471afd47c SHA256 bfb3d369ef7a359475452e8dd5b7c731ba824d583115d46f74e4d53248ef352a
+MD5 06593440ff9455080895e3474978cb82 firebird-2.1.0.16780_beta2-r3.ebuild 10102
+RMD160 ac496a515f895c7995da0fffa47f017b0b4d844f firebird-2.1.0.16780_beta2-r3.ebuild 10102
+SHA256 bfb3d369ef7a359475452e8dd5b7c731ba824d583115d46f74e4d53248ef352a firebird-2.1.0.16780_beta2-r3.ebuild 10102
+MISC ChangeLog 16943 RMD160 e0b949e7c97e598bf79081510965c91492036723 SHA1 a9facdef6f7114c9fbe1fca8277c41eeb9a76439 SHA256 9c22791914c80020706ecf8f4ee3e8ba2496f5fdeaca258b0818832341bdec44
+MD5 a6ff319fecde350bb8cf0d902a31899f ChangeLog 16943
+RMD160 e0b949e7c97e598bf79081510965c91492036723 ChangeLog 16943
+SHA256 9c22791914c80020706ecf8f4ee3e8ba2496f5fdeaca258b0818832341bdec44 ChangeLog 16943
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
@@ -67,6 +67,6 @@ SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/di
 MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r4 506
 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r4 506
 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r4 506
-MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r2 518
-RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r2 518
-SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r2 518
+MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r3 518
+RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r3 518
+SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r3 518
diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3
index f63a1165d43f..f63a1165d43f 100644
--- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3
diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch
index 661b95acaeba..8bcd3ca0dfd4 100644
--- a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch
@@ -1,5 +1,5 @@
 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-11-14 13:22:07.000000000 -0500
+--- 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 @@
  # 
@@ -17,7 +17,8 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Fir
  
  btyacc_binary: $(BTYACC)
  
---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults	2007-11-14 13:22:07.000000000 -0500
+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
@@ -33,7 +34,7 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Fir
  
  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 13:22:07.000000000 -0500
+--- 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 @@
  
@@ -70,7 +71,7 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.
  
  
 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-11-14 13:22:07.000000000 -0500
+--- 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 @@
  
@@ -81,8 +82,25 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Fire
  	$(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-11-14 13:22:15.000000000 -0500
+--- 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
diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild
index 7b413658a372..ae8e061f77c6 100644
--- a/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild
+++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild,v 1.1 2007/12/04 23:59:54 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild,v 1.1 2008/01/04 17:34:39 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator