commit: 2f1b7fab01208fea762ce9b179d2f55095c1381b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Aug 16 07:40:15 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 16 08:24:20 2019 +0000 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 <asturm <AT> 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..00000000000 --- a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 3618aa2171674babf79ef935aa049c40a3db1321 -Author: asfernandes <[email protected]> -Date: Sat Mar 5 03:39:36 2016 +0000 - - 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..00000000000 --- 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" - 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 - - # 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 - - 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} \ - --with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \ - --with-gnu-ld \ - ${myconf} -} - -# 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 - 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 - - einfo - elog "Starting with version 3, server mode is set in firebird.conf" - elog "The default setting is superserver." - einfo - elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF" - einfo - ewarn "${CATEGORY}/${PF} is still a tad experimental. Please test and file bugs!" -}
