gentoo resync : 16.01.2018

2 files changed, 21 insertions, 13 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 8c18568feb6e..8ba58cd102b2 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,7 @@
 DIST unixODBC-2.3.2.tar.gz 1849173 BLAKE2B b16f6fb122036c8307b8e140f4987544f29ab7e78fe90005db3387d0aa64e6a52c616fe97c36ef24c71fc2a78712d3346bc8b38065ce59bf3c8ce9aefe43f44a SHA512 31d705bf3dcaff6707d5680235b34e4d265a084b1de9e1b2ed3bbee1e1dfefdb4437fe3e1736b84e446d1927ec7622296d9e9b129052cb35f4b63b0bd79ccd13
 DIST unixODBC-2.3.4.tar.gz 1830660 BLAKE2B 19b3b932e66ab2fea5645d9723592d881d86203fcc93a1a34bdc9d24fbb7fa606a0389b37988606ac60da71f378327380a32d4687dba16e784c9cdf0fd9b5fdb SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
+DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 EBUILD unixODBC-2.3.2-r1.ebuild 1639 BLAKE2B 3b3f31abe25597d857d7d55c95b704d391f8eff23b122a6f9e5b059f5c79cb73cdcee62f45dc8f89ee95c2c8fc4663adc80f0962094acc2ea445c91318c136e3 SHA512 20437b1f5e7786457fa65c301466cbb8ff0403213e9c72612d1f1f30f7716b2c4215cf88d420f05b3c7f40ccd966a39a7c191402d816a622856c05094565473c
 EBUILD unixODBC-2.3.4-r1.ebuild 1667 BLAKE2B c81176f8e0d13fbdbfd5623baf8b61e3dfa32e26652afd62a1b0831c57fb4a3238742a45ace747b3d65a265e8269840104d4b95a1c99b450e18c26971ea802e6 SHA512 287b75081ca3d83fae7014d59c5afd5aad806662a23bf4de8bf198f263dea5c7f93798e6a75947af2a3e10c832c2180fe13741136b6fcf2583a5f4e132ab509e
-EBUILD unixODBC-2.3.4.ebuild 1729 BLAKE2B f37b5a2612f2f6b229c6ca86d8a0e67a1ce4cdb120f14ef2843c849f034849f743306f6fa9ea495b6f68dcf3b7e7d95ddf3c72c359cd0173751c04ff051658d5 SHA512 a5b810d7acc4bd3a53d4d9584fc3bbc6de7c59904a5d7e3f21816d7e045ad8910fdbeb8b670bcd3d9e3cb1cc3a49be84f49dbcc389500963df1422f9ae08a071
+EBUILD unixODBC-2.3.5.ebuild 1773 BLAKE2B db134377e56f2fb30be44ffc5253bd2532825b9a73dd7a3be06ae706f339a6734a39398776f3616249146abf15eb9275f8065500cf2f14c2ca0e72a8b485ad98 SHA512 ebe2585e62f101da036faf9b1f6036e878cf06fc22112ef1b41e286fdef690edb00b5a9579003143a54b1466102421317fd47abde3b6cbfceabb383817ae18cd
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.4.ebuild b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
index 50a05677ae7a..eb5e0216e655 100644
--- a/dev-db/unixODBC/unixODBC-2.3.4.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit libtool multilib-minimal
+inherit libtool ltprune multilib-minimal
 
 DESCRIPTION="A complete ODBC driver manager"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -10,21 +10,22 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
-RDEPEND="|| (
+RDEPEND="
+	|| (
 		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
 	)
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )"
+"
 DEPEND="${RDEPEND}
-	sys-devel/flex"
+	sys-devel/flex
+"
 
-DOCS="AUTHORS ChangeLog NEWS README"
 MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
 
@@ -32,6 +33,7 @@ multilib_src_configure() {
 	# --enable-driver-conf is --enable-driverc as per configure.in
 	myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--disable-static
 		--enable-iconv
 		--enable-shared
 		$(use_enable static-libs static)
@@ -40,15 +42,20 @@ multilib_src_configure() {
 		$(use_with unicode iconv-char-enc UTF8)
 		$(use_with unicode iconv-ucode-enc UTF16LE)
 	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
 
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
+	if use odbcmanual ; then
+		# We could simply run "make install-html" if we'd not had 
+		# out-of-source builds here.
+		docinto html
+		dodoc -r doc/.
+		find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
+	fi
 
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	use prefix && dodoc README*
+	prune_libtool_files
 }