Fix security bug 532124

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

11 files changed, 36 insertions, 193 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 8272e14942ca..8a71c40dd7ca 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.116 2014/09/07 13:09:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.117 2014/12/11 11:51:32 pacho Exp $
+
+*firebird-2.5.3.26780.0 (11 Dec 2014)
+
+  11 Dec 2014; Pacho Ramos <pacho@gentoo.org> +firebird-2.5.3.26780.0.ebuild,
+  -files/70firebird, -files/firebird-2.5.0.26074.0-Makefile.in.static.createdb,
+  -files/firebird-update-valgrind.patch, -files/firebird.conf.d,
+  -files/firebird.conf.d.2, -files/firebird.init.d, -files/firebird.xinetd.2,
+  -files/xinetd.2, -firebird-2.5.2.26540.0.ebuild:
+  Fix security bug 532124
 
   07 Sep 2014; Pacho Ramos <pacho@gentoo.org>
   -files/firebird-2.0.3.12981.0-CVE-2008-0387.patch,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 4545e2113ca8..f522d6e6ff81 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 70firebird 50 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 SHA512 0c2f7929331e786bd8f63c23d77e2e39c2217b3c36596661b9976016f7eb72ada465e312cc6ec6326615dcd3f684eb4ba5a1fb408528958351fa8ebdcb97a4bf WHIRLPOOL 560f8edb6681fbfcf0ac43ba49b2481eb4fdecaeef6c4607518ae97c25728c92dc910b173ccbafc1248e5e128bd6aaa184791ce747373771ffd82f315de44575
-AUX firebird-2.5.0.26074.0-Makefile.in.static.createdb 2034 SHA256 9bfd82823c46be6e213cd8bbad97e05c933640b6023b957fdf5d813b7cd5dd14 SHA512 c4b8b03a9aeb0c640dc42522adb7d5dbbdac0f0d692f1f440577f54adf6633ed0f9190b24c40557484e683cc5a4322757b805d01717119685244ff6f6938dec6 WHIRLPOOL d9d8111c0d459bb0ba7404054cf519a1330314779f51b806d68fb31e46cc5a22a755b4972cf0a6aa4fb4ab9b6ac58fb452974ba1f58b44ec9460db4210027f3f
 AUX firebird-2.5.1.26351.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2
 AUX firebird-2.5.1.26351.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204
 AUX firebird-2.5.1.26351.0-superclassic.patch 713 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb WHIRLPOOL eef1837adac86b7bc21f8e240b753398a787e4e108243004ca34b6015c842e7ca91ce584ffa4e85e1f2e908b5b2d5a3af5fa04125c110b13ffe43b5dca63c5d6
-AUX firebird-update-valgrind.patch 507 SHA256 cc1f64d8263ed6ff32f441e4cc5a80654e59b8768ef218ec09cbda079e3a2a0f SHA512 2c2514cce1052470b7a83241481d69e68ccbdf21e93f9d34a745593d351cb7723875a66520690aea8443ad99dddbd524fca0e7a4b22ed71a28b537f719f35a56 WHIRLPOOL 66a5d3e27022be48c1e41b26a5da611cb5480ec31553f94e5e79268014e1232b5784712e063417360918c65fa58ac1191b73e531f8754110902ffb97bcf18813
-AUX firebird.conf.d 73 SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c SHA512 e5fa93d2e1cebef37c297ccdeb81b9d4d7b5dff66871d5f09b74b014933a5ac4077721f55a431d413f05ffb2fb83f9f0e38458a5a53b99558678314f55c7efb1 WHIRLPOOL d62ee8b1cb5c88b3cbf2e2972ab83e036e6a80ccc620db8bd87e43273c72c1d97accc7768475376610b932d4e1a83e13cff3819f4289953a7f725417330fac30
-AUX firebird.conf.d.2 105 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61 SHA512 c77bf56a9e954788d420497e33f19e3e1a80d71d75ead58c6a106bca08b15a5c708fb76e7a045b143103a03f056fce6095a1f3497ceb9ec2ce655a274c90d018 WHIRLPOOL d41fc7bc899ee02ae3222315ef1a2c44360c1e9000cdff46585cbc51012d4bab9e3191e7a68c73609cf52b03eda80d31a982ea76e1e0a9c69a48d85e757824bc
 AUX firebird.conf.d.2.5 270 SHA256 c95575949a2509f61dfdad0b311319c15bc4fcf98397dbf86849a208e8e49cea SHA512 ac1410f45accae1beb845eb895592524be22fd0afb457aac4146dc6dc0a79c74c7e62eb814477797a10661a57bb731ade02a2a3b3fd8f5c5ef0c3b80e809bb64 WHIRLPOOL 3a842eb9ea3ab4c97e01eb24fc04f3f46ec4f60ceeda7b6e23d27b59cfde092ae5795790c3687aa41940837b215a358943c39e616804a3529e8f48014a560920
-AUX firebird.init.d 762 SHA256 f53b06db7066431ce1d8a7480b52db5fb6916c0fa2ab02971c06ea87205575b6 SHA512 a0db382db9ceb02da3e70a82772daee22888de747197af399206e4f7d3b1bbaaeda67229235b9188c80c31b53dea51c31a4ab835d0df561f15bab8338286a301 WHIRLPOOL ffe14c64a217505942d752d25efa3d09bf7dae901714621c3e8db4a58239e75adab85a2b0f0c18f460c2f2fca6f1f06f76f81c55efde4fce22365cfbb86866f8
 AUX firebird.init.d.2.5 634 SHA256 6f542ea7a8067a101b1baae0d8b1b61d3bff65966a822e8c746838abb0890f6e SHA512 fc89029480bda6240befc4957e308656d0b13a8d840e30ce6d63953da40426b942896869ad3932ef72b9da568c95f6cebddba97f8d7d367ce8100257a1ee899d WHIRLPOOL 1afa1ae113d960557c1909cab1aa2ca18bba3860aea95bda752f3d9deef7f7bc3d5f639937886ef62c028bdb03f879d6221b97eab06803c3198c16c0372fdb90
 AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da SHA512 f99edc010272af28f18e2b89e420aabc204feda918a1181e477edb56612b6af97ca6bab2e39989db401eb8296e3233a64853f824af437329e117f09aa9868823 WHIRLPOOL 0bbfe1cd410c42b137f11d3fb3b8c976c3fc89990650275dab135c66dcd78b35b6d4f73a2a767a56338a519393a33be6f64887f293528878ebe139896e3da49d
 AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
-AUX firebird.xinetd.2 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
-AUX xinetd.2 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
-DIST Firebird-2.5.2.26540-0.tar.bz2 13805637 SHA256 bbb9a408198898818d5be3c301dde0f8524fd8e2f509662121d7393e02520721 SHA512 a057f78825bcfe992f9e079704621a1c659588a906e200ed56e269d0a3d78f968553146f21bde1b680795c760b896af1ec689f33dd293dbbc2242ba77b491b3c WHIRLPOOL eb14e30caff8ce1f8fee3651311ce1976ca5041d6c0d739eb916c33d6dc2d810cc10be66dfddf869b0a1dce3171c14ff2db393b5d4b0c0bdf8523d7e73c19606
+DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
-EBUILD firebird-2.5.2.26540.0.ebuild 8947 SHA256 0c5f0a35930bf46d48fc6da7d3a2e8611c6842f35e4e9a40013f6a94eedffb74 SHA512 c445ff5242380aca7d521a1c099a02cbe29b8867b8a028fac92cacd367905948e40b04078040d9bf706bc76bc03728248888d714ca98088e63e811f6afcd09d0 WHIRLPOOL fa8d77c36465bad04eae253fdac75ed7e7148dfce6e3135c1a66fe9175f768d5934ad90dfd03079323c5746b251ef7098239f81afe5e7068c2b606e8f811d92e
-MISC ChangeLog 26714 SHA256 9023f297998fa1747fac53c227b282ccbfa5a429adda3d5548a2b591057ad277 SHA512 5eb2ba6b0fb34452467641a1f53da72bdd0f18002073cf2b482c4cdae1763d2497de232f38a1752f7ab7cf45d7e8852b186445c0a6aba89f230565d55d8d7de6 WHIRLPOOL 3807b6b6f47da1f630d8f878c282aa536c26a89721d2c594e5dec886e352e3dc6e092442668c4a0458e944c773e23bf790b6e1fba3933d4dd2886a1a6996df8a
+EBUILD firebird-2.5.3.26780.0.ebuild 8380 SHA256 4dbbd68dc4482dda58d647899353cd284267c58b0caea47c3d5ec589ed47f7ce SHA512 f68902ef814cc4a24b8f6cd4e1a5eb00f989ded1799937542787ed39874b69f3009c2c5f7ab32e508a08ab05459bd2d891303a1e384ee091c2dae41d21f5de8b WHIRLPOOL 7e8f8e3ea9745723922fbad9dc4dcd861335459591cfff074777568c2fd4e1963ddd56aff56a03f30015794ed710ebb683f38f3005a4204caa3078afcca52ae9
+MISC ChangeLog 27132 SHA256 ab03666ece04d969e57210484cf2d7a237ca09e5401ba5bc66ac69518015060e SHA512 eb06d7307c9fa4cb7f82f0c4f5077e8347778bc89a7ace6cebc2d8acf853f316fb0aaa13e8be18151095a8501d061c127e59fc22e0a19efddb395a4de252ea1e WHIRLPOOL 7fce1d89f73faf6b72e48b70c172cd352e6be3699f363b97c3dd226b06bfd74f784c4f3e3f38c936d56ca42016c996035591813634222b5e16174cf005c1a2b9
 MISC metadata.xml 787 SHA256 6f5285eb2893a24ee779d1b1cf1840d0e34e38d152e65fdcb0244bfa5e6eceaa SHA512 2924fa1236aa39e737fce9d3c937bc8fc78ceaec165f45799bb07851c702a8f7be794907b2b7601abf3cd1a52db841c92403c03ba69626348f6c3bee7cc47a66 WHIRLPOOL 8d7dd3e4c7e4944458bdd5c7dd874d674ba12cb3dc868d0e451c29d1621a311a65519fae725f907060a88ecf792ccef44ec49df10d76d664a490e28cf78edaf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQMWPgACgkQCaWpQKGI+9Qt6gCdHQL9BaTzGO3IVXZJxEhwpUaU
-QMcAn2lES9Smj7wyTKNUju9PK/cQpnnq
-=f7Ja
+iEYEAREIAAYFAlSJhUUACgkQCaWpQKGI+9SP8gCfcHZMkKKYFDuOlwLuGy8UeAi2
+ypIAn3cSofl53qNsVv9EyoXsZF6G6vd2
+=WbgV
 -----END PGP SIGNATURE-----
diff --git a/dev-db/firebird/files/70firebird b/dev-db/firebird/files/70firebird
deleted file mode 100644
index eebf96b9f0b1..000000000000
--- a/dev-db/firebird/files/70firebird
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH=/opt/firebird/bin
-ROOTPATH=/opt/firebird/bin
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb b/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb
deleted file mode 100644
index bd5889b488b0..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb
+++ /dev/null
@@ -1,66 +0,0 @@
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# You may obtain a copy of the Licence at
-# http://www.gnu.org/licences/lgpl.html
-# 
-# As a special exception this file can also be included in modules
-# with other source code as long as that source code has been 
-# released under an Open Source Initiative certificed licence.  
-# More information about OSI certification can be found at: 
-# http://www.opensource.org 
-# 
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public Licence for more details.
-# 
-# This module was created by members of the firebird development 
-# team.  All individual contributions remain the Copyright (C) of 
-# those individuals and all rights are reserved.  Contributors to 
-# this file are either listed below or can be obtained from a CVS 
-# history command.
-#
-#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
-#
-#  Contributor(s):
-# 
-#
-#
-ROOT=..
-ObjModuleType=boot
-CXXFLAGS+= -DBOOT_BUILD
-
-include     $(ROOT)/gen/make.defaults
-include     $(ROOT)/gen/make.platform
-include     $(ROOT)/gen/make.rules
-include     $(ROOT)/gen/make.shared.variables
-
-
-@SET_MAKE@
-
-
-CREATEDB_Files= create_db.cpp
-CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
-CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
-
-
-AllObjects = $(CREATEDB_Object) $(CLUMPLETS_Objects)
-
-Dependencies = $(AllObjects:.o=.d) 
-
-
-.PHONY: all create_db
-
-all: create_db
-
-create_db: $(CREATE_DB)
-
-$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
-	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
-
-
-include $(ROOT)/gen/make.shared.targets
-
--include $(Dependencies)
diff --git a/dev-db/firebird/files/firebird-update-valgrind.patch b/dev-db/firebird/files/firebird-update-valgrind.patch
deleted file mode 100644
index 7f8eab1b802f..000000000000
--- a/dev-db/firebird/files/firebird-update-valgrind.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src.old/common/classes/alloc.cpp 2009-08-20 09:41:15.000000000 -0700
-+++ src/common/classes/alloc.cpp   2009-08-19 21:47:10.000000000 -0700
-@@ -42,7 +42,11 @@
-
- #ifdef USE_VALGRIND
- #include <valgrind/memcheck.h>
--#endif
-+#ifndef VALGRIND_MAKE_WRITABLE // VALGRIND 3.3
-+#define VALGRIND_MAKE_WRITABLE VALGRIND_MAKE_MEM_UNDEFINED
-+#define VALGRIND_MAKE_NOACCESS VALGRIND_MAKE_MEM_NOACCESS
-+#endif  // VALGRIND 3.3
-+#endif  // USE_VALGRIND
-
- // Fill blocks with patterns
- #define FREE_PATTERN 0xDEADBEEF
-
diff --git a/dev-db/firebird/files/firebird.conf.d b/dev-db/firebird/files/firebird.conf.d
deleted file mode 100644
index 8bfc2c52c840..000000000000
--- a/dev-db/firebird/files/firebird.conf.d
+++ /dev/null
@@ -1,3 +0,0 @@
-FBRunUser=firebird
-FIREBIRD=/usr/lib/firebird
-MANAGER=/usr/bin/fbmgr.bin
diff --git a/dev-db/firebird/files/firebird.conf.d.2 b/dev-db/firebird/files/firebird.conf.d.2
deleted file mode 100644
index 64b454410516..000000000000
--- a/dev-db/firebird/files/firebird.conf.d.2
+++ /dev/null
@@ -1,4 +0,0 @@
-FIREBIRD=/usr/share/firebird
-FBRunUser=firebird
-MANAGER=/usr/bin/fbmgr.bin
-LD_LIBRARY_PATH=$FIREBIRD/lib
diff --git a/dev-db/firebird/files/firebird.init.d b/dev-db/firebird/files/firebird.init.d
deleted file mode 100644
index 6094d9bc0198..000000000000
--- a/dev-db/firebird/files/firebird.init.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.5 2013/01/24 04:52:12 pinkbyte Exp $
-
-pidfile=/var/run/firebird/firebird.pid
-FB_OPTS="-pidfile $pidfile -start -forever"
-
-export FIREBIRD LD_LIBRARY_PATH
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -o $FBRunUser "$(dirname $pidfile)"
-}
-
-start(){
-	ebegin "Starting Firebird server"
-	start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $MANAGER -- $FB_OPTS
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping Firebird server"
-	start-stop-daemon --stop --pidfile $pidfile --oknodo
-	eend $?
-}
-
-restart(){
-	svc_stop
-	sleep 1
-	svc_start
-}
-
diff --git a/dev-db/firebird/files/firebird.xinetd.2 b/dev-db/firebird/files/firebird.xinetd.2
deleted file mode 100644
index 01fc102ee3a8..000000000000
--- a/dev-db/firebird/files/firebird.xinetd.2
+++ /dev/null
@@ -1,11 +0,0 @@
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /usr/bin/fb_inet_server
-	disable			= yes
-}
diff --git a/dev-db/firebird/files/xinetd.2 b/dev-db/firebird/files/xinetd.2
deleted file mode 100644
index 01fc102ee3a8..000000000000
--- a/dev-db/firebird/files/xinetd.2
+++ /dev/null
@@ -1,11 +0,0 @@
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /usr/bin/fb_inet_server
-	disable			= yes
-}
diff --git a/dev-db/firebird/firebird-2.5.2.26540.0.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
index 3c8c224f7112..b55200611847 100644
--- a/dev-db/firebird/firebird-2.5.2.26540.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.2.26540.0.ebuild,v 1.1 2014/05/30 12:58:22 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0.ebuild,v 1.1 2014/12/11 11:51:32 pacho Exp $
 
-EAPI=4
-
-inherit flag-o-matic eutils autotools multilib user versionator
+EAPI=5
+inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
 #MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
@@ -17,32 +16,31 @@ SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 -ia64 ~x86"
+
 IUSE="doc client superserver xinetd examples debug"
+REQUIRED_USE="
+	client? ( !superserver )
+	client? ( !xinetd )
+	superserver? ( !xinetd )
+"
+
 RESTRICT="userpriv"
 
-RDEPEND="dev-libs/libedit
-	dev-libs/icu"
+RDEPEND="
+	dev-libs/libedit
+	dev-libs/icu:=
+"
 DEPEND="${RDEPEND}
 	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )"
+	doc? ( app-arch/unzip )
+"
 RDEPEND="${RDEPEND}
 	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia"
+	!sys-cluster/ganglia
+"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_pretend() {
-	if use client && use superserver ; then
-		die "Use flags client and superserver cannot be used together"
-	fi
-	if use client && use xinetd ; then
-		die "Use flags client and xinetd cannot be used together"
-	fi
-	if use superserver && use xinetd ; then
-		die "Use flags superserver and xinetd cannot be used together"
-	fi
-}
-
 pkg_setup() {
 	enewgroup firebird 450
 	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
@@ -97,7 +95,8 @@ src_configure() {
 	filter-flags -fprefetch-loop-arrays
 	filter-mfpmath sse
 
-	econf --prefix=/usr/$(get_libdir)/firebird \
+	econf \
+		--prefix=/usr/$(get_libdir)/firebird \
 		$(use_enable superserver superserver) \
 		$(use_enable debug) \
 		--with-editline \
@@ -233,14 +232,6 @@ pkg_postinst() {
 	# Hack to fix ownership/perms
 	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
 	chmod 750 "${ROOT}/etc/${PN}"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
 }
 
 pkg_config() {