gentoo resync : 29.01.2021

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 640c3426f230..e9f6ce19f6ed 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,5 +1,3 @@
-DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
 DIST freetds-dev.1.2.18.tar.gz 3406990 BLAKE2B f0134ee0a322cb9e7a7fefbf9e85c60b826318b546febde78e53d5ec22dc2c8e269b7e830da6d84267d16a2dc2cf367a54354765017a40e07af2c3c6be54676e SHA512 315f40ba0d97281f852ec99fac457ec4b2a30879a2384bfa2d7c680aad6c056b6ae23fc192c18db4fba75caff552ef86de7bbfc5d7b608ea5a12531bf9eadc4c
-EBUILD freetds-1.00.558.ebuild 1890 BLAKE2B f4fb4429996adf84235bc63c9cbe4544e41123e25457820357833e2d41de51fd36434dfd210d4b1a1a529bd5d921b74b86a7f0f1360c11763ba8f5f499f7a05b SHA512 ddd04c9cb5595d029a9ddd0462e5112f4493ebdc22def7ca7e23942e1dac3b6e007eb65e5a35a48a86dcc25749fd636bc2430d84715885a37e177dfc727d9a19
-EBUILD freetds-1.2.18.ebuild 1634 BLAKE2B 13b90106cbe5666c3202e6fa59897accd4077adb8868288cbc389e593cfceeddda9500decf7e7a955ed2d77c852a9a89d0018dec45bafe8ef2ccf4a9055e88bc SHA512 84f5965abfc6b4ae12d496e51ed8a6569936f054d3ba7040929f5e4eaf4e2c11a211179afba1c0a54763a4c81ccf7b7bb9bdfb1a3f6c41e24a6f39378bf58ef7
+EBUILD freetds-1.2.18.ebuild 1633 BLAKE2B ace457a04b580f5caef7d4cb2df82e09b702079fae48a4ff5f2a9ccc01b8626295f7300288f19604ebd8995385fb82881d641d6faebf1b7bb079727a02a3d36a SHA512 b28bca48dc9039598bdacc010e08cb2735879e5b44b3ebffe15e625a8281a9afea93d21ae422a2a29962cae9f439faeeb399ba0a40a8594f8cbfeda46af13f61
 MISC metadata.xml 251 BLAKE2B 632781bc9fafff55239abb98f5b98cd2dfb01f5f8949dec160ef1007a7cfd513ff9f630157acb90efa4d03183cf9fecd5965d79a46ceea694961ff120dc3486c SHA512 8b481bb37df703c67035739c99511a846fa86d497f4d2bb7a8b86a9409cabcfce2b4c0011828c9e42077234ac1ab4af96c2f0c01dd6e7e65ac93b6f75c0779a1
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
deleted file mode 100644
index 7cc9262c47d1..000000000000
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://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 sparc x86 ~ppc-macos"
-
-IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
-# 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 )"
-
-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
-"
-
-S="${WORKDIR}/${MY_PN}.${PV}"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable debug) \
-		$(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.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild
index 1efdc86b1872..e8b1511db368 100644
--- a/dev-db/freetds/freetds-1.2.18.ebuild
+++ b/dev-db/freetds/freetds-1.2.18.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 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for