Pass --disable-drivers and --disable-driver-conf per upstream default in ./configure with USE +minimal. Same as building basic libraries only per default.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 10 insertions, 98 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 7e0ca8888b3a..b38140872752 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,11 @@
 # 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.79 2010/04/22 21:07:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.80 2010/05/02 19:33:21 ssuominen Exp $
+
+  02 May 2010; Samuli Suominen <ssuominen@gentoo.org> unixODBC-2.3.0.ebuild:
+  Pass --disable-drivers and --disable-driver-conf per upstream default in
+  ./configure with USE +minimal. Same as building basic libraries only per
+  default.
 
 *unixODBC-2.3.0 (22 Apr 2010)
 
diff --git a/dev-db/unixODBC/files/odbcinst.ini b/dev-db/unixODBC/files/odbcinst.ini
deleted file mode 100644
index 1461ad5acfe2..000000000000
--- a/dev-db/unixODBC/files/odbcinst.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example driver definitions
-
-# Driver from the postgresql-odbc package
-# Setup from the unixODBC package
-[PostgreSQL]
-Description	= ODBC for PostgreSQL
-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
-
-
-# Driver from the mysql-connector-odbc package
-# Setup from the unixODBC package
-[MySQL]
-Description	= ODBC for MySQL
-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
deleted file mode 100644
index 716ae8cffa58..000000000000
--- a/dev-db/unixODBC/unixODBC-2.2.14.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.4 2010/03/22 20:39:10 ssuominen Exp $
-
-EAPI=3
-inherit autotools eutils flag-o-matic multilib prefix
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="mirror://sourceforge/unixodbc/${P}.tar.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-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
-	>=sys-libs/ncurses-5.6
-	sys-devel/libtool
-	qt4? ( x11-libs/qt-assistant:4
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-
-	# clean up old moc files and bundled libtool
-	rm -rf libltdl odbcinstQ4/m*.cpp
-
-	eautoreconf
-
-	cp "${FILESDIR}"/odbcinst.ini "${T}"
-	eprefixify "${T}"/odbcinst.ini
-}
-
-src_configure() {
-	local myconf="--enable-gui=no"
-
-	use qt4 && myconf="--enable-gui=yes"
-
-	# 2.2.14 is not aliasing-safe
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		--enable-fdb \
-		--enable-ltdllib \
-		--with-qt-libraries="${EPREFIX}/usr/$(get_libdir)/qt4" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README*
-	dohtml -a gif,html,sql -r doc/*
-
-	# http://cvs.fedoraproject.org/viewvc/rpms/unixODBC/devel/
-	insinto /etc/unixODBC
-	newins "${T}"/odbcinst.ini odbcinst.ini.example || die
-
-	if use qt4; then
-		newicon DataManager/LinuxODBC.xpm ${PN}.xpm
-		make_desktop_entry ODBCConfig "ODBC Data Source Administrator"
-	fi
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.0.ebuild b/dev-db/unixODBC/unixODBC-2.3.0.ebuild
index c4fec412c89c..81d72c57471e 100644
--- a/dev-db/unixODBC/unixODBC-2.3.0.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.1 2010/04/22 21:07:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.0.ebuild,v 1.2 2010/05/02 19:33:21 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/unixodbc/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
+IUSE="+minimal static-libs"
 
 RDEPEND=">=sys-libs/readline-6.0
 	>=sys-libs/ncurses-5.6
@@ -29,8 +29,8 @@ src_configure() {
 		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
-		--enable-drivers \
-		--enable-driver-conf
+		$(use_enable !minimal drivers) \
+		$(use_enable !minimal driver-conf)
 }
 
 src_install() {