[gentoo-commits] repo/gentoo:master commit in: dev-db/freetds/files/, dev-db/freetds/

[Mikle Kolyada]

commit:     298ab12ddb0abc4bfbad348d9ab27ec8b55d50ea
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 15:48:10 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 15:48:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298ab12d

dev-db/freetds: Drop old

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/freetds/Manifest                  |  1 -
 dev-db/freetds/files/without-flags.patch | 48 ---------------------
 dev-db/freetds/freetds-1.00.341.ebuild   | 68 ------------------------------
 dev-db/freetds/freetds-1.00.54-r1.ebuild | 72 --------------------------------
 4 files changed, 189 deletions(-)

diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 18a22a07a78..c4845e1fafd 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/dev-db/freetds/files/without-flags.patch b/dev-db/freetds/files/without-flags.patch
deleted file mode 100644
index 1f04a90ac6a..00000000000
--- 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@××××××××.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.ebuild b/dev-db/freetds/freetds-1.00.341.ebuild
deleted file mode 100644
index 77ec3228c82..00000000000
--- 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 0032727f6bf..00000000000
--- 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[@]}"
-}