commit:     5899b2a67db444d52c24a08af75600cc725662f7
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 08:16:38 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 08:16:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5899b2a6

dev-db/mysql-connector-c++: remove libressl support

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

 dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild | 7 +++----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild    | 9 ++++-----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild    | 9 ++++-----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild    | 9 ++++-----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild    | 9 ++++-----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild    | 7 +++----
 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild    | 7 +++----
 7 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 8ba7f35606b..a80ceec4db3 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,12 +13,11 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0/7"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
-IUSE="debug examples gcov libressl static-libs"
+IUSE="debug examples gcov static-libs"
 
 DEPEND="dev-db/mysql-connector-c:=
        dev-libs/boost:=
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
+       dev-libs/openssl:0=
        !<dev-db/mysql-connector-c-6.1.8"
 RDEPEND="${DEPEND}"
 

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
index 1e2ef79a9a7..b02bf3f85f0 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.19-fix-libressl-support.patch
 )
 
 src_configure() {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
index fcacc48a054..bad1c840c8f 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+       "
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
index 679e73b030f..40911b8f944 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.19-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
index 3f0eadd2941..99d319d98c9 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+       "
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
index a48f5e39011..629a5b274f4 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.23.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+       "
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
 )
 
 src_configure() {

diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild 
b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
index 8edd7e9d054..a7c6ee2c227 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.24.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz";
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+legacy libressl"
+IUSE="+legacy"
 
 RDEPEND="
        dev-libs/protobuf:=
@@ -22,14 +22,13 @@ RDEPEND="
                dev-libs/boost:=
                >=dev-db/mysql-connector-c-6.1.8:=
        )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )"
+       dev-libs/openssl:0=
+       "
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-8.0.22-fix-build.patch
-       "${FILESDIR}"/${PN}-8.0.20-fix-libressl-support.patch
        "${FILESDIR}"/${PN}-8.0.24-gcc11-numeric_limits.patch
 )
 

Reply via email to