commit: 56767b4da64d320c30c9b214c0411f1dcab86fa4 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Mon Aug 6 13:30:31 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Aug 6 13:41:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56767b4d
dev-db/freetds: [QA] fix multiple violations * Fix broken --docdir on Prefix * Don't build static archives unless USE="static-libs" is enabled * Remove .la files unless USE="static-libs" is enabled * Bump to EAPI 7 * Clean up overly complicated src_configure * Add subslot operator for gnutls, libressl and openssl Package-Manager: Portage-2.3.44, Repoman-2.3.10 dev-db/freetds/freetds-1.00.341.ebuild | 44 +++++++++++++++++++--------------- dev-db/freetds/metadata.xml | 2 +- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dev-db/freetds/freetds-1.00.341.ebuild b/dev-db/freetds/freetds-1.00.341.ebuild index f975c08fe56..77ec3228c82 100644 --- a/dev-db/freetds/freetds-1.00.341.ebuild +++ b/dev-db/freetds/freetds-1.00.341.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +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). @@ -13,25 +13,23 @@ 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" +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 ) + 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 ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) )" - DEPEND="${COMMON_DEPEND}" # bind-tools is needed because the osql script calls "host". @@ -48,15 +46,23 @@ REQUIRED_USE="?? ( iodbc odbc )" S="${WORKDIR}/${MY_PN}.${PV}" 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[@]}" + 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/metadata.xml b/dev-db/freetds/metadata.xml index 6f49eba8f49..7a38bb90096 100644 --- a/dev-db/freetds/metadata.xml +++ b/dev-db/freetds/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata>
