gentoo resync : 11.02.2018

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index f89a652aaff7..568a7bb00895 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,7 +1,5 @@
-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 1665 BLAKE2B da7685f3c846b0013890864aa7aa39b589823eadd60ac2661d23f8662049429f181da3e51570fff4ae5caf3f337acf56848b1e41f7bf09c7c2043e47a8c2506f SHA512 627126a4c0f2cd2639de878cf674d1ccf8a0a2c06cd2c8319cce69d39d690fbaac4dc3895e7dc4a1507c260c936f4140e8da84b1cd267710e221618dbbe011f8
+EBUILD unixODBC-2.3.4-r1.ebuild 1664 BLAKE2B eaccced362a7f62eebe1809ee0327df36978a6f0856c2b631cee32763f92b20909c4bb32bc79bd179f5d9193f34d5307519bb1880d9a94bd5a27d238a3682efe SHA512 5429a6f9ad0279d77a2a26b5a1a0752a23646922fb0f2c2a3df594e551a1e46db614bb991d126d7652f5359e4ccbca0bfe1051c1af6b80ea47dbc59ca35d7329
 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.2-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
deleted file mode 100644
index f8709e382f92..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit libtool autotools-multilib eutils
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="http://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"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-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"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--enable-iconv
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	autotools-multilib_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.4-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.4-r1.ebuild
index a8dd57f67d31..58244fbcac9d 100644
--- a/dev-db/unixODBC/unixODBC-2.3.4-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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"
+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="