commit:     9bfb7bb7f9121230652d962aa9988baba5ee6afc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 19:06:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 19:08:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfb7bb7

dev-db/firebird: drop 3.0.4.33054.0-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-db/firebird/Manifest                           |   2 -
 .../firebird-3.0.2.32703.0-cloop-compiler.patch    |  15 --
 .../files/firebird-3.0.2.32703.0-unbundle.patch    |  51 -----
 dev-db/firebird/files/firebird.init.d.3.0          |  22 --
 dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild   | 232 ---------------------
 5 files changed, 322 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index db16ce7c41f4..ea49b543f4f7 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,5 +1,4 @@
 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
@@ -14,5 +13,4 @@ DIST firebird-isql.pdf 369327 BLAKE2B 
3ea02b7a7b97bf231d43906f2fc8feb79aba525f1c
 DIST firebird-metadata-security.pdf 117765 BLAKE2B 
67075db42cca196f019eef15fd2474be6d92353f0697b134ee5d3bb1e4cc6cd5c38cd978236f289d6c9cc300d9ebc5ee856ad871f1bd1816b7d92d46ee0cffe3
 SHA512 
8f24ff48ff177fdd98dfc1272f43de979fc405139475bd630a8f1c10feaf773425c85704194b8245235c2c61c0f7ebaf9d0d1741b68323146630a1361ed478a4
 DIST firebird-nbackup.pdf 202108 BLAKE2B 
5ee794890f69935ec238d946649d05a72c3108674781af546e279e3d6cbbb82bbf81789270ad284a365f05cc6fdbca108baf86c5cb4eeacd242960e12e54d6b2
 SHA512 
c8e83a8e2bf23f3bcb17277b07eb822d1ae2ed412d6d1881f60c7c3003f60f1b6fe09e5dd52367c62a9311f9a7057fe4c85dd0c64a93554556f31cefc45e18c1
 DIST firebird-null-guide.pdf 487359 BLAKE2B 
346d942b7d4780496c2c212433660415437f6b17a42bb109aaf1cd8a8de31a394a1d2a3b52bb6dc1c3830bc839a692b611c7fe3289243e86ab874a84d989a7b8
 SHA512 
b5b9981a3f15fe933a44deb001d1d85b0dc340ae0ff55e79d160da8590406515f0ba73360a3904556aa36d94cdafb17fe2452b5f63138cb1f585d70842511cd3
-DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 DIST using-firebird.pdf 236646 BLAKE2B 
54b296ac8c6281ff501678a24dac76e203a66e569b1cda7dc475a7fe9bbed9fc03923377c320a621a225d0277fc68cfb9820514d3f12191902cdeb18ccb87270
 SHA512 
ec16c33082524aa5df8907c1143a8707f1193c42882956c220e6c95442d43751ec3e2ba77ded004866f7dab7f58ecf4fac3a0027cf89ec7536c0771260f09cc4

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
deleted file mode 100644
index 363602bed8f4..000000000000
--- a/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-unbundle.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
deleted file mode 100644
index 6fdd657223d4..000000000000
--- a/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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.000000000 +0100
-+++ Firebird-3.0.2.32703-0/builds/posix/Makefile.in    2017-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.000000000 +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/files/firebird.init.d.3.0 
b/dev-db/firebird/files/firebird.init.d.3.0
deleted file mode 100644
index 9fd4f8504769..000000000000
--- a/dev-db/firebird/files/firebird.init.d.3.0
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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/firebird-3.0.4.33054.0-r3.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
deleted file mode 100644
index 6f2ba7ca3b89..000000000000
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2024 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
-
-       # bug #917662, bug #924659
-       filter-lto
-       append-flags -fno-strict-aliasing $(test-flags-CXX -fno-lifetime-dse)
-
-       # 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 
-std=c++11
-
-       local myeconfargs=(
-               --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}
-               --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
-               --with-gnu-ld
-       )
-       econf "${myeconfargs[@]}"
-}
-
-# from linux underground, merging into this here
-src_install() {
-       if use doc; then
-               dodoc -r doc
-               find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc 
'{}' + || die
-       fi
-
-       cd "${S}/gen/Release/${PN}" || die
-
-       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 /usr/$(get_libdir)/libgds.so.0
-       dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-       insinto /usr/share/${PN}/msg
-       doins *.msg
-
-       use server || return
-
-       einfo "Renaming isql -> fbsql"
-       mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
-
-       dobin 
bin/{fb_config,fbsql,fbsvcmgr,fbtracemgr,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup,qli}
-       dosbin bin/{firebird,fbguard,fb_lock_print}
-
-       insinto /usr/share/${PN}/help
-       # why???
-       insopts -m0660 -o firebird -g firebird
-       doins help/help.fdb
-
-       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
-       insopts -m0644 -o root -g root
-       doins intl/fbintl.conf
-
-       # plugins
-       exeinto /usr/$(get_libdir)/${PN}/plugins
-       doexe plugins/*.so
-       exeinto /usr/$(get_libdir)/${PN}/plugins/udr
-       doexe plugins/udr/*.so
-
-       exeinto /usr/$(get_libdir)/${PN}/UDF
-       doexe UDF/*.so
-
-       # logging (do we really need the perms?)
-       diropts -m 755 -o firebird -g firebird
-       dodir /var/log/${PN}
-       keepdir /var/log/${PN}
-
-       # logrotate
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-       # configuration files
-       insinto /etc/${PN}/plugins
-       doins plugins/udr_engine.conf
-       insinto /etc/${PN}
-       doins {databases,fbtrace,firebird,plugins}.conf
-
-       # install secutity3.fdb
-       insopts -m0660 -o firebird -g firebird
-       doins security3.fdb
-
-       if use xinetd; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}/${PN}.xinetd.3.0" ${PN}
-       else
-               newinitd "${FILESDIR}/${PN}.init.d.3.0" ${PN}
-       fi
-
-       if use examples; then
-               cd examples || die
-               insinto /usr/share/${PN}/examples
-               insopts -m0644 -o root -g root
-               doins -r api
-               doins -r dbcrypt
-               doins -r include
-               doins -r interfaces
-               doins -r package
-               doins -r stat
-               doins -r udf
-               doins -r udr
-               doins CMakeLists.txt
-               doins functions.c
-               doins README
-               insinto /usr/share/${PN}/examples/empbuild
-               insopts -m0660 -o firebird -g firebird
-               doins empbuild/employee.fdb
-       fi
-
-       elog "Starting with version 3, server mode is set in firebird.conf"
-       elog "The default setting is superserver."
-       elog
-       elog "If you're using UDFs, please remember to move them to 
/usr/$(get_libdir)/firebird/UDF"
-}

Reply via email to