Fix for character sets like ISO8859_1 and others. Thanks to Gianni Rossi <nasus.maximos@gmail.com>. Also removed log file creation and etc from pkg_config. It's in src_install now.

Package-Manager: portage-2.1.2.9

4 files changed, 23 insertions, 29 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 8e33ebf434d2..ec652ea5d0e2 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,14 @@
 # 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.61 2007/05/16 17:04:39 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.62 2007/06/14 04:33:53 wltjr Exp $
+
+*firebird-2.0.1.12855.0-r4 (14 Jun 2007)
+
+  14 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -firebird-2.0.1.12855.0-r3.ebuild, +firebird-2.0.1.12855.0-r4.ebuild:
+  Fix for character sets like ISO8859_1 and others. Thanks to Gianni Rossi
+  <nasus.maximos@gmail.com>. Also removed log file creation and etc from
+  pkg_config. It's in src_install now.
 
 *firebird-1.5.4-r3 (16 May 2007)
 
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 75b86f4dd869..c0eefcb6f26a 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -39,14 +39,14 @@ EBUILD firebird-1.5.4-r3.ebuild 7908 RMD160 785d29947542328068fb7a8684e0a74fef56
 MD5 322fc7de726c45e369af19f9ea673cd9 firebird-1.5.4-r3.ebuild 7908
 RMD160 785d29947542328068fb7a8684e0a74fef56524d firebird-1.5.4-r3.ebuild 7908
 SHA256 19bf590d728781ebc812dc2ff3bbdb0fe3766d9e31518fb889b4df9e7793d029 firebird-1.5.4-r3.ebuild 7908
-EBUILD firebird-2.0.1.12855.0-r3.ebuild 7202 RMD160 5afcb2b66c6584dd04898ac6bad9e3918522b810 SHA1 54d76362c3fb43464de877eb71af568c9b8f595f SHA256 31e1dcaacaadfa876858889b40b936dfa90633d1b31014415cb0392ed12db3c3
-MD5 75a4e132b763c56cb4384b43ab4cb5b5 firebird-2.0.1.12855.0-r3.ebuild 7202
-RMD160 5afcb2b66c6584dd04898ac6bad9e3918522b810 firebird-2.0.1.12855.0-r3.ebuild 7202
-SHA256 31e1dcaacaadfa876858889b40b936dfa90633d1b31014415cb0392ed12db3c3 firebird-2.0.1.12855.0-r3.ebuild 7202
-MISC ChangeLog 10274 RMD160 2b453a5d11173ca17b2a35590a5193a098c1ba0e SHA1 e7504e3a60f2f51e933835c376cb1a8389573de8 SHA256 68e051b2881ddf3a5bc4a58b82c55aa102149c39401982077dc34a04b9a33695
-MD5 47377abc18479696a0255cb80a70ec61 ChangeLog 10274
-RMD160 2b453a5d11173ca17b2a35590a5193a098c1ba0e ChangeLog 10274
-SHA256 68e051b2881ddf3a5bc4a58b82c55aa102149c39401982077dc34a04b9a33695 ChangeLog 10274
+EBUILD firebird-2.0.1.12855.0-r4.ebuild 6980 RMD160 3de7c8f8704b776c305ced26afb9b9b32e036396 SHA1 4165c01ad7bb53f10699b0262578caf0f57e23c5 SHA256 55dc4b12ca4fe368dbc43cd157c8c02cb59dd7723bf1e0da7f25d3c3ebd8810c
+MD5 5106b80ecc38b4ff2fef87c5d49a8400 firebird-2.0.1.12855.0-r4.ebuild 6980
+RMD160 3de7c8f8704b776c305ced26afb9b9b32e036396 firebird-2.0.1.12855.0-r4.ebuild 6980
+SHA256 55dc4b12ca4fe368dbc43cd157c8c02cb59dd7723bf1e0da7f25d3c3ebd8810c firebird-2.0.1.12855.0-r4.ebuild 6980
+MISC ChangeLog 10633 RMD160 eb895503d027faf7ef387f3c653b594738adb804 SHA1 bcd555f18c2f16d19f91ddc59dc19ddac82bd334 SHA256 e3f4da42c2a4bddae0b8eab32b901a1ca943a8a16e2bd5e868b95e381e0ca3bb
+MD5 ddad207943a6da0d8a3ff5ce757e25a2 ChangeLog 10633
+RMD160 eb895503d027faf7ef387f3c653b594738adb804 ChangeLog 10633
+SHA256 e3f4da42c2a4bddae0b8eab32b901a1ca943a8a16e2bd5e868b95e381e0ca3bb ChangeLog 10633
 MISC metadata.xml 676 RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 SHA1 c4a3ff2cb0dca7f10616bcb6380478fc9b030cf5 SHA256 8b013a783e48791968505c98397ff8777960cdd69f7818b3cff689fa1b2373a8
 MD5 d6677dccf2b721741683d19348632bd6 metadata.xml 676
 RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 metadata.xml 676
@@ -57,6 +57,6 @@ SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/di
 MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r3 1048
 RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r3 1048
 SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r3 1048
-MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r3 506
-RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r3 506
-SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r3 506
+MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r4 506
+RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r4 506
+SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r4 506
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r3 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
index 04a90efef089..04a90efef089 100644
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r3
+++ b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r3.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild
index b7ff285f6645..1e8d72233a34 100644
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r3.ebuild
+++ b/dev-db/firebird/firebird-2.0.1.12855.0-r4.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/firebird/firebird-2.0.1.12855.0-r3.ebuild,v 1.1 2007/05/14 14:28:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild,v 1.1 2007/06/14 04:33:53 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -101,6 +101,7 @@ src_install() {
 	doexe UDF/*.so
 	exeinto /opt/firebird/intl
 	doexe intl/*.so
+	newexe intl/libfbintl.so fbintl
 
 	diropts -m 755 -o firebird -g firebird
 	dodir /var/log/firebird
@@ -115,6 +116,7 @@ src_install() {
 	dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
 	dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
 	dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
+	dosym /etc/firebird/fbintl.conf /opt/firebird/intl/fbintl.conf
 	dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
 
 	local my_lib=$(get_libdir)
@@ -191,22 +193,6 @@ pkg_config() {
 		chmod ug=rw,o= $FileName
 	done
 
-	# Create log
-	if [ ! -h firebird.log ]
-	then
-		if [ -f firebird.log ]
-		then
-			mv firebird.log /var/log
-		else
-			touch /var/log/firebird.log
-			chown firebird:firebird /var/log/firebird.log
-			chmod ug=rw,o= /var/log/firebird.log
-		fi
-
-		# symlink the log to /var/log
-		ln -s /var/log/firebird.log firebird.log
-	fi
-
 	# if found /etc/security.gdb from previous install, backup, and restore as
 	# /etc/security2.fdb
 	if [ -f /etc/firebird/security.gdb ]