From 2210c4a60dd8fb6420f7bd3c6fe00ed0ae4c51be Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 22 Apr 2020 01:27:50 +0800
Subject: python-packages: Clean up Makefiles

This removes:

* Python 3 variants (VARIANT:=python3)

* "for Python3" from package titles

* Package selection condition from package dependencies, e.g.
  +PACKAGE_python3-six:python3-light replaced with +python3-light

* "Default" package information sections, e.g.
  Package/python-six/Default removed and package details merged into
  Package/python3-six

* "(Variant for Python3)" from package descriptions

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 lang/python/python-cryptography/Makefile | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'lang/python/python-cryptography')

diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile
index 6d52596b5..495e077c4 100644
--- a/lang/python/python-cryptography/Makefile
+++ b/lang/python/python-cryptography/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cryptography
 PKG_VERSION:=2.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=cryptography
 PKG_HASH:=0cacd3ef5c604b8e5f59bf2582c076c98a37fe206b31430d0cd08138aff0986e
@@ -26,30 +26,23 @@ include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-define Package/python-cryptography/Default
+define Package/python3-cryptography
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
   TITLE:=Cryptographic recipes and primitives
   URL:=https://github.com/pyca/cryptography
-  DEPENDS:=+libopenssl
-endef
-
-define Package/python3-cryptography
-$(call Package/python-cryptography/Default)
-  DEPENDS+= \
-      +PACKAGE_python3-cryptography:python3 \
-      +PACKAGE_python3-cryptography:python3-cffi \
-      +PACKAGE_python3-cryptography:python3-six
-  VARIANT:=python3
+  DEPENDS:= \
+      +libopenssl \
+      +python3 \
+      +python3-cffi \
+      +python3-six
 endef
 
 define Package/python3-cryptography/description
 cryptography is a package which provides cryptographic recipes and
 primitives to Python developers.  Our goal is for it to be your "cryptographic
 standard library". It supports Python 2.6-2.7, Python 3.3+, and PyPy 2.6+.
-.
-(Variant for Python3)
 endef
 
 $(eval $(call Py3Package,python3-cryptography))
-- 
cgit