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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 12 insertions, 104 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/Manifest b/dev-db/unixODBC/Manifest
index 91a00f1ffe0f..36c860f9c94e 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,13 +1,9 @@
 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 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
 DIST unixODBC-2.3.0.tar.gz 1804749 RMD160 166a96c31fe013ced6b6ef93da5871f672cfe456 SHA1 b2839b5210906e3ee286a4b621f177db9c7be7a8 SHA256 15a7a855a2951a6af7137379bfcdccc15626b869c4804a1d1536cd37e9f3872c
 EBUILD unixODBC-2.2.12.ebuild 2190 RMD160 26fce83fb57f0b0cad3c1e6f98502a293100cadc SHA1 b39668eda489671712c53a3ace2197cbf913320a SHA256 0096e488b882bd28c40a0b3269afa05f9c014274e45edec7ce3bc8d9252e2977
-EBUILD unixODBC-2.2.14.ebuild 1863 RMD160 a337d1181a7b3507273aabe357ab2fd862d4f5fd SHA1 9a71066e526456941d307cae88279e73673ffead SHA256 fde278a676b514fa9cea3121d660ecccc2d0268ca6c5a3cf1a59da1ff7837b36
-EBUILD unixODBC-2.3.0.ebuild 1039 RMD160 d699f63d944e0f4ea63b6b50dd803f8eb7e71453 SHA1 3dd16ba0ca72cc30be2686fe29724b4cf23b9510 SHA256 779009d3f6b4d1ea1128a1333adaaede8d97d3b855c241f22528df6470f2792a
-MISC ChangeLog 11379 RMD160 f38eb046d92505c5b182cbaa5d0cdb72ab9599a4 SHA1 8bd5991d574addcd6ad8894d2c7b2abe88d698ec SHA256 669a2ecd0f174edc29c3273f935d4499d324ed81de783982e14c8a3cd437738e
+EBUILD unixODBC-2.3.0.ebuild 1076 RMD160 3b0804596eb43e06a242216ecdb2b8fa81a4cc92 SHA1 7555e5e0ba1b108c385a0bb722b42d42e58815c0 SHA256 3b852a0dac3a4da93ca5abc13420ac2573823cd805ce81e26504533555000371
+MISC ChangeLog 11618 RMD160 74f7d4ff1d451d1bbe3f9fc0f96825abe9d0e2e5 SHA1 86e23c3288decf3fc49e43dba0b3721806d32a4e SHA256 591e45df5420d630e87b973200060652ad0c84b563668e43e518dfdb709695a5
 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
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() {