From 805112120c0887fe06027d728ef3cae3d9ae55fc Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 27 Sep 2018 23:56:06 +0200 Subject: gnustep-libs/sqlclient: update mysql dependency Move from virtual/mysql to dev-db/mysql-connector-c as the package looks for libmysqlclient Closes: https://bugs.gentoo.org/665904 Package-Manager: Portage-2.3.50, Repoman-2.3.11 --- gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild | 47 ++++++++++++++++++++++++ gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild | 47 ------------------------ 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild delete mode 100644 gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild diff --git a/gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild b/gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild new file mode 100644 index 000000000000..1e588e7d224a --- /dev/null +++ b/gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit java-pkg-opt-2 gnustep-2 + +MY_P=${P/sqlc/SQLC} +DESCRIPTION="GNUstep lightweight database abstraction layer" +HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient" +SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz" + +KEYWORDS="~amd64 ~ppc ~x86" +LICENSE="LGPL-3" +SLOT="0" + +IUSE="java mysql postgres +sqlite" + +RDEPEND=">=gnustep-libs/performance-0.3.2 + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:= ) + sqlite? ( >=dev-db/sqlite-3 )" +DEPEND="${RDEPEND}" + +REQUIRED_USE="|| ( java mysql postgres sqlite )" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + if ! use doc; then + # Remove doc target + sed -i -e '/documentation\.make/d' GNUmakefile \ + || die "doc sed failed" + fi + + default +} + +src_configure() { + local myconf="" + use java || myconf="${myconf} --disable-jdbc-bundle" + use mysql || myconf="${myconf} --disable-mysql-bundle" + use postgres || myconf="${myconf} --disable-postgres-bundle" + use sqlite || myconf="${myconf} --disable-sqllite-bundle" + + egnustep_env + econf ${myconf} +} diff --git a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild deleted file mode 100644 index 6861f637d3cb..000000000000 --- a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit java-pkg-opt-2 gnustep-2 - -MY_P=${P/sqlc/SQLC} -DESCRIPTION="GNUstep lightweight database abstraction layer" -HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz" - -KEYWORDS="~amd64 ~ppc ~x86" -LICENSE="LGPL-3" -SLOT="0" - -IUSE="java mysql postgres +sqlite" - -RDEPEND=">=gnustep-libs/performance-0.3.2 - mysql? ( virtual/mysql:= ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( >=dev-db/sqlite-3 )" -DEPEND="${RDEPEND}" - -REQUIRED_USE="|| ( java mysql postgres sqlite )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - if ! use doc; then - # Remove doc target - sed -i -e '/documentation\.make/d' GNUmakefile \ - || die "doc sed failed" - fi - - default -} - -src_configure() { - local myconf="" - use java || myconf="${myconf} --disable-jdbc-bundle" - use mysql || myconf="${myconf} --disable-mysql-bundle" - use postgres || myconf="${myconf} --disable-postgres-bundle" - use sqlite || myconf="${myconf} --disable-sqllite-bundle" - - egnustep_env - econf ${myconf} -} -- cgit v1.2.3-65-gdbad