From 6047d9b2347dd2d024df4e44c4c23f8a9d1d9d45 Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Wed, 24 Dec 2014 08:10:34 +0200
Subject: [PATCH] update repository slacky

---
 CHANGELOG               |  2 +-
 REPOSITORIES            |  6 ------
 slpkg/messages.py       |  9 ---------
 slpkg/others/greps.py   | 27 ---------------------------
 slpkg/others/install.py |  5 -----
 slpkg/tracking.py       |  9 +--------
 6 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fba00d71..57b9035e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Version 2.1.5-dev
 [Updated] - Fix Slackware current upgrade checksums.
           - Fix ingore hiden files in /var/log/packages/ path.
 
-Version 2.1.4-dev
+Version 2.1.4
 16-12-2014
 
 [Feature] - Added command 'update' and remove auto update package lists.
diff --git a/REPOSITORIES b/REPOSITORIES
index dd9c01b6..c73050dc 100644
--- a/REPOSITORIES
+++ b/REPOSITORIES
@@ -6,12 +6,6 @@ SlackBuilds.org (sbo) FAQ(15):
 Slackware current is not supported, but as a general rule, the scripts
 should work on it as well.
 
-Slacky.eu (slacky) repository only work with Slackware.com (slack) repository because
-slacky repository highlights dependencies where include in Slackware distribution so
-'slack' repository needed to distinguish dependencies not included in it.
-(Each time you want to use this repository must be enable and the 'slack' repository in
-file /etc/slpkg.conf).
-
 Rworkman's (rlw) repository use dependencies where displayed in central site 
 'http://rlworkman.net/pkgs/' and only those. Unfortunately there is no fixed reference
 dependencies file PACKAGES.TXT.
diff --git a/slpkg/messages.py b/slpkg/messages.py
index 50410cc9..0d338030 100644
--- a/slpkg/messages.py
+++ b/slpkg/messages.py
@@ -76,12 +76,3 @@ def template(max_len):
     Print template
     '''
     print("+" + "=" * max_len)
-
-
-def slacky_error():
-    '''
-    Slacky repository error
-    '''
-    print("\nRepository slack working together with the slacky.")
-    print("Please add the repository slack from file " +
-          "'/etc/slpkg/slpkg.conf'\n")
diff --git a/slpkg/others/greps.py b/slpkg/others/greps.py
index c142428e..7c32ee38 100644
--- a/slpkg/others/greps.py
+++ b/slpkg/others/greps.py
@@ -31,8 +31,6 @@ from slpkg.__metadata__ import (
     ktown_kde_repo
 )
 
-len_deps = 0
-
 
 def repo_data(PACKAGES_TXT, step, repo, version):
     '''
@@ -160,10 +158,6 @@ class Requires(object):
     def __init__(self, name, repo):
         self.name = name
         self.repo = repo
-        lib = lib_path + "slack_repo/PACKAGES.TXT"
-        f = open(lib, "r")
-        self.SLACK_PACKAGES_TXT = f.read()
-        f.close()
 
     def get_deps(self):
         '''
@@ -224,25 +218,4 @@ class Requires(object):
                     slacky_deps.append(d.split()[0])
             dep = "".join(dep)
             slacky_deps.append(dep.split()[0])
-        slacky_deps = self.remove_slack_deps(slacky_deps)
-        return slacky_deps
-
-    def remove_slack_deps(self, dependencies):
-        '''
-        Because the repository slacky mentioned packages and dependencies
-        that exist in the distribution Slackware, this feature is intended
-        to remove them and return only those needed.
-        '''
-        global len_deps
-        len_deps += len(dependencies)
-        name, slacky_deps = [], []
-        index, toolbar_width, step = 0, 700, (len_deps * 500)
-        for line in self.SLACK_PACKAGES_TXT.splitlines():
-            index += 1
-            toolbar_width = status(index, toolbar_width, step)
-            if line.startswith("PACKAGE NAME:"):
-                name.append("-".join(line[15:].split("-")[:-3]))
-        for deps in dependencies:
-            if deps not in name:
-                slacky_deps.append(deps)
         return slacky_deps
diff --git a/slpkg/others/install.py b/slpkg/others/install.py
index 4f73cd52..9ab376b2 100644
--- a/slpkg/others/install.py
+++ b/slpkg/others/install.py
@@ -33,7 +33,6 @@ from slpkg.downloader import Download
 from slpkg.grep_md5 import pkg_checksum
 from slpkg.splitting import split_package
 from slpkg.messages import (
-    slacky_error,
     pkg_not_found,
     template
 )
@@ -62,10 +61,6 @@ class OthersInstall(object):
         self.repo = repo
         self.version = version
         self.tmp_path = slpkg_tmp_packages
-        if (not os.path.isfile(lib_path + "slack_repo/PACKAGES.TXT") and
-                repo == "slacky"):
-            slacky_error()
-            sys.exit(0)
         print("\nPackages with name matching [ {0}{1}{2} ]\n".format(
               color['CYAN'], self.package, color['ENDC']))
         sys.stdout.write("{0}Reading package lists ...{1}".format(
diff --git a/slpkg/tracking.py b/slpkg/tracking.py
index 2297449a..79b825d5 100644
--- a/slpkg/tracking.py
+++ b/slpkg/tracking.py
@@ -21,15 +21,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import sys
 
 from messages import (
-    template,
-    slacky_error
+    template
 )
 from __metadata__ import (
-    lib_path,
     pkg_path,
     color,
     sp
@@ -51,10 +48,6 @@ def track_dep(name, repo):
     if allready installed and color red
     if not installed.
     '''
-    if (not os.path.isfile(lib_path + "slack_repo/PACKAGES.TXT") and
-            repo == "slacky"):
-        slacky_error()
-        sys.exit(0)
     sys.stdout.write("{0}Reading package lists ...{1}".format(color['GREY'],
                                                               color['ENDC']))
     sys.stdout.flush()