updated for version 2.0.4

CHANGELOG

@@ -1,3 +1,11 @@
+Version 2.0.4
+xx-11-2014
+
+[Feature] - Add Robby Workman, Alien Bob (Eric Hameleers) and
+            slacky.eu repositories.
+
+[Updated] - Fix remove list reference.
+
 Version 2.0.3
 29-10-2014
 

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: slpkg
-Version: 2.0.2
+Version: 2.0.4
 Author: dslackw
 Author-email: d zlatanidis at gmail com
 Maintainer: dslackw

README.rst

@@ -11,9 +11,9 @@
 
 Latest Release:
 
-- Version: 2.0.3
+- Version: 2.0.4
 - `Package <https://sourceforge.net/projects/slpkg/files/slpkg/binary/>`_
-- `Source <https://github.com/dslackw/slpkg/archive/v2.0.3.tar.gz>`_
+- `Source <https://github.com/dslackw/slpkg/archive/v2.0.4.tar.gz>`_
 - `CHANGELOG <https://github.com/dslackw/slpkg/blob/master/CHANGELOG>`_
  
 .. image:: https://raw.githubusercontent.com/dslackw/images/master/slpkg/logo.png
@@ -29,10 +29,13 @@ packages.
 
 Slpkg is `Open Source <http://en.wikipedia.org/wiki/Open_source>`_ software written in 
 Python language. It's use is for managing packages in Slackware linux distribution.
-Species are adapted to two repositories:
+Supported Repositories:
 
 - SBo - `slackbuilds.org <http://slackbuilds.org/>`_
 - Slack - `slackware.com <http://www.slackware.com/>`_
+- Alien - `alien bob <http://www.slackware.com/~alien/slackbuilds/>`_
+- Slacky - `slacky.eu <http://repository.slacky.eu/>`_
+- Robby's - `rworkman's <http://rlworkman.net/pkgs/>`_
 
 Slpkg works in accordance with the standards of the organization slackbuilds.org 
 to builds packages. Also uses the Slackware linux instructions for installation,
@@ -100,8 +103,8 @@ Untar the archive and run install.sh script:
 
 .. code-block:: bash
     
-    $ tar xvf slpkg-2.0.3.tar.gz
-    $ cd slpkg-2.0.3
+    $ tar xvf slpkg-2.0.4.tar.gz
+    $ cd slpkg-2.0.4
     $ ./install.sh
 
 Using `pip <https://pip.pypa.io/en/latest/>`_ :
@@ -144,9 +147,11 @@ Command Line Tool Usage
       -r, [package...]                          remove binary packages
       -d, [package...]                          display the contents
     Repositories:
-          SlackBuilds = sbo
           Slackware = slack '--current'
-    
+          Alien = alien '--current'
+          SlackBuilds = sbo
+          Slacky = slacky
+          Robby's = rlw
 
 Slpkg Examples
 --------------
@@ -378,7 +383,7 @@ Auto tool to build package:
 
     Searching for symbolic links:
 
-    No symbolic links were found, so we won't make an installation script.
+    No symbolic links were found, so we wont make an installation script.
     You can make your own later in ./install/doinst.sh and rebuild the
     package if you like.
 

install.sh

@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slpkg
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.0.4}
 TAG=${TAG:-_dsw}
 
 cd ..
@@ -35,18 +35,21 @@ if [ -f $PRGNAM-$VERSION.zip ]; then
     chmod +x $PRGNAM.SlackBuild
     ./$PRGNAM.SlackBuild
     rm $PRGNAM-$VERSION.zip 
+
 elif [ -f v$VERSION.zip ]; then
     cp v$VERSION.zip $PRGNAM-$VERSION/slackbuild
     cd $PRGNAM-$VERSION/slackbuild
     chmod +x $PRGNAM.SlackBuild
     ./$PRGNAM.SlackBuild
     rm v$VERSION.zip
+
 elif [ -f $PRGNAM-$VERSION.tar.gz ]; then
     cp $PRGNAM-$VERSION.tar.gz $PRGNAM-$VERSION/slackbuild
     cd $PRGNAM-$VERSION/slackbuild
     chmod +x $PRGNAM.SlackBuild
     ./$PRGNAM.SlackBuild
     rm $PRGNAM-$VERSION.tar.gz
+
 else
     cp v$VERSION.tar.gz $PRGNAM-$VERSION/slackbuild
     cd $PRGNAM-$VERSION/slackbuild

man/slpkg.8

@@ -52,8 +52,11 @@ Optional arguments:
   -d, [package...]                          display the contents
 
 Repositories:
+      Slackware = slack '--current'
+      Alien = alien '--current'
       SlackBuilds = sbo
-      Slackware = slack '--current'\fP
+      Slacky = slacky
+      Robby's = rlw\fP
 
 .SH GLOBAL OPTIONS
 .TP

slackbuild/README

@@ -1,9 +1,12 @@
 Slpkg is Open Source software written in Python language.
 It's use is for managing packages in Slackware linux
-distribution. Species are adapted to two repositories:
+distribution. Supported Repositories:
 
 - SBo - slackbuilds.org 
-- Slack - slackware.com 
+- Slack - slackware.com
+- Alien - alien bob
+- Slacky - slacky.eu
+- Robby's - rworkman's 
 
 Slpkg works in accordance with the standards of the organization 
 slackbuilds.org to builds  packages. Also uses the Slackware linux 

slackbuild/slpkg.SlackBuild

@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=slpkg
-VERSION=${VERSION:-2.0.3}
+VERSION=${VERSION:-2.0.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_dsw}
 

slackbuild/slpkg.info

@@ -1,7 +1,7 @@
 PRGNAM="slpkg"
-VERSION="2.0.3"
+VERSION="2.0.4"
 HOMEPAGE="https://github.com/dslackw/slpkg"
-DOWNLOAD="https://github.com/dslackw/slpkg/archive/v2.0.3.tar.gz"
+DOWNLOAD="https://github.com/dslackw/slpkg/archive/v2.0.4.tar.gz"
 MD5SUM=""
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""

slpkg/__metadata__.py

@@ -25,7 +25,7 @@ import os
 
 __all__ = "slpkg"
 __author__ = "dslackw"
-__version_info__ = (2, 0, 3)
+__version_info__ = (2, 0, 4)
 __version__ = "{0}.{1}.{2}".format(*__version_info__)
 __license__ = "GNU General Public License v3 (GPLv3)"
 __email__ = "d.zlatanidis@gmail.com"

slpkg/others/install.py

@@ -61,7 +61,7 @@ class Others(object):
         if not os.path.exists(self.tmp_path):
             os.mkdir(self.tmp_path)
         self.step = 700
-        # Choose mirror and open file
+
         repos = Repo()
         if self.repo == "rlw":
             lib = lib_path + "rlw_repo/PACKAGES.TXT"
@@ -166,11 +166,23 @@ def store(*args):
     Store and return packages for install
     '''
     dwn, install, comp_sum, uncomp_sum = ([] for i in range(4))
-    for pkg in args[4]:
+    # check if dependencies
+    if len(args[4]) > 1:
+        for pkg in args[4]:
+            for name, loc, comp, uncomp in zip(args[0], args[1], args[2],
+                                               args[3]):
+                pkg_name = "{0}-{1}".format(split_package(name)[0],
+                                            split_package(name)[1])
+                if pkg + "-" in pkg_name and pkg not in BlackList().packages():
+                    # store downloads packages by repo
+                    dwn.append("{0}{1}/{2}".format(args[5], loc, name))
+                    install.append(name)
+                    comp_sum.append(comp)
+                    uncomp_sum.append(uncomp)
+    else:
         for name, loc, comp, uncomp in zip(args[0], args[1], args[2], args[3]):
-            pkg_name = "{0}-{1}".format(split_package(name)[0],
-                                        split_package(name)[1])
-            if pkg in pkg_name and pkg not in BlackList().packages():
+            package = "".join(args[4])
+            if package in name and package not in BlackList().packages():
                 # store downloads packages by repo
                 dwn.append("{0}{1}/{2}".format(args[5], loc, name))
                 install.append(name)
@@ -276,9 +288,6 @@ def rlw_deps(name):
         "texlive": "libsigsegv texi2html",
         "xfburn": "libburn libisofs"
     }
-    # fix double inkscape package
-    if name.startswith("inkscape"):
-        name = "inkscape"
     if name in dependencies.keys():
         return dependencies[name]
     else: