commit: 23d8ea01da3bace294eb8a666814eb3ccc653b1e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 09:25:26 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 09:25:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d8ea01
dev-lang/python: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-lang/python/python-2.7.18_p8.ebuild | 7 ++-----
dev-lang/python/python-3.10.0_alpha7.ebuild | 7 ++-----
dev-lang/python/python-3.6.13_p1.ebuild | 7 ++-----
dev-lang/python/python-3.7.10_p1.ebuild | 7 ++-----
dev-lang/python/python-3.8.8_p1.ebuild | 7 ++-----
dev-lang/python/python-3.8.9.ebuild | 7 ++-----
dev-lang/python/python-3.9.2_p1.ebuild | 7 ++-----
dev-lang/python/python-3.9.4.ebuild | 7 ++-----
8 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/dev-lang/python/python-2.7.18_p8.ebuild
b/dev-lang/python/python-2.7.18_p8.ebuild
index a74794af575..59aed167c78 100644
--- a/dev-lang/python/python-2.7.18_p8.ebuild
+++ b/dev-lang/python/python-2.7.18_p8.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86"
-IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6
libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6
+ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
@@ -50,10 +50,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.10.0_alpha7.ebuild
b/dev-lang/python/python-3.10.0_alpha7.ebuild
index 7d2e54b48f9..82f3f29aff1 100644
--- a/dev-lang/python/python-3.10.0_alpha7.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha7.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.6.13_p1.ebuild
b/dev-lang/python/python-3.6.13_p1.ebuild
index a126a676d61..e24be42012b 100644
--- a/dev-lang/python/python-3.6.13_p1.ebuild
+++ b/dev-lang/python/python-3.6.13_p1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test +threads tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -41,10 +41,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.7.10_p1.ebuild
b/dev-lang/python/python-3.7.10_p1.ebuild
index 7a7442b4229..0e99aadfd9c 100644
--- a/dev-lang/python/python-3.7.10_p1.ebuild
+++ b/dev-lang/python/python-3.7.10_p1.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -42,10 +42,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.8.8_p1.ebuild
b/dev-lang/python/python-3.8.8_p1.ebuild
index 9ef8a08637b..b1c4a316ec3 100644
--- a/dev-lang/python/python-3.8.8_p1.ebuild
+++ b/dev-lang/python/python-3.8.8_p1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.8.9.ebuild
b/dev-lang/python/python-3.8.9.ebuild
index 56c8ed395e5..0a87aec9180 100644
--- a/dev-lang/python/python-3.8.9.ebuild
+++ b/dev-lang/python/python-3.8.9.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.9.2_p1.ebuild
b/dev-lang/python/python-3.9.2_p1.ebuild
index 60682191e27..ba35fe24eeb 100644
--- a/dev-lang/python/python-3.9.2_p1.ebuild
+++ b/dev-lang/python/python-3.9.2_p1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390
sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
diff --git a/dev-lang/python/python-3.9.4.ebuild
b/dev-lang/python/python-3.9.4.ebuild
index e3e5d129c15..444f9d6d14b 100644
--- a/dev-lang/python/python-3.9.4.ebuild
+++ b/dev-lang/python/python-3.9.4.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline
+sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 +ncurses +readline +sqlite
+ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
@@ -43,10 +43,7 @@ RDEPEND="app-arch/bzip2:=
ncurses? ( >=sys-libs/ncurses-5.2:= )
readline? ( >=sys-libs/readline-4.1:= )
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
+ ssl? ( dev-libs/openssl:= )
tk? (
>=dev-lang/tcl-8.0:=
>=dev-lang/tk-8.0:=
