summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2005-05-28 22:59:27 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2005-05-28 22:59:27 +0000
commit10fe7c7cf60adcba9707ab8cbeff6b857487959c (patch)
tree313b719526cc4a02de6d8206d84090cf9e25f383 /dev-db/unixODBC
parentadded pkg_nofetch to tell users where to download the shoutcast ser (diff)
downloadhistorical-10fe7c7cf60adcba9707ab8cbeff6b857487959c.tar.gz
historical-10fe7c7cf60adcba9707ab8cbeff6b857487959c.tar.bz2
historical-10fe7c7cf60adcba9707ab8cbeff6b857487959c.zip
Fixed BUG #94262 (multilib-strict)
Package-Manager: portage-2.0.51.21-r1
Diffstat (limited to 'dev-db/unixODBC')
-rw-r--r--dev-db/unixODBC/ChangeLog5
-rw-r--r--dev-db/unixODBC/Manifest26
-rw-r--r--dev-db/unixODBC/unixODBC-2.2.8.ebuild11
3 files changed, 29 insertions, 13 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 46e6fd054e20..7c2db44ebb00 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/unixODBC
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.39 2005/05/10 15:29:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.40 2005/05/28 22:59:27 kugelfang Exp $
+
+ 29 May 2005; Danny van Dyk <kugelfang@gentoo.org> unixODBC-2.2.8.ebuild:
+ BUG #94262(multilib-strict) fixed as of unixODBC-2.2.8.
10 May 2005; Carsten Lohrke <carlo@gentoo.org> unixODBC-2.0.8.ebuild:
removed Qt 2 support
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index e5e36dda2d29..4b7b0f0826a3 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,14 +1,24 @@
-MD5 798d73782d49579aeb92d10b6a03fc89 unixODBC-2.2.2.ebuild 1290
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d0ba947ecf7c917cae61fba2fe3d0969 ChangeLog 5156
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
MD5 eea61e477011ec918b75ba766aaad67a unixODBC-2.0.8.ebuild 969
-MD5 293bfb243487918bceb74686ead14275 unixODBC-2.2.6.ebuild 1570
+MD5 798d73782d49579aeb92d10b6a03fc89 unixODBC-2.2.2.ebuild 1290
MD5 debd2ebec70db3e3756fe0963204ce86 unixODBC-2.2.6-r1.ebuild 1645
-MD5 f6ad1d6e93be50104e96c0d4db7282a4 unixODBC-2.2.8.ebuild 1967
-MD5 8c1c21771504d62eb395a92623aba57f ChangeLog 5018
-MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
-MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
-MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
+MD5 293bfb243487918bceb74686ead14275 unixODBC-2.2.6.ebuild 1570
+MD5 1fe8966fcdce3c6e6044e1a47e794929 unixODBC-2.2.8.ebuild 2091
MD5 f383c7806ba5f687ba55d5f1bc6a36aa files/digest-unixODBC-2.0.8 67
MD5 0f7614b93d6ede252ed2f7d7ff1aac90 files/digest-unixODBC-2.2.2 67
MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6 67
+MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
MD5 a60388d8cb9cb0dca3df5429fb364051 files/digest-unixODBC-2.2.8 67
+MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCmPj25mJXAu5GbtIRAmTDAJ452iFgJerxzmc+RpEit2AxfMBOpwCfQgKi
+nCNgvR6EIL7vaGIPRums0NE=
+=R8Ij
+-----END PGP SIGNATURE-----
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index 4ca05aa2f539..affcdd81ab5c 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.17 2005/02/07 01:47:15 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.18 2005/05/28 22:59:27 kugelfang Exp $
-inherit eutils gnuconfig
+inherit eutils gnuconfig multilib
DESCRIPTION="ODBC Interface for Linux"
HOMEPAGE="http://www.unixodbc.org/"
@@ -38,11 +38,14 @@ src_compile() {
if use qt && ! use mips
then
- myconf="--enable-gui=yes --x-libraries=/usr/lib "
+ myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir) "
else
myconf="--enable-gui=no"
fi
+ # Fix multilib-strict BUG #94262
+ myconf="${myconf} --libdir=\${exec_prefix}/$(get_libdir)"
+
# Detect mips systems properly
gnuconfig_update
@@ -63,7 +66,7 @@ src_compile() {
./configure --host=${CHOST} \
--with-odbc=${S} \
--prefix=/usr \
- --x-libraries=/usr/lib \
+ --x-libraries=/usr/$(get_libdir) \
--sysconfdir=/etc/unixODBC \
${myconf} || die