From c86e86ac4d7e008faf00990bbb9904e6b41faea0 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Tue, 15 May 2007 21:08:33 +0000 Subject: House cleaning removed older versions and unused patches (Portage version: 2.1.2.7) --- dev-db/firebird/ChangeLog | 8 +- dev-db/firebird/files/70firebird-1.5.0 | 2 - dev-db/firebird/files/digest-firebird-1.5.3-r1 | 12 - dev-db/firebird/files/digest-firebird-1.5.4 | 12 - dev-db/firebird/files/firebird-1.5-build.patch | 50 ---- dev-db/firebird/files/firebird-1.5.1-gcc34.patch | 143 ------------ dev-db/firebird/files/firebird-1.5.3-gcc412.patch | 73 ------ dev-db/firebird/firebird-1.5.3-r1.ebuild | 249 -------------------- dev-db/firebird/firebird-1.5.4.ebuild | 263 ---------------------- 9 files changed, 7 insertions(+), 805 deletions(-) delete mode 100644 dev-db/firebird/files/70firebird-1.5.0 delete mode 100644 dev-db/firebird/files/digest-firebird-1.5.3-r1 delete mode 100644 dev-db/firebird/files/digest-firebird-1.5.4 delete mode 100644 dev-db/firebird/files/firebird-1.5-build.patch delete mode 100644 dev-db/firebird/files/firebird-1.5.1-gcc34.patch delete mode 100644 dev-db/firebird/files/firebird-1.5.3-gcc412.patch delete mode 100644 dev-db/firebird/firebird-1.5.3-r1.ebuild delete mode 100644 dev-db/firebird/firebird-1.5.4.ebuild (limited to 'dev-db/firebird') diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index 3fe472766a03..f9b32165c6c5 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/firebird # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.59 2007/05/15 11:54:16 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.60 2007/05/15 21:08:33 wltjr Exp $ + + 15 May 2007; William L. Thomson Jr. + -files/70firebird-1.5.0, -files/firebird-1.5.1-gcc34.patch, + -files/firebird-1.5.3-gcc412.patch, -files/firebird-1.5-build.patch, + -firebird-1.5.3-r1.ebuild, -firebird-1.5.4.ebuild: + House cleaning removed older versions and unused patches 15 May 2007; Ferris McCormick firebird-1.5.4-r2.ebuild: diff --git a/dev-db/firebird/files/70firebird-1.5.0 b/dev-db/firebird/files/70firebird-1.5.0 deleted file mode 100644 index eebf96b9f0b1..000000000000 --- a/dev-db/firebird/files/70firebird-1.5.0 +++ /dev/null @@ -1,2 +0,0 @@ -PATH=/opt/firebird/bin -ROOTPATH=/opt/firebird/bin diff --git a/dev-db/firebird/files/digest-firebird-1.5.3-r1 b/dev-db/firebird/files/digest-firebird-1.5.3-r1 deleted file mode 100644 index 98428bd941ef..000000000000 --- a/dev-db/firebird/files/digest-firebird-1.5.3-r1 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637 -RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637 -SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637 -MD5 1100147a18b2127f6afd7083f829d62e firebird-1.5-gcc4.patch.bz2 21974 -RMD160 c7a348dd1fbd08813eebb9487716f4d1a5390576 firebird-1.5-gcc4.patch.bz2 21974 -SHA256 f48e1fbccae15b9367c432e46f06ea9a4b4059de5192386375733764c028776c firebird-1.5-gcc4.patch.bz2 21974 -MD5 559d005ab6622274f9448687f930393c firebird-1.5.3.4870.tar.bz2 5055973 -RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 firebird-1.5.3.4870.tar.bz2 5055973 -SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 firebird-1.5.3.4870.tar.bz2 5055973 -MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848 -RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848 -SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848 diff --git a/dev-db/firebird/files/digest-firebird-1.5.4 b/dev-db/firebird/files/digest-firebird-1.5.4 deleted file mode 100644 index b3e31cc48311..000000000000 --- a/dev-db/firebird/files/digest-firebird-1.5.4 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637 -RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637 -SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637 -MD5 b3530a500074ab5b2a276e37ecd10ccf firebird-1.5.4-debian-patchset.tar.bz2 22696 -RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 firebird-1.5.4-debian-patchset.tar.bz2 22696 -SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea firebird-1.5.4-debian-patchset.tar.bz2 22696 -MD5 6655190f760217845623a75001b6ddd4 firebird-1.5.4.4910.tar.bz2 5087076 -RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 firebird-1.5.4.4910.tar.bz2 5087076 -SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556 firebird-1.5.4.4910.tar.bz2 5087076 -MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848 -RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848 -SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848 diff --git a/dev-db/firebird/files/firebird-1.5-build.patch b/dev-db/firebird/files/firebird-1.5-build.patch deleted file mode 100644 index 5e0ae7305586..000000000000 --- a/dev-db/firebird/files/firebird-1.5-build.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- configure.in -+++ configure.in -@@ -386,7 +386,7 @@ - AC_CHECK_LIB(c,main) - AC_CHECK_LIB(m, main) - AC_CHECK_LIB(crypt, main) --AC_CHECK_LIB(curses, main) -+AC_CHECK_LIB(ncurses, main) - dnl AC_CHECK_LIB(termcap, main) - if test "$EDITLINE_FLG" = "Y"; then - AC_SUBST(EDITLINE_A, -leditline) ---- builds/posix/prefix.linux -+++ builds/posix/prefix.linux -@@ -22,8 +22,8 @@ - - # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion - # you may remove it if engine is getting compiled with any other GCC version --PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC --DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -+PROD_FLAGS=-fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -MMD -fPIC -+DEV_FLAGS=-DLINUX -DDEBUG_GDS_ALLOC -MMD -fPIC -Wall -Wno-switch - - OS_ServerFiles=inet_server.cpp - ---- builds/posix/prefix.linux_amd64 -+++ builds/posix/prefix.linux_amd64 -@@ -20,8 +20,8 @@ - - LD=@CXX@ - --PROD_FLAGS=-ggdb -O3 -fno-omit-frame-pointer -DNDEBUG -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 --DEV_FLAGS=-ggdb -DLINUX -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 -+PROD_FLAGS=-fno-omit-frame-pointer -DNDEBUG -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 -+DEV_FLAGS=-DLINUX -DAMD64 -MMD -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0 - - OS_ServerFiles=inet_server.cpp - ---- builds/posix/prefix.linux_sparc32 -+++ builds/posix/prefix.linux_sparc32 -@@ -22,8 +22,8 @@ - - # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion - # you may remove it if engine is getting compiled with any other GCC version --PROD_FLAGS=-m32 -mcpu=ultrasparc -mtune=ultrasparc -O3 -DNDEBUG -DLINUX -pipe -MMD -fPIC -Dsparc --DEV_FLAGS=-ggdb -m32 -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch -Dsparc -+PROD_FLAGS=-DNDEBUG -DLINUX -MMD -fPIC -Dsparc -+DEV_FLAGS=--DLINUX -DDEBUG_GDS_ALLOC -MMD -fPIC -Wall -Wno-switch -Dsparc - - OS_ServerFiles=inet_server.cpp - diff --git a/dev-db/firebird/files/firebird-1.5.1-gcc34.patch b/dev-db/firebird/files/firebird-1.5.1-gcc34.patch deleted file mode 100644 index e5df4841b3d2..000000000000 --- a/dev-db/firebird/files/firebird-1.5.1-gcc34.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -uNr firebird-1.5.1.4481-orig/src/common/classes/alloc.h firebird-1.5.1.4481/src/common/classes/alloc.h ---- firebird-1.5.1.4481-orig/src/common/classes/alloc.h 2003-10-30 22:25:52.000000000 +0000 -+++ firebird-1.5.1.4481/src/common/classes/alloc.h 2004-09-14 04:12:37.967099632 +0000 -@@ -237,12 +237,17 @@ - // loaded by host application using STL - - // This is to prevent inclusion of header --#ifdef __NEW__ -+#if defined( _NEW ) || defined ( __NEW__ ) - #error "alloc.h must be included before " - #endif -+#define _NEW - #define __NEW__ - namespace std { - class bad_alloc : public exception {}; -+#if ( __GNUC__ > 3) || ((__GNUC__==3) && __GNUC_MINOR__ >=4) -+ struct nothrow_t { }; -+ extern const nothrow_t nothrow; -+#endif - } - // Define operators as static inline to prevent replacement of STL versions - static inline void* operator new(size_t s) { -@@ -258,6 +263,21 @@ - ); - } - -+#if ( __GNUC__ > 3) || ((__GNUC__==3) && __GNUC_MINOR__ >=4) -+static inline void* operator new(size_t s, const std::nothrow_t&) { -+#if defined(DEV_BUILD) -+// Do not complain here. It causes client tools to crash on Red Hat 8.0 -+// fprintf(stderr, "You MUST allocate all memory from a pool. Don't use the default global new().\n"); -+#endif // DEV_BUILD -+// return getDefaultMemoryPool()->calloc(s, 0 -+ return getDefaultMemoryPool()->allocate(s, 0 -+#ifdef DEBUG_GDS_ALLOC -+ ,__FILE__,__LINE__ -+#endif -+ ); -+} -+#endif -+ - static inline void* operator new[](size_t s) { - #if defined(DEV_BUILD) - // Do not complain here. It causes client tools to crash on Red Hat 8.0 -diff -uNr firebird-1.5.1.4481-orig/src/common/classes/array.h firebird-1.5.1.4481/src/common/classes/array.h ---- firebird-1.5.1.4481-orig/src/common/classes/array.h 2004-03-29 07:40:23.000000000 +0000 -+++ firebird-1.5.1.4481/src/common/classes/array.h 2004-09-14 04:10:26.267121072 +0000 -@@ -60,15 +60,15 @@ - class Array : private Storage { - public: - Array(MemoryPool* p) : -- count(0), capacity(getStorageSize()), data(getStorage()), pool(p) {} -+ count(0), capacity(Storage::getStorageSize()), data(Storage::getStorage()), pool(p) {} - Array(MemoryPool* p, int InitialCapacity) : count(0), -- capacity(getStorageSize()), data(getStorage()), pool(p) -+ capacity(Storage::getStorageSize()), data(Storage::getStorage()), pool(p) - { - ensureCapacity(InitialCapacity); - } - ~Array() - { -- if (data != getStorage()) -+ if (data != Storage::getStorage()) - pool->deallocate(data); - } - void clear() { count = 0; }; -@@ -170,7 +170,7 @@ - #endif - )); - memcpy(newdata, data, sizeof(T) * count); -- if (data != getStorage()) -+ if (data != Storage::getStorage()) - pool->deallocate(data); - data = newdata; - capacity = newcapacity; -@@ -188,17 +188,17 @@ - SortedArray(MemoryPool* p, int s) : Array(p, s) {} - SortedArray(MemoryPool* p) : Array(p) {} - bool find(const Key& item, int& pos) { -- int highBound = count, lowBound = 0; -+ int highBound = Array::count, lowBound = 0; - while (highBound > lowBound) { - int temp = (highBound + lowBound) >> 1; -- if (Cmp::compare(item, KeyOfValue::generate(this, data[temp]))) -+ if (Cmp::compare(item, KeyOfValue::generate(this, Array::data[temp]))) - lowBound = temp + 1; - else - highBound = temp; - } - pos = lowBound; -- return highBound != count && -- !Cmp::compare(KeyOfValue::generate(this, data[lowBound]), item); -+ return highBound != Array::count && -+ !Cmp::compare(KeyOfValue::generate(this, Array::data[lowBound]), item); - } - int add(const Value& item) { - int pos; -diff -uNr firebird-1.5.1.4481-orig/src/common/classes/tree.h firebird-1.5.1.4481/src/common/classes/tree.h ---- firebird-1.5.1.4481-orig/src/common/classes/tree.h 2003-10-30 22:25:52.000000000 +0000 -+++ firebird-1.5.1.4481/src/common/classes/tree.h 2004-09-14 04:10:26.268120920 +0000 -@@ -215,7 +215,7 @@ - } - Value& current() const { return (*curr)[curPos]; } - Value& getAddErrorValue() { return addErrorValue; } -- int getCount() const { return count; } -+// int getCount() const { return count; } - private: - BePlusTree(Allocator *_pool, void *rootPage) : pool(_pool), level(0), - curr(new(rootPage) ItemList()), root(rootPage), curPos(0)/*, count(0)*/ {}; -@@ -260,7 +260,7 @@ - static const Key& generate(void *sender, void *item) { - for (int lev = ((NodeList *)sender)->level; lev > 0; lev--) - item = *((NodeList *)item)->begin(); -- return KeyOfValue::generate(item,*((BePlusTree::ItemList *)item)->begin()); -+ return KeyOfValue::generate(item,*(reinterpret_cast::ItemList *>(item))->begin()); - } - static void setNodeParentAndLevel(void *node, int level, NodeList *parent) { - if (level) { -diff -uNr firebird-1.5.1.4481-orig/src/common/classes/vector.h firebird-1.5.1.4481/src/common/classes/vector.h ---- firebird-1.5.1.4481-orig/src/common/classes/vector.h 2002-12-14 21:43:18.000000000 +0000 -+++ firebird-1.5.1.4481/src/common/classes/vector.h 2004-09-14 04:10:26.268120920 +0000 -@@ -100,17 +100,17 @@ - public: - SortedVector() : Vector() {} - bool find(const Key& item, int& pos) { -- int highBound=count, lowBound=0; -+ int highBound=Vector::count, lowBound=0; - while (highBound > lowBound) { - int temp = (highBound + lowBound) >> 1; -- if (Cmp::compare(item, KeyOfValue::generate(this,data[temp]))) -+ if (Cmp::compare(item, KeyOfValue::generate(this,Vector::data[temp]))) - lowBound = temp+1; - else - highBound = temp; - } - pos = lowBound; -- return highBound != count && -- !Cmp::compare(KeyOfValue::generate(this,data[lowBound]), item); -+ return highBound != Vector::count && -+ !Cmp::compare(KeyOfValue::generate(this,Vector::data[lowBound]), item); - } - int add(const Value& item) { - int pos; diff --git a/dev-db/firebird/files/firebird-1.5.3-gcc412.patch b/dev-db/firebird/files/firebird-1.5.3-gcc412.patch deleted file mode 100644 index 4b5e901d29f9..000000000000 --- a/dev-db/firebird/files/firebird-1.5.3-gcc412.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urNad stable~/src/jrd/jrd.cpp stable/src/jrd/jrd.cpp ---- stable~/src/jrd/jrd.cpp 2006-10-18 21:47:43.000000000 +0300 -+++ stable/src/jrd/jrd.cpp 2006-10-18 21:47:43.000000000 +0300 -@@ -135,14 +135,14 @@ - #endif - - #ifdef SERVER_SHUTDOWN --extern "C" { -+//extern "C" { - typedef struct dbf { - struct dbf *dbf_next; - USHORT dbf_length; - TEXT dbf_data[2]; - } *DBF; - --} // extern "C" -+//} // extern "C" - - #include "../jrd/sort.h" - #endif /* SERVER_SHUTDOWN */ -@@ -159,9 +159,9 @@ - /*TMN: fwd. decl. SHOULD BE IN A HEADER FILE*/ - void ALL_print_memory_pool_info(IB_FILE * fptr, DBB databases); - void ALLD_print_memory_pool_info(IB_FILE * fptr); --extern "C" { -+//extern "C" { - void gds_print_delta_counters(IB_FILE *); --} // extern "C" -+//} // extern "C" - - #endif /* SUPERSERVER */ - -@@ -201,10 +201,10 @@ - - #ifdef SUPERSERVER - --extern "C" { -+//extern "C" { - extern SLONG trace_pools; - static REC_MUTX_T databases_rec_mutex; --} // extern "C" -+//} // extern "C" - - // BRS. 03/23/2003 - // Those empty defines was substituted with #if defined(V4_THREADING) && !defined(SUPERSERVER) -@@ -289,7 +289,7 @@ - return TRUE; - } - --extern "C" { -+//extern "C" { - - - #ifdef WIN_NT -@@ -592,10 +592,10 @@ - - - #ifdef SHLIB_DEFS --} // extern "C" -+//} // extern "C" - /** Use shdef.h which has all shared lib defs **/ - #include "shdef.h" --extern "C" { -+//extern "C" { - #endif - - -@@ -6620,4 +6620,4 @@ - return true; - } - --} // extern "C" -+//} // extern "C" diff --git a/dev-db/firebird/firebird-1.5.3-r1.ebuild b/dev-db/firebird/firebird-1.5.3-r1.ebuild deleted file mode 100644 index f36863de64b2..000000000000 --- a/dev-db/firebird/firebird-1.5.3-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.12 2007/04/28 21:58:33 tove Exp $ - -inherit flag-o-matic eutils - -extra_ver="4870" -MY_P=${P}.${extra_ver} -DESCRIPTION="A relational database offering many ANSI SQL-99 features" -HOMEPAGE="http://firebird.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - mirror://gentoo/${PN}-1.5-gcc4.patch.bz2 - doc? ( http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf - ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" - -LICENSE="Interbase-1.0" -SLOT="0" -KEYWORDS="~amd64 -ia64 sparc x86" -IUSE="xinetd doc" -RESTRICT="nouserpriv" - -RDEPEND="xinetd? ( virtual/inetd )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" - -S="${WORKDIR}"/${MY_P} - -pkg_setup() { - enewgroup firebird 450 - enewuser firebird 450 /bin/bash /opt/firebird firebird -} - -src_unpack() { - if use doc; then - # Unpack docs - mkdir ${WORKDIR}/manuals - cd ${WORKDIR}/manuals - unpack ib_b60_doc.zip - cd ${WORKDIR} - fi - - unpack ${MY_P}.tar.bz2 - unpack ${PN}-1.5-gcc4.patch.bz2 - cd ${S} - - epatch ${FILESDIR}/${PN}-1.5-build.patch - epatch ${WORKDIR}/${PN}-1.5-gcc4.patch - # Bug #167051 - epatch ${FILESDIR}/${P}-gcc412.patch - - # This file must be regenerated during build - rm ${S}/src/dsql/parse.cpp -} - -src_compile() { - # fix bug #33584 - #strip-flags -funroll-loops - # but Meir intended "filter-flags -funroll-loops"; awaiting bug reports... - - filter-flags -fprefetch-loop-arrays - filter-mfpmath sse - - local myconf="--prefix=/opt/firebird --with-editline" - use xinetd || myconf="${myconf} --enable-superserver" - - NOCONFIGURE=1 - ./autogen.sh ${myconf} || die "couldn't run autogen.sh" - find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \; - econf ${myconf} || die "./configure failed" - emake -j 1 || die "error during make" -} - -src_install() { - cd ${S}/gen - make -f Makefile.install tarfile || die "Can't create buildroot tar file" - cd ${D} - tar zxpf ${S}/gen/Firebird?S-*/buildroot.tar.gz - - dodoc ${D}/opt/firebird/{README,WhatsNew,doc/*} - docinto examples - dodoc ${D}/opt/firebird/examples/* - docinto sql.extensions - dodoc ${D}/opt/firebird/doc/sql.extensions/* - - rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc} - rm -r ${D}/opt/firebird/examples - - if use xinetd ; then - insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird - else - newinitd ${FILESDIR}/${PN}.init.d firebird - newconfd ${FILESDIR}/firebird.conf.d firebird - fperms 640 /etc/conf.d/firebird - fi - newenvd ${FILESDIR}/70${PN} 70firebird - - # Following is adapted from postinstall.sh - - # make sure everything is owned by firebird - chown -R firebird:firebird ${D}/opt/firebird - - # make sure permissions are set - chmod -R o= ${D}/opt/firebird - - # fix directories - find ${D}/opt/firebird -print -type d | xargs chmod o=rx - - # set permissions for /bin - cd ${D}/opt/firebird/bin - chmod ug=rx,o= * - chmod a=rx isql - chmod a=rx qli - - use xinetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server} - chmod u=rw,go=r ${D}/opt/firebird/{aliases.conf,firebird.conf} - chmod ug=rw,o= ${D}/opt/firebird/{security.fdb,help/help.fdb} - - for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done - chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so} - - # create links for back compatibility - dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so - dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0 - dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so - dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0 - - # move and link config files to /etc/firebird so they'll be protected - dodir /etc/firebird - mv ${D}/opt/firebird/{security.fdb,aliases.conf,firebird.conf} ${D}/etc/firebird - dosym /etc/firebird/security.fdb /opt/firebird/security.fdb - dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf - dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf - - # Install docs - if use doc; then - dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf - dodoc ${WORKDIR}/manuals/* - fi -} - -pkg_postinst() { - elog - elog "1. If haven't done so already, please run:" - elog - elog " \"emerge --config =${PF}\"" - elog - elog " to create lockfiles, set permissions and more" - elog - elog "2. Firebird now runs with it's own user. Please remember to" - elog " set permissions to firebird:firebird on databases you " - elog " already have (if any)." - elog - - if ! use xinetd - then - elog "3. You've built the stand alone deamon version," - elog " SuperServer. If you were using pre 1.5.0 ebuilds" - elog " you're probably have one installed via xinetd. please" - elog " remember to disable it (usually in /etc/xinetd.d/firebird)," - elog " since the current one has it's own init script under" - elog " /etc/init.d" - fi -} - -pkg_config() { - cd /opt/firebird - - # Create Lock files - for i in isc_init1 isc_lock1 isc_event1 - do - FileName=$i.`hostname` - touch $FileName - chown firebird:firebird $FileName - chmod ug=rw,o= $FileName - done - - # Create log - if [ ! -h firebird.log ] - then - if [ -f firebird.log ] - then - mv firebird.log /var/log - else - touch /var/log/firebird.log - chown firebird:firebird /var/log/firebird.log - chmod ug=rw,o= /var/log/firebird.log - fi - - # symlink the log to /var/log - ln -s /var/log/firebird.log firebird.log - fi - - # add gds_db to /etc/services - if [ -z "`grep gds_db /etc/services`" ] - then - echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services - echo "gds_db 3050/tcp" >> /etc/services - einfo "added gds_db to /etc/services" - fi - - # if found /etc/isc4.gdb from previous install, backup, and restore as - # /etc/security.fdb - if [ -f /etc/firebird/isc4.gdb ] - then - # if we have scurity.fdb already, back it 1st - if [ -f /etc/firebird/security.fdb ] - then - cp /etc/firebird/security.fdb /etc/firebird/security.fdb.old - fi - gbak -B /etc/firebird/isc4.gdb /etc/firebird/isc4.gbk - gbak -R /etc/firebird/isc4.gbk /etc/firebird/security.fdb - mv /etc/firebird/isc4.gdb /etc/firebird/isc4.gdb.old - rm /etc/firebird/isc4.gbk - - # make sure they are readable only to firebird - chown firebird:firebird /etc/firebird/{isc4.*,security.*} - chmod 660 /etc/firebird/{isc4.*,security.*} - - elog - elog "Converted old isc4.gdb to security.fdb, isc4.gdb has been " - elog "renamed to isc4.gdb.old. if you had previous security.fdb, " - elog "it's backed to security.fdb.old (all under /etc/firebird)." - elog - fi - - # we need to enable local access to the server - if [ ! -f /etc/hosts.equiv ] - then - touch /etc/hosts.equiv - chown root:0 /etc/hosts.equiv - chmod u=rw,go=r /etc/hosts.equiv - fi - - if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ] - then - echo "localhost" >> /etc/hosts.equiv - einfo "Added localhost to /etc/hosts.equiv" - fi - - HS_NAME=`hostname` - if [ -z "`grep ${HS_NAME} /etc/hosts.equiv`" ] - then - echo "${HS_NAME}" >> /etc/hosts.equiv - einfo "Added ${HS_NAME} to /etc/hosts.equiv" - fi - - elog "If you're using UDFs, please remember to move them" - elog "to /opt/firebird/UDF" -} diff --git a/dev-db/firebird/firebird-1.5.4.ebuild b/dev-db/firebird/firebird-1.5.4.ebuild deleted file mode 100644 index 9364c6f01218..000000000000 --- a/dev-db/firebird/firebird-1.5.4.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4.ebuild,v 1.2 2007/05/11 16:02:48 armin76 Exp $ - -inherit flag-o-matic eutils - -extra_ver="4910" -MY_P=${P}.${extra_ver} -DESCRIPTION="A relational database offering many ANSI SQL-99 features." -HOMEPAGE="http://firebird.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 - mirror://gentoo/firebird-1.5.4-debian-patchset.tar.bz2 - doc? ( http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf - ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" - -LICENSE="Interbase-1.0" -SLOT="0" -KEYWORDS="~amd64 -ia64 ~sparc x86" -IUSE="xinetd doc" -RESTRICT="nouserpriv" - -RDEPEND="xinetd? ( virtual/inetd )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" - - -S="${WORKDIR}"/${MY_P} - -pkg_setup() { - enewgroup firebird 450 - enewuser firebird 450 /bin/bash /opt/firebird firebird -} - -src_unpack() { - if use doc; then - # Unpack docs - mkdir ${WORKDIR}/manuals - cd ${WORKDIR}/manuals - unpack ib_b60_doc.zip - cd ${WORKDIR} - fi - - unpack ${MY_P}.tar.bz2 - unpack firebird-1.5.4-debian-patchset.tar.bz2 - cd ${S} - - for p in $(ls ${WORKDIR}/patches) ; do - epatch ${WORKDIR}/patches/${p} || die "Patch did not apply." - done - - # This file must be regenerated during build - rm ${S}/src/dsql/parse.cpp -} - -src_compile() { - # fix bug #33584 - #strip-flags -funroll-loops - # but Meir intended "filter-flags -funroll-loops"; awaiting bug reports... - - filter-flags -fprefetch-loop-arrays - filter-mfpmath sse - - local myconf="--prefix=/opt/firebird --with-editline" - use xinetd || myconf="${myconf} --enable-superserver" - - NOCONFIGURE=1 - - ./autogen.sh ${myconf} || die "couldn't run autogen.sh" - - find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \; - - econf ${myconf} || die "./configure failed" - emake -j 1 || die "error during make" -} - -src_install() { - cd ${S}/gen - make -f Makefile.install tarfile || die "Can't create buildroot tar file" - cd ${D} - tar zxpf ${S}/gen/Firebird?S-*/buildroot.tar.gz - - dodoc ${D}/opt/firebird/{README,WhatsNew,doc/*} - docinto examples - dodoc ${D}/opt/firebird/examples/* - docinto sql.extensions - dodoc ${D}/opt/firebird/doc/sql.extensions/* - - rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc} - rm -r ${D}/opt/firebird/examples - - if use xinetd ; then - insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird - else - exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird - insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird - fperms 640 /etc/conf.d/firebird - fi - insinto /etc/env.d ; newins ${FILESDIR}/70${PN} 70firebird - - # Following is adapted from postinstall.sh - - dodir /opt/firebird/run - keepdir /opt/firebird/run - - # make sure everything is owned by firebird - chown -R firebird:firebird ${D}/opt/firebird - - # make sure permissions are set - chmod -R o= ${D}/opt/firebird - - # fix directories - find ${D}/opt/firebird -print -type d | xargs chmod o=rx - - # set permissions for /bin - cd ${D}/opt/firebird/bin - chmod ug=rx,o= * - chmod a=rx isql - chmod a=rx qli - - use xinetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server} - chmod u=rw,go=r ${D}/opt/firebird/{aliases.conf,firebird.conf} - chmod ug=rw,o= ${D}/opt/firebird/{security.fdb,help/help.fdb} - - for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done - chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so} - - # create links for back compatibility - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0 - dosym ./libfbclient.so /opt/firebird/lib/libgds.so - dosym ./libfbclient.so /opt/firebird/lib/libgds.so.0 - - # we want relative symlinks... - rm /usr/lib/libfbclient.so - rm /usr/lib/libfbclient.so.1 - rm /usr/lib/libfbclient.so.1.5.4 - dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libfbclient.so - dosym ../../opt/firebird/lib/libfbclient.so.1 /usr/lib/libfbclient.so.1 - dosym ../../opt/firebird/lib/libfbclient.so.1.5.4 /usr/lib/libfbclient.so.1.5.4 - - # move and link config files to /etc/firebird so they'll be protected - dodir /etc/firebird - mv ${D}/opt/firebird/{security.fdb,aliases.conf,firebird.conf} ${D}/etc/firebird - dosym ../../etc/firebird/security.fdb /opt/firebird/security.fdb - dosym ../../etc/firebird/aliases.conf /opt/firebird/aliases.conf - dosym ../../etc/firebird/firebird.conf /opt/firebird/firebird.conf - - # Install docs - if use doc; then - dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf - dodoc ${WORKDIR}/manuals/* - fi -} - -pkg_postinst() { - elog - elog "1. If haven't done so already, please run:" - elog - elog " \"emerge --config =${PF}\"" - elog - elog " to create lockfiles, set permissions and more" - elog - elog "2. Firebird now runs with it's own user. Please remember to" - elog " set permissions to firebird:firebird on databases you " - elog " already have (if any)." - elog - - if ! use xinetd - then - elog "3. You've built the stand alone deamon version," - elog " SuperServer. If you were using pre 1.5.0 ebuilds" - elog " you're probably have one installed via xinetd. please" - elog " remember to disable it (usually in /etc/xinetd.d/firebird)," - elog " since the current one has it's own init script under" - elog " /etc/init.d" - fi -} - -pkg_config() { - cd /opt/firebird - - # Create Lock files - for i in isc_init1 isc_lock1 isc_event1 - do - FileName=$i.`hostname` - touch $FileName - chown firebird:firebird $FileName - chmod ug=rw,o= $FileName - done - - # Create log - if [ ! -h firebird.log ] - then - if [ -f firebird.log ] - then - mv firebird.log /var/log - else - touch /var/log/firebird.log - chown firebird:firebird /var/log/firebird.log - chmod ug=rw,o= /var/log/firebird.log - fi - - # symlink the log to /var/log - ln -s /var/log/firebird.log firebird.log - fi - - # add gds_db to /etc/services - if [ -z "`grep gds_db /etc/services`" ] - then - echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services - echo "gds_db 3050/tcp" >> /etc/services - einfo "added gds_db to /etc/services" - fi - - # if found /etc/isc4.gdb from previous install, backup, and restore as - # /etc/security.fdb - if [ -f /etc/firebird/isc4.gdb ] - then - # if we have scurity.fdb already, back it 1st - if [ -f /etc/firebird/security.fdb ] - then - cp /etc/firebird/security.fdb /etc/firebird/security.fdb.old - fi - gbak -B /etc/firebird/isc4.gdb /etc/firebird/isc4.gbk - gbak -R /etc/firebird/isc4.gbk /etc/firebird/security.fdb - mv /etc/firebird/isc4.gdb /etc/firebird/isc4.gdb.old - rm /etc/firebird/isc4.gbk - - # make sure they are readable only to firebird - chown firebird:firebird /etc/firebird/{isc4.*,security.*} - chmod 660 /etc/firebird/{isc4.*,security.*} - - elog - elog "Converted old isc4.gdb to security.fdb, isc4.gdb has been " - elog "renamed to isc4.gdb.old. if you had previous security.fdb, " - elog "it's backed to security.fdb.old (all under /etc/firebird)." - elog - fi - - # we need to enable local access to the server - if [ ! -f /etc/hosts.equiv ] - then - touch /etc/hosts.equiv - chown root:0 /etc/hosts.equiv - chmod u=rw,go=r /etc/hosts.equiv - fi - - if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ] - then - echo "localhost" >> /etc/hosts.equiv - einfo "Added localhost to /etc/hosts.equiv" - fi - - HS_NAME=`hostname` - if [ -z "`grep ${HS_NAME} /etc/hosts.equiv`" ] - then - echo "${HS_NAME}" >> /etc/hosts.equiv - einfo "Added ${HS_NAME} to /etc/hosts.equiv" - fi - - elog "If you're using UDFs, please remember to move them" - elog "to /opt/firebird/UDF" -} -- cgit v1.2.3-65-gdbad