Fix bug #151555.

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index d40c7d37b58adb689ad5721102be542af10cf4a1..cf907781ee7980964efdb0771f6bf172b95e3371 100644 (file)
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.60 2006/12/01 16:51:11 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.61 2006/12/02 17:55:52 chtekk Exp $
+
+  02 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Fix bug #151555.
 
   01 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
   -files/unixODBC-2.2.6-configure.in.patch, -files/gentoo-yac.diff,

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 052c5b344c03f92fe42a968bfea909f7d83aa473..0a9b66b940279be4f30ca3474a93e621f9b91fcb 100644 (file)
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -11,14 +11,14 @@ MD5 b07177ad3a171508d9be501501809193 files/unixODBC-2.2.11-flex.patch 486
 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 files/unixODBC-2.2.11-flex.patch 486
 SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7 files/unixODBC-2.2.11-flex.patch 486
 DIST unixODBC-2.2.11.tar.gz 2406740 RMD160 533a2733aa9f49bf9e3fd062b6d0ebfdff4dfcf1 SHA1 a8869c38d0f1bb18b33e5165a2a79dd8770f98b3 SHA256 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88
-EBUILD unixODBC-2.2.11-r1.ebuild 1496 RMD160 a510391384076d6e5c4543116d46ba6454d21076 SHA1 4c281ed6bddc7ad79c7949c510f1b997e9186630 SHA256 9331751fca80fd7f50373ef591ee10c6f75dd916e25b7c0fbbef092c9684cbd9
-MD5 d957ba3e6a52aea8bd84b220cb027ce0 unixODBC-2.2.11-r1.ebuild 1496
-RMD160 a510391384076d6e5c4543116d46ba6454d21076 unixODBC-2.2.11-r1.ebuild 1496
-SHA256 9331751fca80fd7f50373ef591ee10c6f75dd916e25b7c0fbbef092c9684cbd9 unixODBC-2.2.11-r1.ebuild 1496
-MISC ChangeLog 8363 RMD160 a1c7bae2d8a8e59a44c5e36a5133b97c1c2db7a6 SHA1 b4716a3c25499d410d6391b9a25b96947af899ed SHA256 3c9fc03f6d5b34ba63022b66c17fc24a765e4ff629b0871993492cbaf4d0d2ab
-MD5 39443b8a8616fe4ac0994cc3d6ea05a8 ChangeLog 8363
-RMD160 a1c7bae2d8a8e59a44c5e36a5133b97c1c2db7a6 ChangeLog 8363
-SHA256 3c9fc03f6d5b34ba63022b66c17fc24a765e4ff629b0871993492cbaf4d0d2ab ChangeLog 8363
+EBUILD unixODBC-2.2.11-r1.ebuild 1601 RMD160 2fab866830eb9ff0fd95128718e20cfb0ec10932 SHA1 8b8f84b0804a6e52000a6ecd7fe3065c683d49be SHA256 247461615c5d78a64c548f2727dc78970fb397600a96ac655fd079a2f95aad69
+MD5 7f21dc064133619007bd53a03b1a5d2b unixODBC-2.2.11-r1.ebuild 1601
+RMD160 2fab866830eb9ff0fd95128718e20cfb0ec10932 unixODBC-2.2.11-r1.ebuild 1601
+SHA256 247461615c5d78a64c548f2727dc78970fb397600a96ac655fd079a2f95aad69 unixODBC-2.2.11-r1.ebuild 1601
+MISC ChangeLog 8463 RMD160 e707d49a726fbf174edc95c1c981427a937815a4 SHA1 bc3a963883c4fe0df811f4407bff0d602865058a SHA256 4c90b18d60c20119ea6b41818e888af73c602dab1920e8c4abcf1fa339e10fa2
+MD5 43780ec26e61e42dd7baf49e09c85601 ChangeLog 8463
+RMD160 e707d49a726fbf174edc95c1c981427a937815a4 ChangeLog 8463
+SHA256 4c90b18d60c20119ea6b41818e888af73c602dab1920e8c4abcf1fa339e10fa2 ChangeLog 8463
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157

diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index e737b526077fae825a8e06dcf124ef4af973c599..a063772226b205d9958dfcf26a7d92e5faf15664 100644 (file)
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.16 2006/12/01 16:51:11 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.17 2006/12/02 17:55:52 chtekk Exp $
 
-inherit eutils multilib
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils multilib autotools
 
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
@@ -28,8 +31,9 @@ src_unpack() {
        # braindead check in configure fails - hackish approach
        epatch "${FILESDIR}/${P}-configure.in.patch"
        epatch "${FILESDIR}/${P}-Makefile.am.patch"
-       aclocal && \
-       libtoolize -c -f && \
+       autotools_set_versions
+       aclocal --force && \
+       libtoolize --copy --force && \
        automake && \
        autoconf || die "autotools failed"
 }
@@ -38,13 +42,13 @@ src_compile() {
        local myconf
 
        if use qt3 && ! 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
 
        econf --prefix=/usr \
-               --sysconfdir=/etc/unixODBC \
+               --sysconfdir=/etc/${PN} \
                --libdir=/usr/$(get_libdir) \
                ${myconf} || die "econf failed"