From 86a9749eab2037ee23514da4a596e1662e02c967 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 16 Jan 2010 09:56:06 +0000 Subject: [PATCH] dev-db/libflaim: Bump git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1856 6952d904-891a-0410-993b-d76249ca496b --- dev-db/libflaim/ChangeLog | 10 +++- dev-db/libflaim/Manifest | 5 +- .../libflaim-4.9.1052-fortify-source.patch | 46 +++++++++++++++++++ .../files/libflaim-4.9.1052-gcc43.patch | 24 ++++++++++ .../files/libflaim-4.9.1052-gcc44.patch | 12 +++++ .../libflaim-4.9.1052-no-ldconfig-1.patch | 40 ++++++++++++++++ dev-db/libflaim/libflaim-4.10_pre1111.ebuild | 38 +++++++++++++++ dev-db/libflaim/libflaim-4.9.1052.ebuild | 45 ++++++++++++++++++ 8 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch create mode 100644 dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch create mode 100644 dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch create mode 100644 dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch create mode 100644 dev-db/libflaim/libflaim-4.10_pre1111.ebuild create mode 100644 dev-db/libflaim/libflaim-4.9.1052.ebuild diff --git a/dev-db/libflaim/ChangeLog b/dev-db/libflaim/ChangeLog index f125630..21307ca 100644 --- a/dev-db/libflaim/ChangeLog +++ b/dev-db/libflaim/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for dev-db/libflaim -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jan 2010; Mario Fetka + +libflaim-4.9.1052.ebuild, +files/libflaim-4.9.1052-fortify-source.patch, + +files/libflaim-4.9.1052-gcc43.patch, + +files/libflaim-4.9.1052-gcc44.patch, + +files/libflaim-4.9.1052-no-ldconfig-1.patch, + +libflaim-4.10_pre1111.ebuild: + Bump + 05 Dec 2009; Mario Fetka libflaim-4.9.1046.ebuild: add my mirror diff --git a/dev-db/libflaim/Manifest b/dev-db/libflaim/Manifest index 116e8d3..1f271da 100644 --- a/dev-db/libflaim/Manifest +++ b/dev-db/libflaim/Manifest @@ -15,7 +15,8 @@ EBUILD libflaim-4.10_pre1084.ebuild 918 RMD160 8c72b3cb944f44bb6539453e7c83270b8 EBUILD libflaim-4.10_pre1106.ebuild 946 RMD160 fe87e519a1aa4d364717ade96561f9077104ec90 SHA1 e52ed144944525e4de37e6ed22345beb4aa8fdf3 SHA256 2e00130e5b032a7f0642435aac726248c1fbbbc7515a18216b08b8713834f721 EBUILD libflaim-4.10_pre1107.ebuild 978 RMD160 f80ba01b71252ab8598046b2e75d1054753dc3b6 SHA1 2fadd5f069e14a25c84c5ca6d9187d16e17726e9 SHA256 44488467016f0a0f1190c7c0117a2196e8603c8bbbae545f75300e7dad27fbc7 EBUILD libflaim-4.10_pre1110.ebuild 964 RMD160 947d4ff677096effb10e9100061d4cf3c79a618d SHA1 321eecff42f11be96f65c0fe5fd7e00dbd817677 SHA256 6fb15571fe2dfa020f8a55ff2d1b37bdc8b2f7ec455d966c2880ff1c75f963fa +EBUILD libflaim-4.10_pre1111.ebuild 964 RMD160 28c96e080bd09b83965ccc59c11d94b255f9f4e2 SHA1 0c24f62b1468aeed772e8111d3f4670f794105eb SHA256 0e103ab94f39d223e4f887afffcc92b77832c92239337c4d9bfb50c0cacdc414 EBUILD libflaim-4.9.1046.ebuild 1063 RMD160 62908cda4ef8c81eddca69d18a651e17ad185ee8 SHA1 4fe1c54859deabb49549805f798d8349dad71df9 SHA256 b10e03553d759292b2d3ce214f7526c713b87092739597c25c9b3bf90826eacf -EBUILD libflaim-4.9.1052.ebuild 1210 RMD160 1db072a0da029c77d7438325ca64c8bb35baea76 SHA1 aaf6671ddb487cdd93806724b6f312826e770955 SHA256 e156193614c57c640e705be4841f564cf163b07e4bc7f1e077b62730df3d1ae8 -MISC ChangeLog 3031 RMD160 627931f56137d8a08026d406ae352f3bfa4aef6c SHA1 d2b3589307da0a9c88ea1a738ca67a11246d46f4 SHA256 8a0060f6f11825e5bc6a916c42c24a8db709545e4f1bba672c3be7632431add0 +EBUILD libflaim-4.9.1052.ebuild 1210 RMD160 6e5e9f8be9e14698e04a17f5cf9c218da0fb5bc6 SHA1 8482094a331209f30922a639947edfda928a1568 SHA256 8a0acacbca1080163d5b731703a3da663e8b88621b129f06925ef95930cdf580 +MISC ChangeLog 3327 RMD160 c66b6cf4321ff6d6c8afe16caecaa509b44dec3e SHA1 5634211ae727a31994fbb87d6075701b84e4e601 SHA256 615fcd360ca8b9c020b87f906edebd615201f632cc0d5b4a0e230aa43aa8962e MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch b/dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch new file mode 100644 index 0000000..d16a489 --- /dev/null +++ b/dev-db/libflaim/files/libflaim-4.9.1052-fortify-source.patch @@ -0,0 +1,46 @@ +--- flaim/util/sharutil.h.orig 2008-03-24 19:52:35.000000000 +0000 ++++ flaim/util/sharutil.h 2008-03-24 19:55:49.000000000 +0000 +@@ -28,6 +28,9 @@ + + #include "flaim.h" + ++#include ++#include ++ + #if defined( FLM_WIN) + // Conversion from XXX to YYY, possible loss of data + #pragma warning( disable : 4244) +--- flaim/util/dbshell.h.orig 2008-03-24 19:54:09.000000000 +0000 ++++ flaim/util/dbshell.h 2008-03-24 19:56:13.000000000 +0000 +@@ -30,6 +30,9 @@ + #include "flaimsys.h" + #include "sharutil.h" + ++#include ++#include ++ + // Types of clipboard data + + enum eClipboardDataType +--- flaim/util/flmunittest.h.orig 2008-03-24 19:56:35.000000000 +0000 ++++ flaim/util/flmunittest.h 2008-03-24 19:58:21.000000000 +0000 +@@ -29,6 +29,7 @@ + #include "flaimsys.h" + #ifndef FLM_NLM + #include ++ #include + #endif + + // Status codes passed to recordUnitTestResults +--- ftk/src/ftk.h.orig 2008-03-24 19:39:41.000000000 +0000 ++++ ftk/src/ftk.h 2008-03-24 19:55:06.000000000 +0000 +@@ -28,6 +28,9 @@ + #ifndef FTK_H + #define FTK_H + ++#include ++#include ++ + /// \defgroup retcodes Return Codes + + #ifndef FLM_PLATFORM_CONFIGURED diff --git a/dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch b/dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch new file mode 100644 index 0000000..13a0ffa --- /dev/null +++ b/dev-db/libflaim/files/libflaim-4.9.1052-gcc43.patch @@ -0,0 +1,24 @@ +--- flaim/src/kybuild.cpp 2008-02-15 20:02:22.000000000 +0000 ++++ flaim/src/kybuild.cpp 2008-02-15 20:02:50.000000000 +0000 +@@ -533,8 +533,8 @@ + if (pIxd->uiFlags & IXD_OFFLINE) + { + if (uiContainerNum > pIxd->uiLastContainerIndexed || +- uiContainerNum == pIxd->uiLastContainerIndexed && +- uiDrn > pIxd->uiLastDrnIndexed) ++ (uiContainerNum == pIxd->uiLastContainerIndexed && ++ uiDrn > pIxd->uiLastDrnIndexed)) + { + continue; + } +--- ftk/src/ftk.h 2006-10-12 23:56:32.000000000 +0100 ++++ ftk/src/ftk.h 2008-02-15 21:00:17.000000000 +0000 +@@ -3687,7 +3687,7 @@ + } F_TMSTAMP; + + #define f_timeIsLeapYear(year) \ +- ((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0)) ++ (((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0)) + + void f_timeGetSeconds( + FLMUINT * puiSeconds); diff --git a/dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch b/dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch new file mode 100644 index 0000000..c2829de --- /dev/null +++ b/dev-db/libflaim/files/libflaim-4.9.1052-gcc44.patch @@ -0,0 +1,12 @@ +--- ftkdir.cpp.orig 2006-10-13 02:56:32 +0400 ++++ ftk/src/ftkdir.cpp 2007-05-25 00:48:30 +0400 +@@ -1075,7 +1075,8 @@ + if( (PathSeparator = strrchr( DirInfo->full_path, '/')) == NULL) + #endif + { +- (void) getcwd( DirInfo->full_path, F_PATH_MAX_SIZE); ++ if (!getcwd( DirInfo->full_path, F_PATH_MAX_SIZE)) ++ return (EINVAL); + uiLen = f_strlen( DirInfo->full_path ); + DirInfo->full_path[uiLen] = '/'; + DirInfo->full_path[uiLen+1] = '\0'; diff --git a/dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch b/dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch new file mode 100644 index 0000000..f1f05b1 --- /dev/null +++ b/dev-db/libflaim/files/libflaim-4.9.1052-no-ldconfig-1.patch @@ -0,0 +1,40 @@ +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) +Date: 2010-01-16 +Initial Package Version: 4.9.1052 +Origin: me +Upstream Status: never accepted +Description: dont do ldconfig in sandbox + +diff -Naur libflaim-4.9.1052.orig/flaim/Makefile libflaim-4.9.1052/flaim/Makefile +--- libflaim-4.9.1052.orig/flaim/Makefile 2010-01-16 08:47:31.885993339 +0000 ++++ libflaim-4.9.1052/flaim/Makefile 2010-01-16 08:48:05.043193729 +0000 +@@ -1902,7 +1902,7 @@ + cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current).$(so_revision) $(lib_prefix)$(project_name).so.$(so_current) + endif + cd $(lib_install_dir); ln -fs $(lib_prefix)$(project_name).so.$(so_current) $(lib_prefix)$(project_name).so +- -ldconfig $(lib_install_dir) ++# -ldconfig $(lib_install_dir) + $(ec)$(gprintf) "Installation complete.\n" + endif + +diff -Naur libflaim-4.9.1052.orig/ftk/Makefile libflaim-4.9.1052/ftk/Makefile +--- libflaim-4.9.1052.orig/ftk/Makefile 2010-01-16 08:47:31.859102242 +0000 ++++ libflaim-4.9.1052/ftk/Makefile 2010-01-16 08:48:48.610836620 +0000 +@@ -1689,7 +1689,7 @@ + install --mode=644 $(ftk_static_lib) $(lib_install_dir) + install --mode=644 $(pkgconfig_file) $(pkgconfig_install_dir) + install --mode=644 src/ftk.h $(include_install_dir) +- -ldconfig $(lib_install_dir) ++# -ldconfig $(lib_install_dir) + $(ec)$(gprintf) "Installation complete.\n" + endif + +@@ -1826,7 +1826,7 @@ + $(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so.$(so_current)\n" >> $(ubuntu_pkginfo_dir)/postinst + endif + $(ec)$(gprintf) "ln -fs $(ftk_shared_lib) /usr/lib/$(lib_prefix)$(project_name).so\n" >> $(ubuntu_pkginfo_dir)/postinst +- $(ec)$(gprintf) "ldconfig /usr/lib/$(ftk_shared_lib)\n" >> $(ubuntu_pkginfo_dir)/postinst ++# $(ec)$(gprintf) "ldconfig /usr/lib/$(ftk_shared_lib)\n" >> $(ubuntu_pkginfo_dir)/postinst + $(ec)chmod 0755 $(ubuntu_pkginfo_dir)/postinst + + $(ec)$(gprintf) "Creating Ubuntu pre-uninstall file ...\n" diff --git a/dev-db/libflaim/libflaim-4.10_pre1111.ebuild b/dev-db/libflaim/libflaim-4.10_pre1111.ebuild new file mode 100644 index 0000000..4fba33b --- /dev/null +++ b/dev-db/libflaim/libflaim-4.10_pre1111.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit autotools subversion eutils +ESVN_REPO_URI="https://flaim.svn.sourceforge.net/svnroot/flaim/trunk/flaim/@${PV/4.10_pre/}" + +DESCRIPTION="FLAIM is an acronym that stands for FLexible Adaptable Information Management." +HOMEPAGE="http://flaim.sourceforge.net/" + +LICENSE="GPL-2" +KEYWORDS="~x86 ~amd64" +SLOT="0" +IUSE="doc static debug" + +RDEPEND="sys-libs/ncurses + >=dev-libs/libflaimtk-1.2_pre${PV/4.10_pre/}" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2 + doc? ( app-doc/doxygen )" + +src_prepare() { + eautoreconf -i +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable static) || die "configure failed" +} + +src_install() { + einstall || die "einstall failed" + rm -rf "${D}"/usr/share/doc/flaim || die "rm olddoc failed" + dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed" + use doc && dohtml -r docs/doxygen/html/* +} diff --git a/dev-db/libflaim/libflaim-4.9.1052.ebuild b/dev-db/libflaim/libflaim-4.9.1052.ebuild new file mode 100644 index 0000000..edd833f --- /dev/null +++ b/dev-db/libflaim/libflaim-4.9.1052.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: + +EAPI="2" + +inherit eutils + +DESCRIPTION="FLAIM is an embeddable cross-platform database engine that provides +a rich, powerful, easy-to-use feature set." +HOMEPAGE="http://flaim.sourceforge.net" +SRC_URI="http://ftp.mars.arge.at/flaim/${P}.tar.gz + mirror://sourceforge/flaim/files/stable/flaim/source/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +RESTRICT="mirror" + +RDEPEND="!dev-lib/libflaimtk" + +DEPEND="${RDEPEND}" + +# S="${WORKDIR}/${P}/flaim" + +src_prepare() { + epatch ${FILESDIR}/libflaim-4.9.1052-fortify-source.patch +# epatch ${FILESDIR}/libflaim-4.9.1052-gcc43.patch +# epatch ${FILESDIR}/libflaim-4.9.1052-gcc44.patch + epatch ${FILESDIR}/libflaim-4.9.1052-optflags.patch +# epatch ${FILESDIR}/do-not-compile-with-werror.patch + epatch ${FILESDIR}/libflaim-4.9.1052-no-ldconfig-1.patch +} + +src_compile() { + cd flaim + make DESTDIR=${D} CXXFLAGS="${CXXFLAGS} -Wno-error" OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ + die "Error compiling ${PN}" +} + +src_install() { + cd flaim + make DESTDIR=${D} install OSTYPE=`uname -s` HOSTTYPE=`uname -m` || \ + die "Error installing ${PN}" +}