From 7aa9910c3ff95d86266f54e9311d419cb343f841 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Mon, 22 Mar 2010 17:15:05 +0000 Subject: [PATCH] Keyword ~x86-freebsd ~amd64-linux ~x86-linux by Jeremy Olexa. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-db/unixODBC/ChangeLog | 6 +++++- dev-db/unixODBC/Manifest | 6 +++--- dev-db/unixODBC/files/odbcinst.ini | 16 ++++++++-------- dev-db/unixODBC/unixODBC-2.2.14.ebuild | 17 ++++++++++------- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog index f779d9b5e402..f3fb9d3571c6 100644 --- a/dev-db/unixODBC/ChangeLog +++ b/dev-db/unixODBC/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/unixODBC # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.77 2010/03/22 15:00:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.78 2010/03/22 17:15:03 ssuominen Exp $ + + 22 Mar 2010; Samuli Suominen + unixODBC-2.2.14.ebuild, files/odbcinst.ini: + Keyword ~x86-freebsd ~amd64-linux ~x86-linux by Jeremy Olexa. *unixODBC-2.2.14 (22 Mar 2010) diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest index dc19fb784dae..c8b270245835 100644 --- a/dev-db/unixODBC/Manifest +++ b/dev-db/unixODBC/Manifest @@ -1,11 +1,11 @@ AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85 AUX 360-unixODBC-2.2.12-libltdlfixes.patch 1124 RMD160 ee215893cbdb2aa9672ec63501cd0bddaf08c397 SHA1 0d8fc8b5db51c7bf3ce72abfe7ba8119808702ad SHA256 974942040de5e471274b109ae478f05dea75ac0e5042aaf9eb1acd3f2461d4bf -AUX odbcinst.ini 575 RMD160 7b23340c6f40f9608950f1a69bd9df596472ccab SHA1 63e3ac0d67778316ca0ca35b37c9e771bfad5687 SHA256 fbd67d76c670246ba0ffbbb8a5e039c7b8f7ff0da8e3342f492359064706dbf2 +AUX odbcinst.ini 767 RMD160 7d32ea83db05476af7054745ae6a448ae2d0aa71 SHA1 a97725e7b2180768d44e38479ef86eeffb1a861e SHA256 5f408cbb6b7783d8206043775e2f3437c50a5403c085662c13202b34ef822f66 DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda SHA1 1aa13bf8a6d031583fae844a7d0d503405607f28 SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40 DIST unixODBC-2.2.14-patchset-1.tar.bz2 12106 RMD160 99705cd7369c53f19773f31aca33fb16c00dbefc SHA1 60a868e08c6460c152f4feda095a806dd71969a1 SHA256 b725dea9f5e643c1be56b4dac3ab8a833adaab2de36e307111474965c41ef276 DIST unixODBC-2.2.14.tar.gz 2189755 RMD160 e2a2d2de636a8b2ee1002cac809ba2a38d7eb4de SHA1 ab18464c83d30d7b38b8bb58e1dd01e3ec211488 SHA256 fea02f2f687f55d4056728a602846fafd0e12d99110986633fb80e1bf0e94da5 EBUILD unixODBC-2.2.12.ebuild 2190 RMD160 26fce83fb57f0b0cad3c1e6f98502a293100cadc SHA1 b39668eda489671712c53a3ace2197cbf913320a SHA256 0096e488b882bd28c40a0b3269afa05f9c014274e45edec7ce3bc8d9252e2977 -EBUILD unixODBC-2.2.14.ebuild 1735 RMD160 e12dbec728ea2791c85a117b449d48bca1a36c34 SHA1 08a98278610a4e0285dde1dc2eda49df658637e6 SHA256 3de8667d991bf4e58b2e1a3e1714a46ec1d907098b687c7e66d41b63dfe9062c -MISC ChangeLog 11086 RMD160 fc5df667620535a188db66da0493b6546260950e SHA1 57ef048d06b7cfdf1c00952fa9ccc26efc222b73 SHA256 edd070b3c4e93afad3fb309ef5e27b97311b69a2c4e1dd435f9336271fe1cd3d +EBUILD unixODBC-2.2.14.ebuild 1874 RMD160 8aead14920f10fbadaf8a6163ff0aeddaf7055cd SHA1 8a52b7fcdb6a306fa234a0d759517cab6cc1a70e SHA256 c26ccf599dae94888a098b7e72fa59232f01e57f36c1a6873ba93d6a22e68005 +MISC ChangeLog 11251 RMD160 1978310265957a58e3c0f3b5205d4078feeec132 SHA1 edbade55549e6b87b5dbf65bf4056a7d0c6b75a2 SHA256 39ae50254cb26c22973cd53b52fed85a79e56fb4b8874140b16db6034700f3d0 MISC metadata.xml 262 RMD160 c5574e278da224b5b33d14dc2f271d48bfc314b8 SHA1 341a5e91988ae72d74bf27cfff313720deaa5ea5 SHA256 b11edeb2af965445b110eb0b9edfb5f56aa5530ba68ee1fa5cf9e0d5219069bf diff --git a/dev-db/unixODBC/files/odbcinst.ini b/dev-db/unixODBC/files/odbcinst.ini index 29ea10aa5773..1461ad5acfe2 100644 --- a/dev-db/unixODBC/files/odbcinst.ini +++ b/dev-db/unixODBC/files/odbcinst.ini @@ -4,10 +4,10 @@ # Setup from the unixODBC package [PostgreSQL] Description = ODBC for PostgreSQL -Driver = /usr/lib/psqlodbc.so -Setup = /usr/lib/libodbcpsqlS.so -Driver64 = /usr/lib64/psqlodbc.so -Setup64 = /usr/lib64/libodbcpsqlS.so +Driver = @GENTOO_PORTAGE_EPREFIX@/usr/lib/psqlodbc.so +Setup = @GENTOO_PORTAGE_EPREFIX@/usr/lib/libodbcpsqlS.so +Driver64 = @GENTOO_PORTAGE_EPREFIX@/usr/lib64/psqlodbc.so +Setup64 = @GENTOO_PORTAGE_EPREFIX@/usr/lib64/libodbcpsqlS.so FileUsage = 1 @@ -15,8 +15,8 @@ FileUsage = 1 # Setup from the unixODBC package [MySQL] Description = ODBC for MySQL -Driver = /usr/lib/libmyodbc5.so -Setup = /usr/lib/libodbcmyS.so -Driver64 = /usr/lib64/libmyodbc5.so -Setup64 = /usr/lib64/libodbcmyS.so +Driver = @GENTOO_PORTAGE_EPREFIX@/usr/lib/libmyodbc5.so +Setup = @GENTOO_PORTAGE_EPREFIX@/usr/lib/libodbcmyS.so +Driver64 = @GENTOO_PORTAGE_EPREFIX@/usr/lib64/libmyodbc5.so +Setup64 = @GENTOO_PORTAGE_EPREFIX@/usr/lib64/libodbcmyS.so FileUsage = 1 diff --git a/dev-db/unixODBC/unixODBC-2.2.14.ebuild b/dev-db/unixODBC/unixODBC-2.2.14.ebuild index 909650ee4bce..c18de818c7a5 100644 --- a/dev-db/unixODBC/unixODBC-2.2.14.ebuild +++ b/dev-db/unixODBC/unixODBC-2.2.14.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.14.ebuild,v 1.1 2010/03/22 15:00:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.14.ebuild,v 1.2 2010/03/22 17:15:03 ssuominen Exp $ -EAPI=2 -inherit autotools eutils flag-o-matic multilib +EAPI=3 +inherit autotools eutils flag-o-matic multilib prefix DESCRIPTION="A complete ODBC driver manager" HOMEPAGE="http://www.unixodbc.org/" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/unixodbc/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" IUSE="static-libs qt4" RDEPEND=">=sys-libs/readline-6.0 @@ -31,6 +31,9 @@ src_prepare() { rm -rf libltdl odbcinstQ4/m*.cpp eautoreconf + + cp "${FILESDIR}"/odbcinst.ini "${T}" + eprefixify "${T}"/odbcinst.ini } src_configure() { @@ -42,12 +45,12 @@ src_configure() { append-flags -fno-strict-aliasing econf \ - --sysconfdir=/etc/${PN} \ + --sysconfdir="${EPREFIX}/etc/${PN}" \ --disable-dependency-tracking \ $(use_enable static-libs static) \ --enable-fdb \ --enable-ltdllib \ - --with-qt-libraries=/usr/$(get_libdir)/qt4 \ + --with-qt-libraries="${EPREFIX}/usr/$(get_libdir)/qt4" \ ${myconf} } @@ -59,7 +62,7 @@ src_install() { # http://cvs.fedoraproject.org/viewvc/rpms/unixODBC/devel/ insinto /etc/unixODBC - newins "${FILESDIR}"/odbcinst.ini odbcinst.ini.example + newins "${T}"/odbcinst.ini odbcinst.ini.example || die if use qt4; then newicon DataManager/LinuxODBC.xpm ${PN}.xpm -- 2.26.2