gentoo resync : 28.04.2018

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 76e50148d678..4ffbb7831557 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,7 +1,6 @@
 AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0591786800e14f22d7fb4c7ef5005e0630b95453a319d9254bf3f5e423e74ae36c6a7bd097f3193869757b2bea34f8974e358 SHA512 a4d5dfafe75ea0e85feed76cf18474a89fcf6719ee58d0b56d57959526db2511df2df691bf9af2e1a34c716d2d90f6d274b48a11cfb7add74df799d1f1f67387
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 DIST unixODBC-2.3.6.tar.gz 1661914 BLAKE2B 75162344e2b2713ae056dae0a2c1be31994ef350b4aa3ee7ae924b17527f35e0b7c9bb5a23763ab71553ef67a025d2a6549e564507b95991d6a193e165f1e774 SHA512 6518a4169946e847dd710d54724a44d268b98954d30064eadadb703edbbeafac05bd1f42a6845c2fdcdab7ae8987800acd1a5f6b4b96de5f3c8c3e4bc370fe30
-EBUILD unixODBC-2.3.5-r1.ebuild 1824 BLAKE2B fce97f3b8cd5c67369cdc7b0fd187a5fcd5eca5509390238be2363c9f59829942a15a9a4f97ea96b0243697453bb6f721f01a18aa38d3da031556a9d3214ef18 SHA512 24e10717cb139308d40fb9b4407769e9cd9c7adcdc8751681144c27f83ddb53708b4ec3be3969a09e02574d95a3d361605a9426fb10b7f533930352c41096404
-EBUILD unixODBC-2.3.5.ebuild 1769 BLAKE2B 6354f532b5ea6900e6a7ce27b1d87517e4a2fbd8f193f93e9e18202b7fa7e5cb6717067999ec46f3e3413d23b36e137120c1f004055e94bb921f82591cc06270 SHA512 6e90ba612c0f6e103bd7c1e956147ac4dc95602fd68647102f01f4cd2eaa4481536254c59eaffe646f885c8ac47b0876f4939052ee29551ab003daface362414
+EBUILD unixODBC-2.3.5-r1.ebuild 1823 BLAKE2B 0f4b7d0a35578c1c9186c22fd32d9106fafda288547f7ccc61e5ec8193a5ae4516f5df556d60f802eefa254e04bb7bfe3945a429a90b6e9bf2b4ed4acfd9363a SHA512 e6131b1f334ef2274fbd0bbe6b90dd8fdcb09804d940e76e7745aaf039e40999a8bba616f4b471d4add98624047c60aec372e381317a7244902898718043a690
 EBUILD unixODBC-2.3.6.ebuild 1785 BLAKE2B aa3ba92f38344e7a48517ecc302ea184dd9eb67831c19c34825266f7f75c71eec9c49b681d5278d72807a210d748764d260044f54f5e2ecea965729dfd387be2 SHA512 e4fd0ecdd6c81b331e4ff4f6a8e9aafb483712c8dab16c2334a04b29764eb500764c258969636696594db40af820b0421f91388c3627c7d7108e8a15169b6a3f
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
index a4ba391c6e1f..cd3b800e0238 100644
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-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="
diff --git a/dev-db/unixODBC/unixODBC-2.3.5.ebuild b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
deleted file mode 100644
index ecd0f80dce25..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-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"
-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}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-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)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	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
-
-	use prefix && dodoc README*
-	prune_libtool_files
-}