New USE flag odbcmanual to control documentation installation (we don't want to pollu...

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

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index b3814087275224d0b8168dfeed0ff01217ead269..38863ab1c8edbe9f737044198fa95b3e1cf8bfe9 100644 (file)
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,13 @@
 # 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.80 2010/05/02 19:33:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.81 2010/05/03 16:12:07 ssuominen Exp $
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org> unixODBC-2.3.0.ebuild,
+  metadata.xml:
+  New USE flag odbcmanual to control documentation installation (we don't
+  want to pollute USE doc). Link to unixODBC Qt4 GUI project. Install PREFIX
+  related docs only when required. Make ebuild readable and leave it to
+  maintainer-needed.
 
   02 May 2010; Samuli Suominen <ssuominen@gentoo.org> unixODBC-2.3.0.ebuild:
   Pass --disable-drivers and --disable-driver-conf per upstream default in

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index f688712d77c281ac74151e1219c82558b7341ac4..dbe3aac6050e518028624c84f36061ddad82e176 100644 (file)
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -4,6 +4,6 @@ DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23ac
 DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
 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.3.0.ebuild 1076 RMD160 3b0804596eb43e06a242216ecdb2b8fa81a4cc92 SHA1 7555e5e0ba1b108c385a0bb722b42d42e58815c0 SHA256 3b852a0dac3a4da93ca5abc13420ac2573823cd805ce81e26504533555000371
-MISC ChangeLog 11618 RMD160 74f7d4ff1d451d1bbe3f9fc0f96825abe9d0e2e5 SHA1 86e23c3288decf3fc49e43dba0b3721806d32a4e SHA256 591e45df5420d630e87b973200060652ad0c84b563668e43e518dfdb709695a5
-MISC metadata.xml 371 RMD160 e219ea131d3c146923b622ddac6bd60cc705e612 SHA1 faca47bbca7f5db436feabb137994f758f958f11 SHA256 13342d59778e43fe0ee54eedccabf8c93a05d0b83e76ea9771a9a6f0e5e5e037
+EBUILD unixODBC-2.3.0.ebuild 1980 RMD160 6f20580a39b9c288aa3afaec27634a7fdb8efed6 SHA1 81382be7ff965d5c3749a114ebfd576d807d0512 SHA256 e9f1ce5d82780c7f009d560cbc2b0d321b459a2383aaf5183cc5451c125c2c88
+MISC ChangeLog 11956 RMD160 a281de966bd1f2a0786c219c1bb38fa0253deb1c SHA1 2fe8d62c4ea90526c7f9cdc3263bbe2efcac725b SHA256 4685ac83f3b7d1ee3fe9ac55247ec076697f87018b2de412e9e993f959b5b44b
+MISC metadata.xml 468 RMD160 91e1f44d6130fb6a8451d7fb035560ba096cbefe SHA1 58fbbf20f05a3276cbb8300d6d4d687c445ac3cd SHA256 818358c4462d990882a9dfe798266a4b0879967741b9148ab6a4a89029eaae27

diff --git a/dev-db/unixODBC/metadata.xml b/dev-db/unixODBC/metadata.xml
index 019beda5e9aa89b85ee494372e79008fe9da5191..a52a84acb90f759d754d0e5bc2f7ef895dfda369 100644 (file)
--- a/dev-db/unixODBC/metadata.xml
+++ b/dev-db/unixODBC/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>php</herd>
+  <herd>no-herd</herd>
   <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
+    <email>maintainer-needed@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="minimal">Don't build and install bundled drivers and extra libraries</flag>
+    <flag name="minimal">Disable bundled drivers and extra libraries (most users don't need these)</flag>
+    <flag name="odbcmanual">Administrator, Internal Structure, Programmer and User documentation</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-db/unixODBC/unixODBC-2.3.0.ebuild b/dev-db/unixODBC/unixODBC-2.3.0.ebuild
index 81d72c57471e04a9a899053a10c72d4e8f4fadfd..d814a298cd2bc4510a25661479c9c236fdbe06ae 100644 (file)
--- 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.2 2010/05/02 19:33:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.0.ebuild,v 1.3 2010/05/03 16:12:07 ssuominen Exp $
 
 EAPI=3
 inherit libtool
@@ -12,19 +12,23 @@ 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="+minimal static-libs"
+IUSE="+minimal odbcmanual static-libs"
 
-RDEPEND=">=sys-libs/readline-6.0
-       >=sys-libs/ncurses-5.6
-       >=sys-devel/libtool-2.2.6b"
+# needed by libltdl
+RDEPEND=">=sys-devel/libtool-2.2.6b
+       >=sys-libs/readline-6.0_p4
+       >=sys-libs/ncurses-5.6-r2"
+# need to set explicitely, flex will be out of system set in future
 DEPEND="${RDEPEND}
        sys-devel/flex"
 
 src_prepare() {
+       # needed by gfbsd
        elibtoolize
 }
 
 src_configure() {
+       # fixme: drivers are full of missing string.h includes
        econf \
                --sysconfdir="${EPREFIX}/etc/${PN}" \
                --disable-dependency-tracking \
@@ -35,7 +39,32 @@ src_configure() {
 
 src_install() {
        emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog NEWS README || die
 
-       dodoc AUTHORS ChangeLog NEWS README*
-       dohtml -a css,gif,html,sql,vsd -r doc/*
+       if use prefix; then
+               dodoc README* || die
+       fi
+
+       # avoid abusing too generic USE doc
+       if use odbcmanual; then
+               dohtml -a css,gif,html,sql,vsd -r doc/* || die
+       fi
+}
+
+pkg_postinst() {
+       if ! use minimal; then
+               einfo
+               einfo "Qt4 frontend moved to:"
+               einfo "http://sourceforge.net/projects/unixodbc-gui-qt/"
+               einfo
+               einfo "Please don't open bugs about it before they do a file release."
+               einfo
+       fi
+
+       # feel free to punt this warning after some time
+       ewarn "If you are upgrading from unixODBC 2.2.12 or 2.2.14 to 2.3.0,"
+       ewarn "it's good idea to re-emerge all unixODBC reverse dependencies now."
+       ewarn "See,"
+       ewarn "http://tinderbox.x86.dev.gentoo.org/misc/rindex/dev-db/unixODBC"
+       ewarn "http://tinderbox.x86.dev.gentoo.org/misc/dindex/dev-db/unixODBC"
 }