gentoo resync : 02.08.2019

4 files changed, 2 insertions, 140 deletions

diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index af6d13dfcc71..f27e252a0dca 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,6 +1,3 @@
-DIST freetds-dev.1.00.341.tar.gz 3002134 BLAKE2B c9396c1f205e13c9f3449bef19830cf3b6c2fa72539555ebd6bc1532c014472c862ba2ac7f495bee8f53d640d628c6b15bb50183585d43cf3dbbea4e314636d2 SHA512 fd691535dfa5c97463ff72056cfa5721557b71e41b6186ffcb08e193e51214cf966a33ee55b8e538a6f035aeeef14ac5b15fe8758f1afea9e1252a3b8951ba58
 DIST freetds-dev.1.00.558.tar.gz 3151542 BLAKE2B e7b7eb1d4bad1472a675e7657d524837a27ba18176cf410ebad6dcb949cd59bb50e932526790c816c05cf0ba02fb750a1cfbcda10073e5cbf8908bdc4ceb9cc5 SHA512 763f04ae36be8385f9be955defd2d91698389836e80e19019f0da0ee15515d8b7e3733f7659362a307b492dc83830f0a7f27d2a68cb5b56e2ef171ac1dcfeeca
-EBUILD freetds-1.00.341-r1.ebuild 1914 BLAKE2B a739c9f05f37b5876d79074a47d018bb9742ee1a7461fab15dac1db5d9b01b8442412c6a06245b93619bc16bec74bb92edc965a81a8437930235beda4a3933f3 SHA512 2709b5630a970e0beca0cc70b7b9778da7bb1875646a5d68bec6ec46f98e854395a0638c273c2aaa31d3f2f16d970b2a4b11e4671abc32d08c386128d661d5ca
-EBUILD freetds-1.00.558.ebuild 1914 BLAKE2B 0378419a4552c049c6cdea5e7aed20b0637f7ab9994e1c3ecebd8619cceea0b4362bff56e5b0ffe3cc76ee27702ef6733ba5bc56a53986fd3275110570858a12 SHA512 8d60d5b99b6be13a766b5c7a64179431852d03fc80098b525904986d100e1706b21713f56012e72cecf3752182764ccda4de3cd1b5c0226530b21169feabf941
-EBUILD freetds-9999.ebuild 1601 BLAKE2B a7dc691ca1e9785e216015af2ca9defb1191ad2a2178677192e0a747d94b430bc12caa403bb9ecfc81f966a770c5a67f08b59ef24ab9730459bc13eac25cd32d SHA512 d7a1ace59c852d24f8c58a70bb0b44261d08dbe92e63a725beaf3b347053a21f5d9162233eb79fc9e296251820c17f87bc60b24b86bef7950a5fa100a65f7f3b
+EBUILD freetds-1.00.558.ebuild 1913 BLAKE2B d01fd67babe2696802165a08f0c5cf4ba49e456ca56bfd3778eaa8f0324561e2976e5ebf0d354918f59b2d5732ea92f2a205b11a3e27ac54892f2da853478bac SHA512 6935c1e7bc76c72906defd219b1237816fd55e09e2a37dd33a84d14916d467b8f6220ae4f6432d3f723ab322649a23d25827d0a60d9bcff47a1502c49b33f61f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-db/freetds/freetds-1.00.341-r1.ebuild b/dev-db/freetds/freetds-1.00.341-r1.ebuild
deleted file mode 100644
index 27e73e304acd..000000000000
--- a/dev-db/freetds/freetds-1.00.341-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 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 ~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
-# 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.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index f8ceb253edd2..d6612b9ce200 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.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-9999.ebuild b/dev-db/freetds/freetds-9999.ebuild
deleted file mode 100644
index a18ef188436e..000000000000
--- a/dev-db/freetds/freetds-9999.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="https://www.freetds.org/"
-EGIT_REPO_URI="https://github.com/FreeTDS/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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 )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=( $(use_with iodbc) )
-	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[@]}"
-}