From e4fef222a4070a4a9395df84e81efa3931bd5ddd Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Thu, 31 Dec 2020 19:23:51 +0800
Subject: [PATCH] bpytop: bump to 1.0.53

---
 package/ctcgfw/bpytop/Makefile | 39 ++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/package/ctcgfw/bpytop/Makefile b/package/ctcgfw/bpytop/Makefile
index d4c882891d..2908832451 100644
--- a/package/ctcgfw/bpytop/Makefile
+++ b/package/ctcgfw/bpytop/Makefile
@@ -8,39 +8,46 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bpytop
-PKG_VERSION:=1.0.52
+PKG_VERSION:=1.0.53
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/aristocratos/bpytop/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=15ef1bd094d945b9145343566c2596bb34922870e6be56c3cc028b33aff056fa
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PYPI_NAME:=bpytop
+PKG_HASH:=d08b8120444e7f35fe032b33495ca551b5890702130c45ad8a56c1fa978fc358
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
+include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
 
-define Package/$(PKG_NAME)
+define Package/bpytop
   SECTION:=admin
   CATEGORY:=Administration
   TITLE:=Python port of bashtop
   URL:=https://github.com/aristocratos/bpytop
-  DEPENDS:=+python3-distutils +python3-logging +python3-openssl \
-    +python3-psutil +python3-urllib
+  DEPENDS:=+python3-psutil +python3-setuptools
 endef
 
-define Package/$(PKG_NAME)/description
+define Package/bpytop/description
   Resource monitor that shows usage and stats for
   processor, memory, disks, network and processes.
 endef
 
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bpytop.py $(1)/usr/bin/bpytop
-	$(INSTALL_DIR) $(1)/usr/share/bpytop
-	$(CP) -pr $(PKG_BUILD_DIR)/themes $(1)/usr/share/bpytop
-	chmod 755 $(1)/usr/bin/bpytop
+define Package/bpytop/install
+	$(call Py3Package/$(1)/install,$(1))
+	$(call Py3Package/ProcessFilespec,$(1),$(PKG_INSTALL_DIR),$(1))
+	$(FIND) $(1) -name '*.exe' -delete
+	$(call Python3/CompileAll,$(1))
+	$(call Python3/DeleteSourceFiles,$(1))
+	$(call Python3/DeleteEmptyDirs,$(1))
+	if [ -d "$(1)/usr/bin" ]; then \
+		$(call Python3/FixShebang,$(1)/usr/bin/*) ; \
+	fi
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/bpytop
+	$(CP) $(PKG_BUILD_DIR)/bpytop-themes/* $(PKG_INSTALL_DIR)/usr/share/bpytop/
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call Py3Package,bpytop))
+$(eval $(call BuildPackage,bpytop))
+#$(eval $(call BuildPackage,bpytop-src))