From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 Apr 2021 14:02:22 +0000 (+0000)
Subject: Drop python-progressbar
X-Git-Tag: v2.25-core156~8^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f905cc44d4ce656060af982eed5582753d15d5e;p=ipfire-2.x.git

Drop python-progressbar

This was a dependency of Pakfire 3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/python-progressbar b/config/rootfiles/packages/python-progressbar
deleted file mode 100644
index 453f51db74..0000000000
--- a/config/rootfiles/packages/python-progressbar
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python2.7/site-packages/progressbar-2.2-py2.7.egg-info
-usr/lib/python2.7/site-packages/progressbar.py
-usr/lib/python2.7/site-packages/progressbar.pyc
diff --git a/lfs/python-progressbar b/lfs/python-progressbar
deleted file mode 100644
index b40d8e4660..0000000000
--- a/lfs/python-progressbar
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 2.2
-
-THISAPP    = progressbar-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = python-progressbar
-PAK_VER    = 1
-
-DEPS       =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 8ea4e2c17a8ec9e7d153767c5f2a7b28
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-	@$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && python setup.py install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 550c2a2b34..ece2d6a466 100755
--- a/make.sh
+++ b/make.sh
@@ -1558,7 +1558,6 @@ buildipfire() {
   lfsmake2 libsolv
   lfsmake2 python-distutils-extra
   lfsmake2 python-lzma
-  lfsmake2 python-progressbar
   lfsmake2 ddns
   lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six