[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2023-05-09 Thread Arthur Zamarin 
commit: 5be434a994db20abdeb5b819ba818a9adcbbd2a6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  9 13:27:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  9 13:27:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be434a9

dev-db/firebird: Keyword 3.0.10.33601.0-r1 arm64, #905891

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild 
b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
index 61f61df905da..cf1793d314a8 100644
--- a/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc examples +server xinetd"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/, dev-db/firebird/files/

2022-12-02 Thread Sam James 
commit: cbddf475ce279474be6138873223f0e751af6183
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 07:16:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 07:47:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbddf475

dev-db/firebird: incorporate suggestions to 3.0.10

Includes Thomas J. Moore's suggestions & patches.

Bug: https://bugs.gentoo.org/757282
Closes: https://bugs.gentoo.org/648956
Closes: https://bugs.gentoo.org/726856
Thanks-to: Thomas J. Moore  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/Manifest   | 15 ++
 .../files/firebird-3.0.10.33601.0-flags.patch  | 25 +
 0.ebuild => firebird-3.0.10.33601.0-r1.ebuild} | 63 --
 3 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index f1ba268e1bd6..db16ce7c41f4 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,18 @@
 DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 
1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122
 SHA512 
0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
+DIST firebird-3-quickstartguide.pdf 392796 BLAKE2B 
ef867664d107a9ee6dba3d724a5696fafe07a84305f1827dbeb5acf33d54aada45fad4e37971419fc7c26dba9b99577844a33c6e566485059329a8717fa79c1d
 SHA512 
480ed2e79f83741c5b0b268f07e1ac1e317fbd9572a6e646411dc7fb94e5f44187e90d50b6ce761fc5e562e5ad2abafe89b2766e651eb7a36dbcb9ed49c3289f
+DIST firebird-30-developers-guide.pdf 1747057 BLAKE2B 
9bde38dd5e997fec7fe69ada2ab1d74b0d59c440dd7a67d49e87a9464d7955f3766dde63aa60caf3e320759c934ec9f4088deed06cfae1b98e4d7ae6de364f02
 SHA512 
6a2a5ba1334e4a45839a950dd7b9c0a136b71a7626212b8aad5d173e8afd9a89c20ae51bdc5d309ebc206e0ac5af79138c28a10c64585d6f51c497e784445760
+DIST firebird-30-language-reference.pdf 3130464 BLAKE2B 
975550c77e1b9cfcd53eef023781f1a1bc2282b7ba7bcedd57027399cbd44ad06c35d3f58bdcb2bdb953abe8ab948149ea9c284bc37eb35770dd57369f6838cd
 SHA512 
9f17737733e2dd6e3a3f367c97c7053508621bc97b37b16ba36e6fe3554bf60363e3c06bf55ac6703d65e66039da7c16b71b70187c45b2206f6191c543cc1e95
+DIST firebird-fbmgr.pdf 151933 BLAKE2B 
b57394745a90732ee74f86d903690e0906be4bd5da5663ef28bd6959eb96f2d0f712cc06079a9730d9efa58e75258673b77b7b72db7897928632d315ffe1b5e1
 SHA512 
68b255d0de427df071400097f95205b8417c358e66a80c91d068b5e567f0a210c5494598cce871c83564cfbcd04b2f805cb53074a933ef963e94f1d1552ea2c9
+DIST firebird-gbak.pdf 196327 BLAKE2B 
c79e360a58c79c39e87b84b2653bd5fad1b1d45df8f02c8b6279277ea32b191533be52146ce8c03c3858ea86d23300c00d6eb31c30f0d6b466b5131aac4a7d54
 SHA512 
8a58adf94ea93bf51e55c7a0fd3adb7b6fc1f5fcaf71e29934f7bc192b5cac7dbd97113acf2ecda36df5470de5ee20f0100b65ab2b260a2194b846c52e0d816f
+DIST firebird-generator-guide.pdf 172298 BLAKE2B 
a923cc6aa5bab82b40d49b255d5ed2482e30f390ae76bffcd51294f9ee2000b827696bcb15b5bc5d9224a5650faf195daf89938c73ebce22d1e31411522c5800
 SHA512 
a043b84a1e7dff6b240b4786de7155fce266091d11f2a088e6864087e7d24c42cc70e44816d6abebf003feccf2676f9f8612b00db00366aead01f7e08c00
+DIST firebird-gfix.pdf 250034 BLAKE2B 
2073f5348d6bd5989ba2496aa59865bf107e08c7a8a4058866a53b482f5f8012d9f6877e7ceb5cbe42d1587d8d29f1fa6622f3e5842d241eeca8da1ae5afcb4b
 SHA512 
2f8de1fe4b45012c0d08e9e5d85d9ed1269629ac95c1ede5a9c8ae69aa69570ebfebe0f313ba54d6f00e785818f8801831c581be8b5ab427b189d3857a2b73fc
+DIST firebird-gsec.pdf 146403 BLAKE2B 
f20ddaee95c968df7b348ef5516ea53e3e6e866fdb2848951bd3ae5ed68e491360a24b6fbd71e2cf8fd03555284bf60bf0623db11d7b2569050fd022716eea55
 SHA512 
e930da593a9c0a8cdc0a669012c73b05e5844fe946807308bbe5e7a8ccd9a98261c7f4690fa7e07cfb39930359e30fdbfbe9c012565bf279a3471badf5eb46fa
+DIST firebird-gsplit.pdf 106100 BLAKE2B 
fd1e7edf7e6ea9556594395602739daa51253becf61db011548d763782ae57c5a2618ed79b91faf94264c1c0faff643f3941b6be0912c57e5d4b75d22ad5defa
 SHA512 
70dafc072a1265ee9db63902b58e52833ea2c7482a12030ac13c35e51e3b94dde746090a7a02060475bf85d5170348207816e3997102fd4e33820c695d7d3e57
+DIST firebird-gstat.pdf 162939 BLAKE2B 
c63825c52f85020c095b90e8482a6e5f38c752178b135331268b5c2800fcfe3a035ccc68c14b83219bff1cb864c9f405e851e64f44919854e7e8e7290f4ad94d
 SHA512 
c711122d9d020505f8475cda5b3621361a4d48cc39545a5e840430f43cb4dd7c97280a91085499547c95ce4cf9229b4ffec0f68c008fc04d7918b14fb7b8ec8a
+DIST firebird-isql.pdf 369327 BLAKE2B 
3ea02b7a7b97bf231d43906f2fc8feb79aba525f1cb642da834c68c436d81d2f4408bcfe287d4ace089d6f37d9b3c8dc002fa98121fe2819c27c7840482ca91c
 SHA512

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2022-12-02 Thread Sam James 
commit: 59693b49cfd41df01375b0e4bb8c588e654ff2f3
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 06:00:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 06:06:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59693b49

dev-db/firebird: add 3.0.10.33601.0

Closes: https://bugs.gentoo.org/757282
Closes: https://bugs.gentoo.org/828067
Closes: https://bugs.gentoo.org/881327
Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/Manifest   |  1 +
 ...ird-3.0.10.33601.0-configure-autoconf2.72.patch | 21 +
 ...firebird-3.0.10.33601.0-configure-clang16.patch | 48 +++
 .../files/firebird-3.0.10.33601.0-unbundle.patch   | 97 ++
 0-r3.ebuild => firebird-3.0.10.33601.0.ebuild} | 21 +++--
 5 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 51396b4f1a13..f1ba268e1bd6 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
+DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 
1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122
 SHA512 
0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git 
a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch 
b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
new file mode 100644
index ..29cca62fc790
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
@@ -0,0 +1,21 @@
+https://github.com/FirebirdSQL/firebird/commit/3fe8f6510de79689a26868e244840b24dcb19567
+
+From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
+From: AlexPeshkoff 
+Date: Wed, 23 Nov 2022 20:30:03 +0300
+Subject: [PATCH] Fixed #7394: autoconf 2.72 support
+
+--- a/configure.ac
 b/configure.ac
+@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
+   AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
+ [STD_EDITLINE=false
+  if test "$EDITLINE_FLG" = "Y"; then
+-   AC_MSG_WARN([[[--with-system-editline specified, not found. Using 
bundled editline]]])])))
++   AC_MSG_WARN([[[--with-system-editline specified, not found. Using 
bundled editline]]])
+fi
++   ])))
+ fi
+ XE_RESTORE_ENV()
+ 
+

diff --git 
a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch 
b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
new file mode 100644
index ..06d6907369ca
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
@@ -0,0 +1,48 @@
+https://github.com/FirebirdSQL/firebird/pull/7407
+
+From a39cde31c4c78866c8f8ee0285fc4bcb81496d81 Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Thu, 1 Dec 2022 18:26:06 +0100
+Subject: [PATCH] configure.ac: Add missing int return types to main
+
+Implicit ints are a language feature that was removed in C99 and
+future compilers may require declaration of all return types.
+--- a/configure.ac
 b/configure.ac
+@@ -1118,7 +1118,7 @@ AC_CHECK_FUNCS(sem_init)
+ if test "$ac_cv_func_sem_init" = "yes"; then
+ AC_MSG_CHECKING(for working sem_init())
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-  main () {
++  int main () {
+   sem_t s;
+   return sem_init(,0,0);
+   }
+@@ -1159,7 +1159,7 @@ AC_SYS_LARGEFILE
+ if test "$ac_cv_sys_file_offset_bits" = "no"; then
+   AC_MSG_CHECKING(for native large file support)
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-main () {
++int main () {
+ return !(sizeof(off_t) == 8);
+   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
+@@ -1206,7 +1206,7 @@ dnl EKU: try to determine the alignment of long and 
double
+ dnl  replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
+ AC_MSG_CHECKING(alignment of long)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-main () {
++int main () {
+   struct s {
+ char a;
+ union { long long x; sem_t y; } b;
+@@ -1217,7 +1217,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
+ AC_DEFINE_UNQUOTED(FB_ALIGNMENT,

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2022-10-05 Thread Sam James 
commit: 08012bba5588a7dc98eaf29d7e53269a6a52ab09
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  5 14:15:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  5 15:44:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08012bba

dev-db/firebird: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/metadata.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index b42ab3611d47..1183b4f3ae97 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,6 +1,9 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   off...@gentoo.org
+   

Firebird is a relational database offering many ANSI SQL standard 
features that runs on Linux, Windows, and a variety of Unix platforms.
@@ -14,8 +17,6 @@


firebird
+   FirebirdSQL/firebird

-   
-   off...@gentoo.org
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2022-06-02 Thread Sam James 
commit: 7dce4489ac962b89da6d80cd17abd971bee3fb92
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun  3 05:28:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 05:30:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dce4489

dev-db/firebird: Improve OpenRC script

The attached script updates a couple things which effectively is the same
as the current model however it follows the modular nature of the declarative
syntax.

Changes:
* Removes -p which is implied via pidfile=
* Sets user via command_user
* Moves the daemon options to command_args_background

Closes: https://bugs.gentoo.org/828073
Signed-off-by: Brian Evans  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/files/firebird.init.d.3.0-r1 |  22 +++
 dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild | 228 +++
 2 files changed, 250 insertions(+)

diff --git a/dev-db/firebird/files/firebird.init.d.3.0-r1 
b/dev-db/firebird/files/firebird.init.d.3.0-r1
new file mode 100644
index ..c49ea97f9203
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.3.0-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+name=${RC_SVCNAME}
+
+fbhomedir="/var/run/firebird"
+fblogdir="/var/log/firebird"
+pidfile="${fbhomedir}/firebird.pid"
+command="/usr/sbin/fbguard"
+command_args="-forever"
+command_args_background="-daemon -pidfile $pidfile"
+command_user="${FBUSER:-firebird}:${FBGROUP:-firebird}"
+
+depend() {
+   need net
+}
+
+start_pre() {
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fbhomedir} || return 1
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fblogdir} || return 1
+}

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
new file mode 100644
index ..3ee04900edfe
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN/f/F}-$(ver_rs 4 '-')
+inherit autotools flag-o-matic
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 
'_' $(ver_cut 1-3))/${MY_P}.tar.bz2
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +server xinetd"
+
+BDEPEND="
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+# FIXME: cloop?
+DEPEND="
+   dev-libs/icu:=
+   dev-libs/libedit
+   dev-libs/libtommath
+"
+RDEPEND="
+   ${DEPEND}
+   acct-group/firebird
+   acct-user/firebird
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+)
+
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
+check_sed() {
+   MSG="sed of $3, required $2 line(s) modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "manuals" || die
+   cd "manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w /dev/stdout' \
+   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
+
+   find . -name \*.sh -exec chmod +x {} + || die
+   rm -r extern/{btyacc,editline,icu} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -fprefetch-loop-arrays
+   filter-mfpmath sse
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2022-03-29 Thread Conrad Kostecki 
commit: cd2d2a5fcde8a09916201a936c7566eb097f5269
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Mar 29 19:34:50 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Mar 29 20:08:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2d2a5f

dev-db/firebird: migrate to glep-81

Bug: https://bugs.gentoo.org/781275
Closes: https://github.com/gentoo/gentoo/pull/24809
Signed-off-by: Conrad Kostecki  gentoo.org>

 0-r1.ebuild => firebird-3.0.4.33054.0-r2.ebuild} | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
similarity index 96%
rename from dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
rename to dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
index 02ac62b72c4c..171554c2aebe 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 MY_P=${PN/f/F}-$(ver_rs 4 '-')
-inherit autotools flag-o-matic user
+inherit autotools flag-o-matic
 
 DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
 HOMEPAGE="https://www.firebirdsql.org/;
 SRC_URI="
https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 
'_' $(ver_cut 1-3))/${MY_P}.tar.bz2
-   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
+"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
@@ -27,13 +29,14 @@ DEPEND="
dev-libs/libedit
dev-libs/libtommath
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+   ${DEPEND}
+   acct-group/firebird
+   acct-user/firebird
xinetd? ( virtual/inetd )
!sys-cluster/ganglia
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
"${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
@@ -50,11 +53,6 @@ pkg_pretend() {
fi
 }
 
-pkg_setup() {
-   enewgroup firebird 450
-   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
 check_sed() {
MSG="sed of $3, required $2 line(s) modified $1"
einfo "${MSG}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2021-11-11 Thread Sam James 
commit: 4aed90b3ded4cb4624856384297b2dec9748c8ae
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 12 05:03:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 05:05:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aed90b3

dev-db/firebird: fix logrotate file syntax

Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/files/firebird.logrotate| 2 +-
 .../{firebird-3.0.4.33054.0.ebuild => firebird-3.0.4.33054.0-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/files/firebird.logrotate 
b/dev-db/firebird/files/firebird.logrotate
index c87cd43f30f..a4542b47ea9 100644
--- a/dev-db/firebird/files/firebird.logrotate
+++ b/dev-db/firebird/files/firebird.logrotate
@@ -3,7 +3,7 @@
  weekly
  missingok
  rotate 52
- size=+1024k
+ size +1024k
  delaycompress
  notifempty
  create 644 firebird

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
similarity index 99%
rename from dev-db/firebird/firebird-3.0.4.33054.0.ebuild
rename to dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
index 899d3889c9e..02ac62b72c4 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2019-08-18 Thread David Seifert 
commit: 27fa1cefc0bc9c31a2cf75f441869bef94d33aa8
Author: David Seifert  gentoo  org>
AuthorDate: Sun Aug 18 12:21:25 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 18 12:36:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27fa1cef

dev-db/firebird: [QA] Fix trailing whitespace

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 dev-db/firebird/firebird-3.0.4.33054.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
index c7b0169cad0..899d3889c9e 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
@@ -123,7 +123,7 @@ src_configure() {
--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
--with-gnu-ld
)
-   econf "${myeconfargs[@]}"   
+   econf "${myeconfargs[@]}"
 }
 
 # from linux underground, merging into this here

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2019-08-16 Thread Andreas Sturmlechner 
commit: 2f1b7fab01208fea762ce9b179d2f55095c1381b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 07:40:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 08:24:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1b7fab

dev-db/firebird: Drop 3.0.2.32703.0-r2

Bug: https://bugs.gentoo.org/686150
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/firebird/Manifest   |   1 -
 .../files/firebird-3.0.2.32703.0-gcc6.patch|  19 --
 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild   | 235 -
 3 files changed, 255 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index ad827f3ecc0..51396b4f1a1 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,2 @@
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
deleted file mode 100644
index e1361415c03..000
--- a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3618aa2171674babf79ef935aa049c40a3db1321
-Author: asfernandes 
-Date:   Sat Mar 5 03:39:36 2016 +
-
-Make the generated code compatible with gcc 6 in C++-14 mode.
-
-diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
-index 2af96c6..2dcffd6 100644
 a/src/gpre/c_cxx.cpp
-+++ b/src/gpre/c_cxx.cpp
-@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
-   printa(0, "static %sshort\n   isc_%dl = %d;",
-  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
-  request->req_ident, request->req_length);
--  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
-+  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
- 
-   const TEXT* string_type = "blr";
-   if (gpreGlob.sw_raw)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
deleted file mode 100644
index 8ab5dd6952c..000
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
-HOMEPAGE="https://www.firebirdsql.org/;
-SRC_URI="
-   mirror://sourceforge/firebird/${MY_P}.tar.bz2
-   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples +server xinetd"
-
-# FIXME: cloop?
-CDEPEND="
-   dev-libs/libtommath
-   dev-libs/icu:=
-   dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-   >=dev-util/btyacc-3.0-r2
-   doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-   xinetd? ( virtual/inetd )
-   !sys-cluster/ganglia
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${P}"-unbundle.patch
-   "${FILESDIR}/${P}"-gcc6.patch
-   "${FILESDIR}/${P}"-cloop-compiler.patch
-)
-
-pkg_pretend() {
-   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
-   ewarn
-   ewarn "The presence of server connections may prevent isql or 
gsec"
-   ewarn "from establishing an embedded connection. Accordingly,"
-   ewarn "creating employee.fdb or security3.fdb could fail."
-   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   enewgroup firebird 450
-   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-   MSG="sed of $3, required $2 line(s) modified $1"
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2019-08-08 Thread Andreas Sturmlechner 
commit: 4d44504813bb967b88a83a61b31b42ecfd421758
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  8 14:13:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  8 16:51:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d445048

dev-db/firebird: 3.0.4.33054.0 version bump

Bug: https://bugs.gentoo.org/686150
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/firebird/Manifest  |   1 +
 dev-db/firebird/firebird-3.0.4.33054.0.ebuild | 230 ++
 2 files changed, 231 insertions(+)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index d2a44ea8aed..ad827f3ecc0 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
+DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
new file mode 100644
index 000..c7b0169cad0
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN/f/F}-$(ver_rs 4 '-')
+inherit autotools flag-o-matic user
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 
'_' $(ver_cut 1-3))/${MY_P}.tar.bz2
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +server xinetd"
+
+BDEPEND="
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+# FIXME: cloop?
+DEPEND="
+   dev-libs/icu:=
+   dev-libs/libedit
+   dev-libs/libtommath
+"
+RDEPEND="${DEPEND}
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+)
+
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   enewgroup firebird 450
+   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+   MSG="sed of $3, required $2 line(s) modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "manuals" || die
+   cd "manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w /dev/stdout' \
+   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
+
+   find . -name \*.sh -exec chmod +x {} + || die
+   rm -r extern/{btyacc,editline,icu} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -fprefetch-loop-arrays
+   filter-mfpmath sse
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2018-02-19 Thread David Seifert 
commit: 6da7054dd7262e18d233537790d6b00669e3efc2
Author: David Seifert  gentoo  org>
AuthorDate: Mon Feb 19 18:17:20 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Feb 19 19:40:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da7054d

dev-db/firebird: Always build in C++11 mode

Closes: https://bugs.gentoo.org/618774
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index f502dbb7b2c..8ab5dd6952c 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -101,7 +101,7 @@ src_configure() {
# otherwise this doesnt build with gcc-6
# http://tracker.firebirdsql.org/browse/CORE-5099
append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks 
-std=c++11
 
econf \
--prefix=/usr/$(get_libdir)/firebird \

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/, dev-db/firebird/files/

2018-01-09 Thread Patrice Clement 
commit: a5fb1a9f010c2eba9380baa55b9269add19a61b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 11:50:00 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan  9 11:26:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fb1a9f

dev-db/firebird: drop awfully broken firebird-2*.

Closes: https://bugs.gentoo.org/639614
Closes: https://github.com/gentoo/gentoo/pull/6467
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/firebird/Manifest   |   1 -
 .../firebird-2.5.1.26351.0-superclassic.patch  |  12 -
 .../files/firebird-2.5.3.26780.0-deps-flags.patch  |  59 -
 .../files/firebird-2.5.7.27050.0-gcc6.patch|  35 ---
 dev-db/firebird/files/firebird.conf.d.2.5  |   7 -
 dev-db/firebird/files/firebird.init.d.2.5  |  30 ---
 dev-db/firebird/files/firebird.xinetd  |  11 -
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild  | 282 -
 dev-db/firebird/metadata.xml   |   1 -
 9 files changed, 438 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 73ac09fcacf..d2a44ea8aed 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,2 @@
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B 
fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b
 SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch 
b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
deleted file mode 100644
index 3891cc776fa..000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird 
builds/posix/Makefile.in.firebird
 orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.0 
-0500
-+++ builds/posix/Makefile.in.firebird  2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql 
- .PHONY: embed_gpre embed_util
- 
--classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server 
fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server 
embed_gfix embed_gbak embed_isql \
-   embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf 
$(PLAT_CLASSIC_POST_TARGET)
- 
- libfbembed:

diff --git a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch 
b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
deleted file mode 100644
index 506a6c07a79..000
--- a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 
Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
 Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird  
2010-11-09 12:42:45.0 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 
Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
 Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 
12:42:45.0 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults   
2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR=   ar @AR_OPTIONS@ crsu
- LN=   @LN_S@
- RANLIB=   @RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =  @CC@
- CXX = @CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 
Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-12-07 Thread Andreas Sturmlechner 
commit: 6a564498e179df4112a2a165d90c66eb75289bb8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec  7 08:26:48 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec  7 08:26:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a564498

dev-db/firebird: Add missing die

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index 74bd1f31074..68a0c71d850 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -82,7 +82,7 @@ src_prepare() {
find . -name \*.sh -exec chmod +x {} + || die
rm -r extern/{btyacc,editline,icu} || die
 
-   mv configure.in configure.ac || "failed to mv configure.in configure.ac"
+   mv configure.in configure.ac || die "failed to mv configure.in 
configure.ac"
 
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-12-06 Thread Andreas Sturmlechner 
commit: 99d88bb141c0722d9fe31cdc1a31c284926d5e0c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 20:00:41 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  6 20:14:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d88bb1

dev-db/firebird: Drop redundant ${S} in src_prepare

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild| 4 ++--
 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index 72385210ce9..74bd1f31074 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -79,8 +79,8 @@ src_prepare() {
-e 's:ISQL :FBSQL :w /dev/stdout' \
src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
 
-   find "${S}" -name \*.sh -exec chmod +x {} + || die
-   rm -r "${S}"/extern/{btyacc,editline,icu} || die
+   find . -name \*.sh -exec chmod +x {} + || die
+   rm -r extern/{btyacc,editline,icu} || die
 
mv configure.in configure.ac || "failed to mv configure.in configure.ac"
 

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index 0ffc66ca591..f502dbb7b2c 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -88,8 +88,8 @@ src_prepare() {
-e 's:ISQL :FBSQL :w /dev/stdout' \
src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
 
-   find "${S}" -name \*.sh -exec chmod +x {} + || die
-   rm -r "${S}"/extern/{btyacc,editline,icu} || die
+   find . -name \*.sh -exec chmod +x {} + || die
+   rm -r extern/{btyacc,editline,icu} || die
 
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-12-06 Thread Andreas Sturmlechner 
commit: b18f29320ab45f391f083297ded21307301051c4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 19:59:28 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  6 20:14:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18f2932

dev-db/firebird: Fix configure.in warning

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index afe4c215521..72385210ce9 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -82,6 +82,8 @@ src_prepare() {
find "${S}" -name \*.sh -exec chmod +x {} + || die
rm -r "${S}"/extern/{btyacc,editline,icu} || die
 
+   mv configure.in configure.ac || "failed to mv configure.in configure.ac"
+
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-12-06 Thread Andreas Sturmlechner 
commit: e7b0cb0b12132fdc710a9ef12fbb53c1bbe21eec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 19:58:45 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  6 20:14:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b0cb0b

dev-db/firebird: Fix build with GCC-6

Thanks-to: Maciej S. Szmigiero  maciej.szmigiero.name>
Bug: https://bugs.gentoo.org/639614
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/Manifest| 4 ++--
 dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch | 2 +-
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index b7e1145f12f..3335ecdfda5 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,3 @@
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 
0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 WHIRLPOOL 
d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 
1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 WHIRLPOOL 
2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
+DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B 
fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b
 SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
+DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch 
b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
index f051ea02b4c..312f3576bcc 100644
--- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
+++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
@@ -32,4 +32,4 @@ PR: https://github.com/FirebirdSQL/firebird/pull/104
 +  static_cast(blr_end),
blr_eoc
};
-   static FB_API_HANDLE req_handle;
\ No newline at end of file
+   static FB_API_HANDLE req_handle;

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index b6e56990fd8..afe4c215521 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -88,6 +88,8 @@ src_prepare() {
 src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
+   # bug 639614
+   append-cxxflags -flifetime-dse=1 -fno-sized-deallocation 
-fno-delete-null-pointer-checks
 
econf \
--prefix=/usr/$(get_libdir)/firebird \

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/, dev-db/firebird/files/

2017-11-10 Thread Andreas Sturmlechner 
commit: e82963f83a9027ae6da34734a5bb7c21e152c58a
Author: Peter Levine  gmail  com>
AuthorDate: Wed Jul 26 02:27:16 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 10 20:34:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82963f8

dev-db/firebird: Fix building with GCC-6

Closes: https://bugs.gentoo.org/608294
Closes: https://github.com/gentoo/gentoo/pull/5212
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/firebird-2.5.7.27050.0-gcc6.patch| 35 ++
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild  |  5 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch 
b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
new file mode 100644
index 000..f051ea02b4c
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
@@ -0,0 +1,35 @@
+Bug: https://bugs.gentoo.org/608294
+PR: https://github.com/FirebirdSQL/firebird/pull/104
+
+--- a/src/common/classes/alloc.h
 b/src/common/classes/alloc.h
+@@ -498,10 +498,14 @@ using Firebird::MemoryPool;
+
+ inline static MemoryPool* getDefaultMemoryPool() { return 
Firebird::MemoryPool::processMemoryPool; }
+
++#if (( ! __GNUC__ ) || ( __GNUC__ < 6 ))
++
+ // Global versions of operators new and delete
+ void* operator new(size_t s) THROW_BAD_ALLOC;
+ void* operator new[](size_t s) THROW_BAD_ALLOC;
+
++#endif
++
+ void operator delete(void* mem) throw();
+ void operator delete[](void* mem) throw();
+
+--- a/src/dudley/exe.epp
 b/src/dudley/exe.epp
+@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT 
* field)
+   blr_parameter, 0, 0, 0,
+   blr_parameter, 0, 1, 0,
+   blr_parameter, 1, 0, 0,
+-  blr_end,
+-  blr_end,
+-  blr_end,
++  static_cast(blr_end),
++  static_cast(blr_end),
++  static_cast(blr_end),
+   blr_eoc
+   };
+   static FB_API_HANDLE req_handle;
\ No newline at end of file

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index b118e34f5f2..b6e56990fd8 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -35,7 +35,10 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="userpriv"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+   "${FILESDIR}"/${P}-gcc6.patch
+)
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-27 Thread Andreas Hüttel 
commit: 87246e2c71a87476b54e313e3045a62107b6a0b2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May 27 12:06:53 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May 27 12:07:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87246e2c

dev-db/firebird: Fix libfbintl.so location

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ...ebird-3.0.2.32703.0-r1.ebuild => firebird-3.0.2.32703.0-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
similarity index 98%
rename from dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
rename to dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
index d28f77e1050..0ffc66ca591 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@@ -162,8 +162,8 @@ src_install() {
insopts -m0660 -o firebird -g firebird
doins help/help.fdb
 
-   into /usr/$(get_libdir)/${PN}/intl
-   dolib.so intl/libfbintl.so
+   exeinto /usr/$(get_libdir)/${PN}/intl
+   doexe intl/libfbintl.so
dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so
 
insinto /usr/$(get_libdir)/${PN}/intl

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-24 Thread Andreas Hüttel 
commit: 317d521319e425b22bf5dfb9a1774ecbd36d6b99
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu May 25 01:35:14 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu May 25 01:36:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317d5213

dev-db/firebird: Remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 235 --
 1 file changed, 235 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
deleted file mode 100644
index bf2fea73c53..000
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
-HOMEPAGE="https://www.firebirdsql.org/;
-SRC_URI="
-   mirror://sourceforge/firebird/${MY_P}.tar.bz2
-   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples +server xinetd"
-
-# FIXME: cloop?
-CDEPEND="
-   dev-libs/libtommath
-   dev-libs/icu:=
-   dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-   >=dev-util/btyacc-3.0-r2
-   doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-   xinetd? ( virtual/inetd )
-   !sys-cluster/ganglia
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${P}"-unbundle.patch
-   "${FILESDIR}/${P}"-gcc6.patch
-   "${FILESDIR}/${P}"-cloop-compiler.patch
-)
-
-pkg_pretend() {
-   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
-   ewarn
-   ewarn "The presence of server connections may prevent isql or 
gsec"
-   ewarn "from establishing an embedded connection. Accordingly,"
-   ewarn "creating employee.fdb or security3.fdb could fail."
-   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   enewgroup firebird 450
-   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-   MSG="sed of $3, required $2 line(s) modified $1"
-   einfo "${MSG}"
-   [[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-   unpack "${MY_P}.tar.bz2"
-   if use doc; then
-   # Unpack docs
-   mkdir "manuals" || die
-   cd "manuals" || die
-   unpack ib_b60_doc.zip
-   fi
-}
-
-src_prepare() {
-   default
-
-   # Rename references to isql to fbsql
-   # sed vs patch for portability and addtional location changes
-   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
-   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-   -e 's:isql :fbsql :w /dev/stdout' \
-   -e 's:ISQL :FBSQL :w /dev/stdout' \
-   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
-
-   find "${S}" -name \*.sh -exec chmod +x {} + || die
-   rm -r "${S}"/extern/{btyacc,editline,icu} || die
-
-   eautoreconf
-}
-
-src_configure() {
-   filter-flags -fprefetch-loop-arrays
-   filter-mfpmath sse
-
-   # otherwise this doesnt build with gcc-6
-   # http://tracker.firebirdsql.org/browse/CORE-5099
-   append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-
-   econf \
-   --prefix=/usr/$(get_libdir)/firebird \
-   --with-editline \
-   --with-system-editline \
-   --with-fbbin=/usr/bin \
-   --with-fbsbin=/usr/sbin \
-   --with-fbconf=/etc/${PN} \
-   --with-fblib=/usr/$(get_libdir) \
-   --with-fbinclude=/usr/include \
-   --with-fbdoc=/usr/share/doc/${PF} \
-   --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-   --with-fbsample=/usr/share/doc/${PF}/examples \
-   --with-fbsample-db=/usr/share/doc/${PF}/examples/db \
-   --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-   --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-   --with-fbmisc=/usr/share/${PN} \
-   --with-fbsecure-db=/etc/${PN} \
-   --with-fbmsg=/usr/$(get_libdir)/${PN} \
-   --with-fblog=/var/log/${PN}/ \
-   --with-fbglock=/var/run/${PN} \
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-24 Thread Andreas Hüttel 
commit: 95f13548db53b231b5fcd6114c2364b745b164f2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu May 25 01:34:50 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu May 25 01:36:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95f13548

dev-db/firebird: Install missing fb_config

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild | 235 +++
 1 file changed, 235 insertions(+)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
new file mode 100644
index 000..d28f77e1050
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r1.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   mirror://sourceforge/firebird/${MY_P}.tar.bz2
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples +server xinetd"
+
+# FIXME: cloop?
+CDEPEND="
+   dev-libs/libtommath
+   dev-libs/icu:=
+   dev-libs/libedit
+"
+DEPEND="${CDEPEND}
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}/${P}"-unbundle.patch
+   "${FILESDIR}/${P}"-gcc6.patch
+   "${FILESDIR}/${P}"-cloop-compiler.patch
+)
+
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
+pkg_setup() {
+   enewgroup firebird 450
+   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+   MSG="sed of $3, required $2 line(s) modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "manuals" || die
+   cd "manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w /dev/stdout' \
+   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
+
+   find "${S}" -name \*.sh -exec chmod +x {} + || die
+   rm -r "${S}"/extern/{btyacc,editline,icu} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -fprefetch-loop-arrays
+   filter-mfpmath sse
+
+   # otherwise this doesnt build with gcc-6
+   # http://tracker.firebirdsql.org/browse/CORE-5099
+   append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+
+   econf \
+   --prefix=/usr/$(get_libdir)/firebird \
+   --with-editline \
+   --with-system-editline \
+   --with-fbbin=/usr/bin \
+   --with-fbsbin=/usr/sbin \
+   --with-fbconf=/etc/${PN} \
+   --with-fblib=/usr/$(get_libdir) \
+   --with-fbinclude=/usr/include \
+   --with-fbdoc=/usr/share/doc/${PF} \
+   --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+   --with-fbsample=/usr/share/doc/${PF}/examples \
+   --with-fbsample-db=/usr/share/doc/${PF}/examples/db \
+   --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+   --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+   --with-fbmisc=/usr/share/${PN} \
+   --with-fbsecure-db=/etc/${PN} \
+   --with-fbmsg=/usr/$(get_libdir)/${PN} \
+   --with-fblog=/var/log/${PN}/ \
+   --with-fbglock=/var/run/${PN} \
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-21 Thread Andreas Hüttel 
commit: b64975c35fc8e27cde82a73c36ecf29f67eabdaa
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun May 21 11:57:45 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun May 21 11:57:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64975c3

dev-db/firebird: Re-add keywords

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 4bee6fc80bd..bf2fea73c53 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="doc examples +server xinetd"

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-21 Thread Andreas Hüttel 
commit: e246873f43db77850c172263be72bc5153b23adb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun May 21 11:56:02 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun May 21 11:57:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e246873f

dev-db/firebird: Simplify and add work from linuxunderground overlay

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/files/firebird.init.d.3.0 |  22 +++
 dev-db/firebird/files/firebird.xinetd.3.0 |  11 ++
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 186 --
 dev-db/firebird/metadata.xml  |   1 +
 4 files changed, 116 insertions(+), 104 deletions(-)

diff --git a/dev-db/firebird/files/firebird.init.d.3.0 
b/dev-db/firebird/files/firebird.init.d.3.0
new file mode 100644
index 000..9fd4f850476
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.3.0
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+name=${RC_SVCNAME}
+
+fbhomedir="/var/run/firebird"
+fblogdir="/var/log/firebird"
+pidfile="${fbhomedir}/firebird.pid"
+command="/usr/sbin/fbguard"
+command_args="-forever -daemon -pidfile $pidfile"
+
+start_stop_daemon_args="-p ${pidfile} -u 
${FBUSER:-firebird}:${FBGROUP:-firebird}"
+
+depend() {
+   need net
+}
+
+start_pre() {
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fbhomedir} || return 1
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fblogdir} || return 1
+}

diff --git a/dev-db/firebird/files/firebird.xinetd.3.0 
b/dev-db/firebird/files/firebird.xinetd.3.0
new file mode 100644
index 000..4e094bdf062
--- /dev/null
+++ b/dev-db/firebird/files/firebird.xinetd.3.0
@@ -0,0 +1,11 @@
+service gds_db
+{
+   flags   = REUSE
+   socket_type = stream
+   wait= no
+   user= firebird
+   log_on_success  += USERID
+   log_on_failure  += USERID
+   server  = /usr/bin/firebird
+   disable = yes
+}

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 4cf71cd1fe1..4bee6fc80bd 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -17,9 +17,11 @@ LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="doc examples xinetd"
+IUSE="doc examples +server xinetd"
 
+# FIXME: cloop?
 CDEPEND="
+   dev-libs/libtommath
dev-libs/icu:=
dev-libs/libedit
 "
@@ -40,6 +42,17 @@ PATCHES=(
"${FILESDIR}/${P}"-cloop-compiler.patch
 )
 
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
 pkg_setup() {
enewgroup firebird 450
enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
@@ -99,10 +112,10 @@ src_configure() {
--with-fbconf=/etc/${PN} \
--with-fblib=/usr/$(get_libdir) \
--with-fbinclude=/usr/include \
-   --with-fbdoc=/usr/share/doc/${P} \
+   --with-fbdoc=/usr/share/doc/${PF} \
--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-   --with-fbsample=/usr/share/doc/${P}/examples \
-   --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+   --with-fbsample=/usr/share/doc/${PF}/examples \
+   --with-fbsample-db=/usr/share/doc/${PF}/examples/db \
--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
--with-fbmisc=/usr/share/${PN} \
@@ -115,143 +128,108 @@ src_configure() {
${myconf}
 }
 
-src_compile() {
-   MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-   emake
-}
-
+# from linux underground, merging into this here
 src_install() {
-   cd "gen/Release/${PN}" || die
-
if use doc; then
-   dodoc "${S}"/doc/*.pdf
+   dodoc -r doc
find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc 
'{}' + || die
fi
 
-   doheader include/*
+   cd "${S}/gen/Release/${PN}" || die
 
-   insinto /usr/$(get_libdir)
+   doheader include/*
dolib.so lib/*.so*
 
# links for backwards compatibility
+   insinto /usr/$(get_libdir)
dosym libfbclient.so /usr/$(get_libdir)/libgds.so
dosym libfbclient.so

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-19 Thread Andreas Hüttel 
commit: 27c1365ddac261581a5e97294c162a5669521228
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri May 19 23:42:38 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri May 19 23:43:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c1365d

dev-db/firebird: Builds, but the install phase needs more analysis

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../firebird-3.0.2.32703.0-cloop-compiler.patch| 15 +++
 .../files/firebird-3.0.2.32703.0-gcc6.patch| 19 +
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild  | 31 +-
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch
new file mode 100644
index 000..363602bed8f
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch
@@ -0,0 +1,15 @@
+Source: LibreOffice git master
+
+
+diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile
+--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200
 firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200
+@@ -4,8 +4,6 @@
+ 
+ TARGET:= release
+ 
+-CC:= gcc
+-CXX   := g++
+ LD:= $(CXX)
+ 
+ SRC_DIR   := src

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
new file mode 100644
index 000..e1361415c03
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
@@ -0,0 +1,19 @@
+commit 3618aa2171674babf79ef935aa049c40a3db1321
+Author: asfernandes 
+Date:   Sat Mar 5 03:39:36 2016 +
+
+Make the generated code compatible with gcc 6 in C++-14 mode.
+
+diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
+index 2af96c6..2dcffd6 100644
+--- a/src/gpre/c_cxx.cpp
 b/src/gpre/c_cxx.cpp
+@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
+   printa(0, "static %sshort\n   isc_%dl = %d;",
+  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
+  request->req_ident, request->req_length);
+-  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
++  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
+ 
+   const TEXT* string_type = "blr";
+   if (gpreGlob.sw_raw)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 9180b5aa186..4cf71cd1fe1 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -34,9 +34,10 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# this is work in progress and likely does not build yet
 PATCHES=(
-   "${FILESDIR}/${P}-unbundle.patch"
+   "${FILESDIR}/${P}"-unbundle.patch
+   "${FILESDIR}/${P}"-gcc6.patch
+   "${FILESDIR}/${P}"-cloop-compiler.patch
 )
 
 pkg_setup() {
@@ -84,11 +85,10 @@ src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
 
-   # otherwise this doesnt build with gcc-6?
+   # otherwise this doesnt build with gcc-6
# http://tracker.firebirdsql.org/browse/CORE-5099
append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks 
-Wno-narrowing
-   # -std=c++11
+   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
 
econf \
--prefix=/usr/$(get_libdir)/firebird \
@@ -130,8 +130,6 @@ src_install() {
 
doheader include/*
 
-   rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
-
insinto /usr/$(get_libdir)
dolib.so lib/*.so*
 
@@ -146,29 +144,12 @@ src_install() {
einfo "Renaming isql -> fbsql"
mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
 
-   local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat 
nbackup qli"
+   local bins="fbguard fbsql fbsvcmgr fbtracemgr firebird gbak gfix gpre 
gpre_boot gpre_current gsec gsplit gstat nbackup qli"
for bin in ${bins}; do
dobin bin/${bin}
done
 
dosbin bin/fb_lock_print
-   # SuperServer
-   if use superserver ; then
-   dosbin bin/{fbguard,fbserver}
-   # ClassicServer
-   elif use xinetd ; then
-   dosbin bin/fb_inet_server
-   # SuperClassic
-   else
-   dosbin bin/{fbguard,fb_smp_server}
-
-   #Temp should not be necessary, need to patch/fix
-   dosym ../../libib_util.so 
/usr/$(get_libdir)/${PN}/lib/libib_util.so
-   fi
-
-   exeinto /usr/bin/${PN}
-   exeopts -m0755
-   doexe

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-18 Thread Andreas Hüttel 
commit: 110938ff6d00e8d351a154ffabc29592b2d9cbc9
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu May 18 22:28:47 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Thu May 18 22:29:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=110938ff

dev-db/firebird: Make it build. It might even install.

See libreoffice core repo for patches still to be added.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 345fb30b315..9180b5aa186 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -17,8 +17,7 @@ LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="debug doc examples +superserver xinetd"
-REQUIRED_USE="?? ( superserver xinetd )"
+IUSE="doc examples xinetd"
 
 CDEPEND="
dev-libs/icu:=
@@ -33,8 +32,6 @@ RDEPEND="${CDEPEND}
!sys-cluster/ganglia
 "
 
-RESTRICT="userpriv"
-
 S="${WORKDIR}/${MY_P}"
 
 # this is work in progress and likely does not build yet
@@ -87,13 +84,16 @@ src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
 
+   # otherwise this doesnt build with gcc-6?
+   # http://tracker.firebirdsql.org/browse/CORE-5099
+   append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
+   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks 
-Wno-narrowing
+   # -std=c++11
+
econf \
--prefix=/usr/$(get_libdir)/firebird \
-   $(use_enable superserver) \
-   $(use_enable debug) \
--with-editline \
--with-system-editline \
-   --with-system-icu \
--with-fbbin=/usr/bin \
--with-fbsbin=/usr/sbin \
--with-fbconf=/etc/${PN} \
@@ -121,7 +121,7 @@ src_compile() {
 }
 
 src_install() {
-   cd "gen/${PN}" || die
+   cd "gen/Release/${PN}" || die
 
if use doc; then
dodoc "${S}"/doc/*.pdf

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-05-13 Thread Andreas Hüttel 
commit: b4a4598dd8611ff10f15ee37e41113cbc19fc847
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May 13 23:54:46 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May 13 23:54:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a4598d

dev-db/firebird: move to office project :/

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/metadata.xml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 0d7a6ff58e8..64d8608cc9a 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -15,13 +15,7 @@

firebird

-   
-   bear1...@mail.ru
-   Andrey Matrosov
-   Proxied maintainer, assign bugs to 
him
-   

-   proxy-ma...@gentoo.org
-   Proxy Maintainers
+   off...@gentoo.org

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-13 Thread Andreas Hüttel 
commit: 2ee359baae6e5853d90f0ae511bdd9cb48d5aac2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May 13 23:45:26 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May 13 23:45:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee359ba

dev-db/firebird: Work in progress. Build fails so far.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/Manifest   |   1 +
 .../files/firebird-3.0.2.32703.0-unbundle.patch|  51 
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild  | 276 +
 3 files changed, 328 insertions(+)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index feadd1192ef..b7e1145f12f 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 
0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 WHIRLPOOL 
d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
+DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 
1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 WHIRLPOOL 
2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
new file mode 100644
index 000..6fdd657223d
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
@@ -0,0 +1,51 @@
+diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in 
Firebird-3.0.2.32703-0/builds/posix/Makefile.in
+--- Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in   2017-03-21 
10:11:35.0 +0100
 Firebird-3.0.2.32703-0/builds/posix/Makefile.in2017-05-14 
01:32:34.032241679 +0200
+@@ -123,7 +123,6 @@
+ #
+ 
+ extern:
+-  $(MAKE) -C $(ROOT)/extern/btyacc
+   $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 
BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
+ 
+ ifeq ($(TOMBUILD_FLG),Y)
+@@ -648,7 +647,7 @@
+ # various cleaning
+ #
+ .PHONY: clean clean_objects clean_dependancies clean_extern_objects 
clean_build \
+-  clean_gpre_gen clean_icu clean_dbs clean_examples 
clean_makefiles \
++  clean_gpre_gen clean_dbs clean_examples clean_makefiles \
+   clean_editline clean_all
+ 
+ 
+@@ -669,8 +668,6 @@
+   $(RM) $(ROOT)/libtool
+   $(RM_R) $(ROOT)/autom4te.cache
+   -$(MAKE) -C $(ROOT)/extern/editline distclean
+-# -$(MAKE) -C $(ROOT)/extern/icu/source distclean
+-  -$(MAKE) -C $(ROOT)/extern/btyacc distclean
+ 
+ clean_dbs:
+   $(RM) *.fdb *.FDB msg.timestamp
+@@ -687,9 +684,6 @@
+ clean_editline:
+   -$(MAKE) -C $(ROOT)/extern/editline clean
+ 
+-#clean_icu:
+-# -$(MAKE) -C $(ROOT)/extern/icu/source clean
+-
+ clean_tommath:
+   -$(MAKE) -C $(ROOT)/extern/libtommath clean
+ 
+diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults 
Firebird-3.0.2.32703-0/builds/posix/make.defaults
+--- Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults 2017-03-21 
10:11:35.0 +0100
 Firebird-3.0.2.32703-0/builds/posix/make.defaults  2017-05-14 
01:29:54.590235045 +0200
+@@ -155,7 +155,7 @@
+ AR=   ar @AR_OPTIONS@
+ LN=   @LN_S@
+ RANLIB=   @RANLIB@
+-BTYACC=$(ROOT)/extern/btyacc/btyacc
++BTYACC=/usr/bin/btyacc
+ CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/release/bin/cloop
+ 
+ CC =  @CC@

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
new file mode 100644
index 000..345fb30b315
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   mirror://sourceforge/firebird/${MY_P}.tar.bz2
+   doc? (

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2017-02-04 Thread Andreas Sturmlechner 
commit: 06590bfb0f7ec387135e4c00935c52dcef5d00ef
Author: Maciej S. Szmigiero  maciej  szmigiero  name>
AuthorDate: Fri Jan  6 18:43:51 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  4 19:25:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06590bfb

dev-db/firebird: Restore SuperClassic, fix broken symlinks, libfbintl.so

Gentoo-Bug: 577956, 562716, 516760

1) Restore ability to build SuperClassic server

Commit 9b00135 ("Various syntax improvements and fixes") removed
ability to build the SuperClassic server by changing REQUIRED_USE so
that the required USE flags combination ("-client -superserver -xinetd")
is no longer permitted. It looks like this was done by mistake, since the
relevant code inside ebuild is still present and still works.

Fix this by allowing this USE flag combination again.

2) Portage warns about broken symlinks when firebird is emerged:
* QA Notice: Symbolic link /usr/lib64/firebird/lib/libib_util.so points to
/usr/lib64/firebird/lib/usr/lib64/libib_util.so which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/intl/fbintl.conf points to
/usr/lib64/firebird/intl/etc/firebird/fbintl.conf which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/intl/fbintl points to
/usr/lib64/firebird/intl/usr/lib64/libfbintl.so which does not exist.
* QA Notice: Symbolic link /usr/lib64/firebird/plugins/libfbtrace.so
points to /usr/lib64/firebird/plugins/usr/lib64/libfbtrace.so which does
not exist.

Adjust symlink targets in ebuild to fix these broken links.

3) Don't use libintl.so SONAME for libfbintl.so

Firebird by default uses libintl.so.1 SONAME for libfbintl.so.1.
This means that ldconfig will make libintl.so.1 symlink to libfbintl.so.1.

However, actual libintl.so is a very different library, incompatible with
libfbintl.so. This breaks packages which tries to link to it, notably
dev-perl/libintl-perl.

Fix it by making libfbintl.so SONAME match its actual name.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

Closes: https://github.com/gentoo/gentoo/pull/3757

 dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild | 289 +++
 1 file changed, 289 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild 
b/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
new file mode 100644
index ..f7d460a
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/;
+SRC_URI="
+   mirror://sourceforge/firebird/${MY_P}.tar.bz2
+   doc? (  ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc client examples superserver xinetd"
+REQUIRED_USE="?? ( client superserver xinetd )"
+
+CDEPEND="
+   dev-libs/libedit
+   dev-libs/icu:=
+"
+DEPEND="${CDEPEND}
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   enewgroup firebird 450
+   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
+}
+
+check_sed() {
+   MSG="sed of $3, required $2 lines modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "manuals" || die
+   cd "manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   # This patch might be portable, and not need to be duplicated per 
version
+   # also might no longer be necessary to patch deps or libs, just flags
+   epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+
+   use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+   use superserver || epatch 
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-02-04 Thread Andreas Sturmlechner 
commit: 090c438e1fc6fe17eca317421604a29720871bff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  4 15:54:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  4 19:25:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090c438e

dev-db/firebird: 2.5.6.27020.0 version bump, EAPI 6, drop USE=client

Gentoo-bug: 420817, 420939, 578230

- Pick USE=superserver as default
- Drop unused eclasses
- Update HOMEPAGE, DESCRIPTION
- QA fix: Don't install into /var/run (fixed upstream)

Package-Manager: portage-2.3.3

 dev-db/firebird/Manifest   |  1 +
 .../firebird-2.5.6.27020.0-CVE-2016-1569.patch | 12 ++
 ...0.0-r4.ebuild => firebird-2.5.6.27020.0.ebuild} | 43 ++
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index bdb486c..112d4ca 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 
0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 
b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98
 WHIRLPOOL 
0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
+DIST Firebird-2.5.6.27020-0.tar.bz2 13610463 SHA256 
8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826 SHA512 
db336877bf53503f882f18fbd4c1ef080543d617432c48340a3ac2a9970d960e99d1ca76609c0b3037b2f457ac7c6e23f119e618919b86b52cff89db8aaf3062
 WHIRLPOOL 
c6264f68e917def39eb1ea2ce167e24e6a5903593cb174da656ea7739fbef6ea0a5928a68c772336df10e69440f0cdb6a37c09c98cee6898a43b2f9dc85af671
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch 
b/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch
new file mode 100644
index ..1066d58
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch
@@ -0,0 +1,12 @@
+diff -Naur Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp 
Firebird-2.5.5.26952-0/src/burp/burp.cpp
+--- Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp  2016-03-01 
16:46:48.418536462 -0500
 Firebird-2.5.5.26952-0/src/burp/burp.cpp   2016-03-01 16:48:19.511690164 
-0500
+@@ -460,7 +460,7 @@
+   }
+   else
+   {
+-  BURP_print(true, 137, sw.c_str());
++  BURP_error(137, true, sw.c_str());
+   // msg 137  unknown switch %s
+   }
+   }

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild 
b/dev-db/firebird/firebird-2.5.6.27020.0.ebuild
similarity index 88%
rename from dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
rename to dev-db/firebird/firebird-2.5.6.27020.0.ebuild
index f7d460a..f1cfcd8 100644
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
+++ b/dev-db/firebird/firebird-2.5.6.27020.0.ebuild
@@ -2,29 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
+inherit autotools flag-o-matic user versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
 
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/;
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
 SRC_URI="
mirror://sourceforge/firebird/${MY_P}.tar.bz2
-   doc? (  ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug doc client examples superserver xinetd"
-REQUIRED_USE="?? ( client superserver xinetd )"
+IUSE="debug doc examples +superserver xinetd"
+REQUIRED_USE="?? ( superserver xinetd )"
 
 CDEPEND="
-   dev-libs/libedit
dev-libs/icu:=
+   dev-libs/libedit
 "
 DEPEND="${CDEPEND}
>=dev-util/btyacc-3.0-r2
@@ -37,6 +36,11 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="userpriv"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+   "${FILESDIR}"/${P}-CVE-2016-1569.patch
+)
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -45,7 +49,7 @@ pkg_setup() {
 }
 
 check_sed() {
-   MSG="sed of $3, required $2 lines modified $1"
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2016-02-02 Thread Kristian Fiskerstrand 
commit: 82f2ba41d3a959664863aabb66391c214a28cccf
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Tue Feb  2 20:35:32 2016 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Tue Feb  2 20:35:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f2ba41

dev-db/firebird: Add name and description to metadata.xml

Bug: 573684

Package-Manager: portage-2.2.27

 dev-db/firebird/metadata.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index dcb81a3..c10e79b 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -22,5 +22,7 @@


bear1...@mail.ru
+   Andrey Matrosov
+   Proxied maintainer, assign bugs to 
him

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2016-02-02 Thread Patrick Lauer 
commit: cd71b7c2ed69e6da0e83eebc4cfe445919ab7157
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Feb  2 16:01:02 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Tue Feb  2 16:01:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd71b7c2

dev-db/firebird: Fix metadata.xml

Package-Manager: portage-2.2.27

 dev-db/firebird/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 0c25aee..dcb81a3 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -21,6 +21,6 @@
Proxy Maintainers


-   bear1...@mail.ru>
+   bear1...@mail.ru

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2016-01-28 Thread Patrice Clement 
commit: 7a8dcc79f8f9fbc7471185bdab1abf62c2a0681b
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Jan 28 18:52:28 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jan 28 18:52:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8dcc79

dev-db/firebird: Handover maintainership. Fixes bug 573234.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement  gentoo.org>

 dev-db/firebird/metadata.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index e66d5d1..0c25aee 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -16,4 +16,11 @@

firebird

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   bear1...@mail.ru>
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2015-10-05 Thread Michał Górny 
commit: 9b00135f4696e539a3cbee711ac687f4f9ded105
Author: William L. Thomson Jr  o-sinc  com>
AuthorDate: Sun Oct  4 21:44:18 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct  5 16:53:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b00135f

dev-db/firebird: Various syntax improvements and fixes

With second batch of fixes by Michał Górny.

Pull-Request: https://github.com/gentoo/gentoo/pull/154

 ...-r2.ebuild => firebird-2.5.3.26780.0-r3.ebuild} | 83 +++---
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild 
b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
similarity index 76%
rename from dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
rename to dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
index 281bae6..6b824a6 100644
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
+inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
 #MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
@@ -13,18 +13,14 @@ DESCRIPTION="A relational database offering many ANSI 
SQL:2003 and some SQL:2008
 HOMEPAGE="http://www.firebirdsql.org/;
 SRC_URI="
mirror://sourceforge/firebird/${MY_P}.tar.bz2
-doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+   doc? (  ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="doc client superserver xinetd examples debug"
-REQUIRED_USE="
-   client? ( !superserver )
-   client? ( !xinetd )
-   superserver? ( !xinetd )
-"
+IUSE="debug doc client examples superserver xinetd"
+REQUIRED_USE="^^ ( client superserver xinetd )"
 
 CDEPEND="
dev-libs/libedit
@@ -45,10 +41,10 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
enewgroup firebird 450
-   enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
 }
 
-function check_sed() {
+check_sed() {
MSG="sed of $3, required $2 lines modified $1"
einfo "${MSG}"
[[ $1 -ge $2 ]] || die "${MSG}"
@@ -58,7 +54,8 @@ src_unpack() {
unpack "${MY_P}.tar.bz2"
if use doc; then
# Unpack docs
-   mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
+   mkdir "manuals" || die
+   cd "manuals" || die
unpack ib_b60_doc.zip
fi
 }
@@ -82,8 +79,8 @@ src_prepare() {
-e 's:ISQL :FBSQL :w /dev/stdout' \
src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
 
-   find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
-   rm -rf "${S}"/extern/{btyacc,editline,icu} || die
+   find "${S}" -name \*.sh -exec chmod +x {} + || die
+   rm -r "${S}"/extern/{btyacc,editline,icu} || die
 
eautoreconf
 }
@@ -94,7 +91,7 @@ src_configure() {
 
econf \
--prefix=/usr/$(get_libdir)/firebird \
-   $(use_enable superserver superserver) \
+   $(use_enable superserver) \
$(use_enable debug) \
--with-editline \
--with-system-editline \
@@ -126,7 +123,7 @@ src_compile() {
 }
 
 src_install() {
-   cd "${S}/gen/${PN}" || die
+   cd "gen/${PN}" || die
 
if use doc; then
dodoc "${S}"/doc/*.pdf
@@ -135,7 +132,7 @@ src_install() {
 
doheader include/*
 
-   rm lib/libfbstatic.a
+   rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
 
insinto /usr/$(get_libdir)
dolib.so lib/*.so*
@@ -151,10 +148,10 @@ src_install() {
use client && return
 
einfo "Renaming isql -> fbsql"
-   mv bin/isql bin/fbsql
+   mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
 
local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat 
nbackup qli"
-   for bin in ${bins[@]}; do
+   for bin in ${bins}; do
dobin bin/${bin}
done
 
@@ -170,7 +167,7 @@ src_install() {
dosbin bin/{fbguard,fb_smp_server}
 
#Temp should not be necessary, need to patch/fix
-   dosym "${D}"/usr/$(get_libdir)/libib_util.so 
/usr/$(get_libdir)/${PN}/lib/libib_util.so
+   dosym usr/$(get_libdir)/libib_util.so 
/usr/$(get_libdir)/${PN}/lib/libib_util.so
fi
 
exeinto /usr/bin/${PN}
@@ -182,18 +179,18 @@ src_install() {
 
exeinto /usr/$(get_libdir)/firebird/intl
dolib.so intl/libfbintl.so
-   dosym "${D}"/usr/$(get_libdir)/libfbintl.so 
/usr/$(get_libdir)/${PN}/intl/fbintl
-   dosym

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2015-09-23 Thread Patrice Clement 
commit: 930cf1f8cfdc999dcd745665615bc8557c45edcf
Author: William L. Thomson Jr  o-sinc  com>
AuthorDate: Wed Sep 23 01:00:50 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Sep 23 01:00:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930cf1f8

dev-db/firebird: removed ebuild omitted in previous commit

 dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild | 286 ---
 1 file changed, 286 deletions(-)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild 
b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
deleted file mode 100644
index 9fe14f6..000
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/;
-SRC_URI="
-   mirror://sourceforge/firebird/${MY_P}.tar.bz2
-doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-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 )
-"
-
-CDEPEND="
-   dev-libs/libedit
-   dev-libs/icu:=
-"
-DEPEND="${CDEPEND}
-   >=dev-util/btyacc-3.0-r2
-   doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-   xinetd? ( virtual/inetd )
-   !sys-cluster/ganglia
-"
-
-RESTRICT="userpriv"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-   enewgroup firebird 450
-   enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-   MSG="sed of $3, required $2 lines modified $1"
-   einfo "${MSG}"
-   [[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-   unpack "${MY_P}.tar.bz2"
-   if use doc; then
-   # Unpack docs
-   mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
-   unpack ib_b60_doc.zip
-   fi
-}
-
-src_prepare() {
-   # This patch might be portable, and not need to be duplicated per 
version
-   # also might no longer be necessary to patch deps or libs, just flags
-   epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
-
-   use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
-   use superserver || epatch 
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
-
-   # Rename references to isql to fbsql
-   # sed vs patch for portability and addtional location changes
-   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
-   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-   -e 's:isql :fbsql :w /dev/stdout' \
-   -e 's:ISQL :FBSQL :w /dev/stdout' \
-   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
-
-   find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
-   rm -rf "${S}"/extern/{btyacc,editline,icu} || die
-
-   eautoreconf
-}
-
-src_configure() {
-   filter-flags -fprefetch-loop-arrays
-   filter-mfpmath sse
-
-   econf \
-   --prefix=/usr/$(get_libdir)/firebird \
-   $(use_enable superserver superserver) \
-   $(use_enable debug) \
-   --with-editline \
-   --with-system-editline \
-   --with-system-icu \
-   --with-fbbin=/usr/bin \
-   --with-fbsbin=/usr/sbin \
-   --with-fbconf=/etc/${PN} \
-   --with-fblib=/usr/$(get_libdir) \
-   --with-fbinclude=/usr/include \
-   --with-fbdoc=/usr/share/doc/${P} \
-   --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-   --with-fbsample=/usr/share/doc/${P}/examples \
-   --with-fbsample-db=/usr/share/doc/${P}/examples/db \
-   --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-   --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-   --with-fbmisc=/usr/share/${PN} \
-   --with-fbsecure-db=/etc/${PN} \
-   --with-fbmsg=/usr/$(get_libdir)/${PN} \
-   --with-fblog=/var/log/${PN}/ \
-   --with-fbglock=/var/run/${PN} \
-   --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-   --with-gnu-ld \
-   ${myconf}
-}
-
-src_compile() {
-   MAKEOPTS="${MAKEOPTS/-j*/-j1}

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/

2015-09-23 Thread Patrice Clement 
commit: 7308dd669a4bd377618684e8bf65c2b2ee09f82f
Author: William L. Thomson Jr  o-sinc  com>
AuthorDate: Thu Sep 17 22:26:50 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep 17 22:26:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7308dd66

dev-db/firebird: Correcting file permissions of logrotate file, fixes bug# 
547442

 dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild | 287 +++
 1 file changed, 287 insertions(+)

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild 
b/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
new file mode 100644
index 000..281bae6
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+
+DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
+HOMEPAGE="http://www.firebirdsql.org/;
+SRC_URI="
+   mirror://sourceforge/firebird/${MY_P}.tar.bz2
+doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+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 )
+"
+
+CDEPEND="
+   dev-libs/libedit
+   dev-libs/icu:=
+"
+DEPEND="${CDEPEND}
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+RDEPEND="${CDEPEND}
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+RESTRICT="userpriv"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+   enewgroup firebird 450
+   enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+}
+
+function check_sed() {
+   MSG="sed of $3, required $2 lines modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   # This patch might be portable, and not need to be duplicated per 
version
+   # also might no longer be necessary to patch deps or libs, just flags
+   epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+
+   use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+   use superserver || epatch 
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w /dev/stdout' \
+   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
+
+   find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
+   rm -rf "${S}"/extern/{btyacc,editline,icu} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -fprefetch-loop-arrays
+   filter-mfpmath sse
+
+   econf \
+   --prefix=/usr/$(get_libdir)/firebird \
+   $(use_enable superserver superserver) \
+   $(use_enable debug) \
+   --with-editline \
+   --with-system-editline \
+   --with-system-icu \
+   --with-fbbin=/usr/bin \
+   --with-fbsbin=/usr/sbin \
+   --with-fbconf=/etc/${PN} \
+   --with-fblib=/usr/$(get_libdir) \
+   --with-fbinclude=/usr/include \
+   --with-fbdoc=/usr/share/doc/${P} \
+   --with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
+   --with-fbsample=/usr/share/doc/${P}/examples \
+   --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+   --with-fbhelp=/usr/$(get_libdir)/${PN}/help \
+   --with-fbintl=/usr/$(get_libdir)/${PN}/intl \
+   --with-fbmisc=/usr/share/${PN} \
+   --with-fbsecure-db=/etc/${PN} \
+   --with-fbmsg=/usr/$(get_libdir)/${PN} \
+   --with-fblog=/var/log/${PN}/ \
+   --with-fbglock=/var/run/${PN} \
+   --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
+   --with-gnu-ld \
+   ${myconf}
+}
+
+src_compile() {
+