diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-22 17:15:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-22 17:15:05 +0000 |
| commit | 72b03a4ddf66a7a1423c5654535433f0642f6680 (patch) | |
| tree | 76401945caaa164b0f318ec042d078e7ae743e15 /dev-db/unixODBC | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-72b03a4ddf66a7a1423c5654535433f0642f6680.tar.gz gentoo-2-72b03a4ddf66a7a1423c5654535433f0642f6680.tar.bz2 gentoo-2-72b03a4ddf66a7a1423c5654535433f0642f6680.zip | |
Keyword ~x86-freebsd ~amd64-linux ~x86-linux by Jeremy Olexa.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/unixODBC')
| -rw-r--r-- | dev-db/unixODBC/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/unixODBC/files/odbcinst.ini | 16 | ||||
| -rw-r--r-- | dev-db/unixODBC/unixODBC-2.2.14.ebuild | 17 |
3 files changed, 23 insertions, 16 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 <ssuominen@gentoo.org> + 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/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 |