diff options
Diffstat (limited to 'app-office/mdbtools')
| -rw-r--r-- | app-office/mdbtools/Manifest | 4 | ||||
| -rw-r--r-- | app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch | 46 | ||||
| -rw-r--r-- | app-office/mdbtools/mdbtools-0.9.3.ebuild | 59 | ||||
| -rw-r--r-- | app-office/mdbtools/mdbtools-0.9.4.ebuild | 59 | ||||
| -rw-r--r-- | app-office/mdbtools/mdbtools-1.0.0.ebuild (renamed from app-office/mdbtools/mdbtools-0.9.2.ebuild) | 21 | ||||
| -rw-r--r-- | app-office/mdbtools/metadata.xml | 2 |
6 files changed, 11 insertions, 180 deletions
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest index b963204f2ae8..de6d5f2731d4 100644 --- a/app-office/mdbtools/Manifest +++ b/app-office/mdbtools/Manifest @@ -1,3 +1 @@ -DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d -DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e -DIST mdbtools-0.9.4.tar.gz 215253 BLAKE2B 7538fe36ce63b01a395b39272da3c212d6743bb789b38123d1f951f5678177ba541d64e7a58c08ff5f537d5cda4309c814521a33df5402ad3bc3bacd3d872425 SHA512 4ec5ae66b572970f5d450d94457a5e12a0b376dfbdb10ca8566be2f9d35a8837c0b7381ac6e8b935192b892e7d7c71fef089bb07f4ae789596c1dac07a062e1a +DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f diff --git a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch deleted file mode 100644 index 42c62f04bec5..000000000000 --- a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://github.com/mdbtools/mdbtools/commit/686110d2241f02b3242d02d7c4ded9509aacd0df -https://bugs.gentoo.org/697568 - -From 686110d2241f02b3242d02d7c4ded9509aacd0df Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 27 Feb 2021 14:33:23 +0000 -Subject: [PATCH] configure.ac: Respect --libdir for unixODBC - -When searching for unixODBC, we want to use -the libdir passed in to autotools (--libdir) -to ensure that we find the library -for the correct ABI. - -It is possible that we pick up the wrong -copy from e.g. /usr/lib/ where a 32-bit -unixODBC copy of the library exists -when we're in the middle of a 64-bit build. - -Use ${libdir} to ensure we respect -any preferences/information given and -search for ODBC in the right place. - -Note that this previously affected -us with iODBC but that's since been -resolved by using their -iodbc-config binary. - -Bug: https://bugs.gentoo.org/697568 -Signed-off-by: Sam James <sam@gentoo.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c802843d..7a1f357b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -157,7 +157,7 @@ AC_ARG_WITH(unixodbc, - if test "$with_unixodbc"; then - HAVE_ODBC=true - ODBC_CFLAGS="-I$with_unixodbc/include" -- ODBC_LIBS="-L$with_unixodbc/lib" -+ ODBC_LIBS="-L$with_unixodbc/$libdir" - CFLAGS="$CFLAGS -DUNIXODBC" - - dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC diff --git a/app-office/mdbtools/mdbtools-0.9.3.ebuild b/app-office/mdbtools/mdbtools-0.9.3.ebuild deleted file mode 100644 index d996a4726dbd..000000000000 --- a/app-office/mdbtools/mdbtools-0.9.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files" -HOMEPAGE="https://github.com/mdbtools/mdbtools" -SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/3" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="glib odbc" - -BDEPEND=" - app-text/txt2man - sys-devel/flex - virtual/pkgconfig - virtual/yacc -" -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - virtual/libiconv - glib? ( dev-libs/glib:2 ) - odbc? ( >=dev-db/unixODBC-2.0 ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS HACKING NEWS README.md ) - -src_prepare() { - default - - # bug #770019 - sed -i -e 's/-Werror//' configure.ac || die - - eautoreconf -} - -src_configure() { - # TODO: Make iconv optional - - local myeconfargs=( - --disable-static - $(use_enable glib) - $(use odbc && echo "--with-unixodbc=${EPREFIX}/usr") - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-office/mdbtools/mdbtools-0.9.4.ebuild b/app-office/mdbtools/mdbtools-0.9.4.ebuild deleted file mode 100644 index f23e1aadf9c6..000000000000 --- a/app-office/mdbtools/mdbtools-0.9.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files" -HOMEPAGE="https://github.com/mdbtools/mdbtools" -SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="glib odbc" - -BDEPEND=" - app-text/txt2man - sys-devel/flex - virtual/pkgconfig - virtual/yacc -" -RDEPEND=" - sys-libs/ncurses:0= - sys-libs/readline:0= - virtual/libiconv - glib? ( dev-libs/glib:2 ) - odbc? ( >=dev-db/unixODBC-2.0 ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS HACKING NEWS README.md ) - -src_prepare() { - default - - # bug #770019 - sed -i -e 's/-Werror//' configure.ac || die - - eautoreconf -} - -src_configure() { - # TODO: Make iconv optional - - local myeconfargs=( - --disable-static - $(use_enable glib) - $(use odbc && echo "--with-unixodbc=${EPREFIX}/usr") - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-office/mdbtools/mdbtools-0.9.2.ebuild b/app-office/mdbtools/mdbtools-1.0.0.ebuild index 6a6ef62bb51b..5185c1657e0c 100644 --- a/app-office/mdbtools/mdbtools-0.9.2.ebuild +++ b/app-office/mdbtools/mdbtools-1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,34 +7,30 @@ inherit autotools DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files" HOMEPAGE="https://github.com/mdbtools/mdbtools" -SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/mdbtools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0/3" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="glib odbc" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +IUSE="glib iconv odbc" BDEPEND=" app-text/txt2man - sys-devel/flex + app-alternatives/lex virtual/pkgconfig - virtual/yacc + app-alternatives/yacc " RDEPEND=" sys-libs/ncurses:0= sys-libs/readline:0= - odbc? ( >=dev-db/unixODBC-2.0 ) glib? ( dev-libs/glib:2 ) + iconv? ( virtual/libiconv ) + odbc? ( >=dev-db/unixODBC-2.0 ) " DEPEND="${RDEPEND}" DOCS=( AUTHORS HACKING NEWS README.md ) -PATCHES=( - # bug #697568 - "${FILESDIR}/${P}-unixODBC-respect-libdir.patch" -) - src_prepare() { default @@ -48,6 +44,7 @@ src_configure() { local myeconfargs=( --disable-static $(use_enable glib) + $(use_enable iconv) $(use odbc && echo "--with-unixodbc=${EPREFIX}/usr") ) diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml index 357e7d2e929f..5f5ca30df657 100644 --- a/app-office/mdbtools/metadata.xml +++ b/app-office/mdbtools/metadata.xml @@ -6,6 +6,6 @@ <flag name="glib">Use functions provided by <pkg>dev-libs/glib</pkg>, not built-in</flag> </use> <upstream> - <remote-id type="github">brianb/mdbtools</remote-id> + <remote-id type="github">mdbtools/mdbtools</remote-id> </upstream> </pkgmetadata> |