summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-11-06 18:34:01 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-11-06 18:34:01 +0000
commit2a48879fb1883111e800d51b1a9b05d0f84e57da (patch)
tree33c100038cfcbb4a4e144e137467ff35b590fdf5 /dev-db/unixODBC
parentfix for glibc-2.20 (bug 527360) (diff)
downloadgentoo-2-2a48879fb1883111e800d51b1a9b05d0f84e57da.tar.gz
gentoo-2-2a48879fb1883111e800d51b1a9b05d0f84e57da.tar.bz2
gentoo-2-2a48879fb1883111e800d51b1a9b05d0f84e57da.zip
Fixed libltdl / libtool multilib dep, bug 528298
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r--dev-db/unixODBC/ChangeLog8
-rw-r--r--dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild (renamed from dev-db/unixODBC/unixODBC-2.3.2.ebuild)7
2 files changed, 12 insertions, 3 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index a2247e310d8a..bf0fe9806d5a 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/unixODBC
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.117 2014/06/18 19:05:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.118 2014/11/06 18:34:01 axs Exp $
+
+*unixODBC-2.3.2-r1 (06 Nov 2014)
+
+ 06 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +unixODBC-2.3.2-r1.ebuild, -unixODBC-2.3.2.ebuild:
+ Fixed libltdl / libtool multilib dep, bug 528298
18 Jun 2014; Michał Górny <mgorny@gentoo.org> unixODBC-2.3.2.ebuild:
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/dev-db/unixODBC/unixODBC-2.3.2.ebuild b/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
index f14a2a843e54..b2c2f3fd0e7b 100644
--- a/dev-db/unixODBC/unixODBC-2.3.2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2.ebuild,v 1.3 2014/06/18 19:05:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild,v 1.1 2014/11/06 18:34:01 axs Exp $
EAPI=5
inherit libtool autotools-multilib eutils
@@ -14,7 +14,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
-RDEPEND=">=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+RDEPEND="|| (
+ dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+ )
>=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
>=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]