gentoo resync : 24.12.2018

5 files changed, 2 insertions, 194 deletions

diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 533e7c8757f3..af86ee6ec221 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,10 +1,6 @@
-AUX without-flags.patch 1859 BLAKE2B 846c177b9773c27b329a23f54592a2b789b0d8d123a80b0b990b8938fed8a27c2ad5eac33eeb5e9caf5d12a59943048092c277ab45a34948bf19a3605d036ded SHA512 b981dd2ddab06e4c163d847de9a1086515775abacbbcf10be5d67388ce5502a37a23bb6c94eaf36082dc36d30060ff12a38fd9ceb6b93e3f8116d2de7ddcb2e7
 DIST freetds-1.00.41.tar.gz 2904915 BLAKE2B d92789c9a08dc9f7f04e8efc828841c3cace0e5a3affd11d8751a785db70db79fedffb3745a681b960d30a11efbb4fa457805eb4f72444eecc20eb65d46e2d82 SHA512 dec3197a6478fc59b7386f9a7a562df8b581bba7184210c42f26827e957b9746e6820d687a9c6cbcd7c825fc5d4f556547c0483d06c786a064d5c4859db4daa1
-DIST freetds-1.00.54.tar.gz 2907015 BLAKE2B 332888565c2890657ca6440e4bbe92e0324daf6c6e67f3fa2243bd2d5746e7e9aa100a7838d33cc8fa93e71e5d6a650976ce5164317f3147b192ceb915362534 SHA512 a2a5034705fe06ee38b085f980f6ddf086789abc9485331fdaf829e7243f7ba95a5f0c612d7e3ec9e10f28a5c8b3a3fd8e7853d66f67110bd860afce949c798c
 DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
-EBUILD freetds-1.00.341-r1.ebuild 1923 BLAKE2B a4d5512227942fa186376800626487c25dd3427f2e59396fa33dcff7b3372b2ec77e937a00cb64449d7a293566779a909f7edddc52c617bd4acbdac18b6e6035 SHA512 e0b050b1f3e4561abcb78ba526ab3320d721dcb7374b37e231bd58af94f79937d5fa6ad91fd94410429e1cb4252a890fb1093185a50f3d3bb643b483d3c662b2
-EBUILD freetds-1.00.341.ebuild 1891 BLAKE2B c033f9851e0cd02697976652d48fc50d40faf24282f7c337b9df6bb12c6a2d5443ff35c710d7460f3691f927256475c4cd60d0b4113da93e54e719d181a83a83 SHA512 ebcb93cd255f63f5f8d6fa67eb149853d6d21b392f8371cd2f696a69563a48eaabfbf4499f59569309c59ac44b463f66703454ff7e993073611f7922cedb31cc
+EBUILD freetds-1.00.341-r1.ebuild 1914 BLAKE2B a88a9d5ae6c21bd1d10fbe6fef807da75051fef2cb4a3e38db57ca88da923352d1c320ae54d737dc54eeec31169a4ed38611a2bf41cd788bf55d8bac130616f7 SHA512 1f2cd77c0a6a6b834ca81928de710ceefe169eb7d1292aace246d2644946ad9e196776de04b4b2529e82458fa4278d19cc74a1b1e5d5f1b0e32b7d4bcd7cdef6
 EBUILD freetds-1.00.41.ebuild 1988 BLAKE2B 58e5b9ecc1ec5196c3e4e50cfccefa6ca44510ba344b1d024f1280667e47d4351ce1946dea1f963cc3feb0a8a5382812e046173579fd961d522b3155ad422261 SHA512 a48ffe06b8303885d2e795d9cfe756979652460da4912de33dde0a06b635c3466f3abebfdad17ef7aa8cc35fb5f79eeca8457f18c2999108b13367eb2a8d7e02
-EBUILD freetds-1.00.54-r1.ebuild 2064 BLAKE2B 6ec6575c86163e8678fbf841fbe8aa85e5fc7fd6e1839ff423dc542718e8ef88c2ef19e178bc7f76493e78b8e6edbbcfec87af85ebad2ca1153e07cdbb15e664 SHA512 48931c5f0e49cdd9f07e413339a0e647a4b48eec562cfe337a6c57243d11a99d47977d8987902a6ecafa3930a94a1102912c57359e146f155f6fcf6ee5753ce0
 EBUILD freetds-9999.ebuild 1603 BLAKE2B 4a6149df3ad684b7246fed4f19c457f8a74c12a6ad89114d04890a86f9a41a02f7023c07dc55c139865091aed89a70accf993dc77bae4ffdc1f0bb3ff1698794 SHA512 264144b12f57bd34d1ace56458e4ea2cda0f4f5fd9f789373d8e7b4695cdf910562441359218b0c7c8bac446c8fa5673c56a37d0cfef444fc6d11fe57f2121b9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/files/without-flags.patch b/dev-db/freetds/files/without-flags.patch
deleted file mode 100644
index 1f04a90ac6af..000000000000
--- a/dev-db/freetds/files/without-flags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c4b9d766e009273c70d8953767ef2fcb95f65314 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Fri, 11 Aug 2017 16:45:15 -0400
-Subject: [PATCH] configure.ac: support "without" versions of three ./configure
- flags.
-
-The --with-iodbc, --with-unixodbc, and --with-odbc-nodm flags all use
-the standard AC_ARG_WITH macro. The resulting ./configure script
-accepts e.g. --without-iodbc to indicate that the user does not want
-to enable iODBC, and in place of a path the word "no" is placed into
-the $with_iodbc variable. The current configure.ac doesn't handle that
-and instead treats "no" as a path. This commit updates configure.ac to
-ignore "no" as the value of those three flags.
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f41033ae..9dfe12bb7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -546,7 +546,7 @@ esac
- 
- AC_ARG_WITH(iodbc,
- AS_HELP_STRING([--with-iodbc=DIR], [build odbc driver against iODBC in DIR]))
--if test "$with_iodbc"; then
-+if test "x$with_iodbc" != "x" -a "x$with_iodbc" != "xno"; then
- 	if echo "$with_iodbc" | grep -v '^/'; then
- 		with_iodbc="$PWD/$with_iodbc"
- 	fi
-@@ -563,7 +563,7 @@ fi
- 
- AC_ARG_WITH(unixodbc,
- AS_HELP_STRING([--with-unixodbc=DIR], [build odbc driver against unixODBC in DIR]))
--if test "$with_unixodbc"; then
-+if test "x$with_unixodbc" != "x" -a "x$with_unixodbc" != "xno"; then
- 	if echo "$with_unixodbc" | grep -v '^/'; then
- 		with_unixodbc="$PWD/$with_unixodbc"
- 	fi
-@@ -588,7 +588,7 @@ fi
- 
- AC_ARG_WITH(odbc_nodm,
- AS_HELP_STRING([--with-odbc-nodm=DIR], [build odbc using headers in DIR/include]))
--if test "$with_odbc_nodm"; then
-+if test "x$with_odbc_nodm" != "x" -a "x$with_odbc_nodm" != "xno"; then
- 	if echo "$with_odbc_nodm" | grep -v '^/'; then
- 		with_odbc_nodm="$PWD/$with_odbc_nodm"
- 	fi
diff --git a/dev-db/freetds/freetds-1.00.341-r1.ebuild b/dev-db/freetds/freetds-1.00.341-r1.ebuild
index 5dc4218c97b3..0f6169b1d435 100644
--- a/dev-db/freetds/freetds-1.00.341-r1.ebuild
+++ b/dev-db/freetds/freetds-1.00.341-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/freetds/freetds-1.00.341.ebuild b/dev-db/freetds/freetds-1.00.341.ebuild
deleted file mode 100644
index 77ec3228c82b..000000000000
--- a/dev-db/freetds/freetds-1.00.341.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is from the "current" release series, because the "stable" series
-# is a little too stable for us (missing bug fixes, and so on).
-MY_PN="${PN}-dev"
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
-RESTRICT="test"
-
-# sed, grep, and awk are used by the build system and the osql script.
-COMMON_DEPEND="sys-apps/sed
-	sys-apps/grep
-	virtual/awk
-	gnutls? ( net-libs/gnutls:= )
-	iconv? ( virtual/libiconv )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	odbc? ( dev-db/unixODBC )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${COMMON_DEPEND}"
-
-# bind-tools is needed because the osql script calls "host".
-# binutils is for "strings".
-RDEPEND="${COMMON_DEPEND}
-	sys-devel/binutils
-	net-dns/bind-tools"
-
-# iODBC and unixODBC are mutually-exclusive choices for
-# the ODBC driver manager. Future versions of FreeTDS
-# will throw an error if you specify both.
-REQUIRED_USE="?? ( iodbc odbc )"
-
-S="${WORKDIR}/${MY_PN}.${PV}"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable iconv libiconv) \
-		$(use_enable kerberos krb5) \
-		$(use_enable mssql msdblib) \
-		$(use_enable static-libs static) \
-		$(use_with iodbc) \
-		$(use_with odbc unixodbc "${EPREFIX}/usr") \
-		$(use_with iconv libiconv-prefix "${EPREFIX}/usr") \
-		$(use_with gnutls) \
-		$(use_with ssl openssl "${EPREFIX}/usr")
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-db/freetds/freetds-1.00.54-r1.ebuild b/dev-db/freetds/freetds-1.00.54-r1.ebuild
deleted file mode 100644
index 0032727f6bf8..000000000000
--- a/dev-db/freetds/freetds-1.00.54-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="ftp://ftp.freetds.org/pub/freetds/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
-IUSE="gnutls iconv kerberos libressl mssql iodbc odbc ssl"
-RESTRICT="test"
-
-# sed, grep, and awk are used by the build system and the osql script.
-COMMON_DEPEND="sys-apps/sed
-	sys-apps/grep
-	virtual/awk
-	gnutls? ( net-libs/gnutls )
-	iconv? ( virtual/libiconv )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	odbc? ( dev-db/unixODBC )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-# bind-tools is needed because the osql script calls "host".
-# binutils is for "strings".
-RDEPEND="${COMMON_DEPEND}
-	sys-devel/binutils
-	net-dns/bind-tools"
-
-# iODBC and unixODBC are mutually-exclusive choices for
-# the ODBC driver manager. Future versions of FreeTDS
-# will throw an error if you specify both.
-REQUIRED_USE="?? ( iodbc odbc )"
-
-# Won't be necessary in the next release.
-PATCHES=( "${FILESDIR}/without-flags.patch" )
-
-src_prepare() {
-	default
-
-	# Fix the iodbc include path in the configure script. Otherwise, it
-	# can't find isql.h.
-	sed -ie 's:with_iodbc/include":with_iodbc/include/iodbc":' \
-		configure.ac \
-		|| die "failed to fix the iodbc include path in configure.ac"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=( $(use_with iodbc iodbc "${EPREFIX}/usr") )
-	myconf+=( $(use_with odbc unixodbc "${EPREFIX}/usr") )
-	myconf+=( $(use_enable iconv libiconv) )
-	myconf+=( $(use_with iconv libiconv-prefix "${EPREFIX}/usr") )
-	myconf+=( $(use_enable kerberos krb5) )
-	myconf+=( $(use_enable mssql msdblib) )
-	myconf+=( $(use_with gnutls) )
-	myconf+=( $(use_with ssl openssl "${EPREFIX}/usr") )
-	myconf+=( --docdir="/usr/share/doc/${PF}" )
-
-	econf "${myconf[@]}"
-}