Removed rlw repository

This commit is contained in:
Dimitris Zlatanidis 2022-05-31 23:43:27 +03:00
parent 54abe8099b
commit fd6380dfc2
12 changed files with 15 additions and 143 deletions

View file

@ -59,11 +59,10 @@ $ slpkg --check
slack No changes in ChangeLog.txt
sbo News in ChangeLog.txt
alien No changes in ChangeLog.txt
rlw No changes in ChangeLog.txt
Summary
===============================================================================
From 5 repositories need 2 updating. Run the command 'slpkg update'.
From 3 repositories need 2 updating. Run the command 'slpkg update'.
```
Add and remove custom repositories:
@ -96,7 +95,6 @@ $ slpkg repo-list
msb http://slackware.org.uk/msb/ yes enabled
multi http://www.slackware.com/~alien/multilib/ yes disabled
ponce http://ponce.cc/slackware/slackware64-14.2/packa~ no enabled
rlw http://rlworkman.net/pkgs/ yes disabled
salix http://download.salixos.org/ yes disabled
sbo http://slackbuilds.org/slackbuilds/ yes enabled
slack http://ftp.cc.uoc.gr/mirrors/linux/slackware/ yes enabled
@ -106,7 +104,7 @@ $ slpkg repo-list
Repositories summary
===============================================================================
3/12 enabled default repositories and 1 custom.
3/11 enabled default repositories and 1 custom.
For enable or disable default repositories edit '/etc/slpkg/repositories.conf'
file.

View file

@ -11,11 +11,6 @@ For the -current users who they use the sbo repository:
Slackware current is not supported, but as a general rule, the scripts
should work on it as well.
Rworkman's (rlw) repository use dependencies where displayed in a central site
'`http://rlworkman.net/pkgs/`' and only those. Unfortunately there is no fixed reference
dependencies in the file PACKAGES.TXT. You can make changes in '`/etc/slpkg/rlworkman.deps`'
file.
Conraid's (conrad) repository must be used only from Slackware64 current users and it has no
reference dependencies.

View file

@ -29,14 +29,13 @@
# repository.
#
# Default repositories names:
# sbo, slack, rlw, alien, conrad, slonly, ktown, multi, salix,
# slackl, msb, csb, connos
# sbo, slack, alien, conrad, slonly, ktown, multi, salix, slackl, msb,
# csb, connos
# NOTE: Slackware repository (slack) served from file slackware-mirros
# -----------------------------------------------------------------------------
#
# NAME URL
sbo http://slackbuilds.org/slackbuilds/
rlw http://slackware.uk/people/rlworkman/
alien http://bear.alienbase.nl/mirrors/people/alien/sbrepos/
conrad http://slack.conraid.net/repository/slackware64-current/
slonly https://slackonly.com/pub/packages/

View file

@ -41,7 +41,6 @@
slack
sbo
# alien
# rlw
# conrad
# slonly
# ktown{latest}

View file

@ -1,35 +0,0 @@
# Rworkman's dependencies:
#
# rlworkman.deps file is part of slpkg.
#
# Copyright 2014-2022 Dimitris Zlatanidis <d.zlatanidis@gmail.com>
# All rights reserved.
#
# Slpkg is a user-friendly package manager for Slackware installations.
#
# https://gitlab.com/dslackw/slpkg
#
# Slpkg 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/>.
#
# END OF LEGAL NOTICE
#
# ----------------------------------------------------------------------------
# Some notes about package dependencies (all deps are also found here):
# Rworkman's repository dependencies as shown in the central page
# http://rlworkman.net/pkgs/
# ----------------------------------------------------------------------------
#
# PACKAGE: DEPENDENCIES
abiword: wv
claws-mail: libetpan
inkscape: lxml numpy BeautifulSoup
xfburn: libburn libisofs

View file

@ -324,7 +324,6 @@ For example:
slackware.com = "slack"
SlackBuilds.org = "sbo"
Alien's = "alien"
rworkman's = "rlw"
Conraid's = "conrad"
slackonly.com = "slonly"
Alien's ktown = "ktown{latest}"

View file

@ -592,7 +592,6 @@ slpkg &minus;&minus;help</b> - display help for slpkg</p>
&quot;slack&quot; <br>
SlackBuilds.org = &quot;sbo&quot; <br>
Alien&rsquo;s = &quot;alien&quot; <br>
rworkman&rsquo;s = &quot;rlw&quot; <br>
Conraid&rsquo;s = &quot;conrad&quot; <br>
slackonly.com = &quot;slonly&quot; <br>
Alien&rsquo;s ktown = &quot;ktown{latest}&quot; <br>

View file

@ -99,7 +99,7 @@ class MetaData:
"RELEASE": STABLE,
"SLACKWARE_VERSION": "off",
"COMP_ARCH": "off",
"REPOSITORIES": ["slack", "sbo", "rlw", "alien",
"REPOSITORIES": ["slack", "sbo", "alien",
"conrad", "slonly", "ktown{latest}",
"multi", "salix", "slackl", "msb{1.18}",
"csb", "connos"],
@ -128,7 +128,7 @@ class MetaData:
"HTTP_PROXY": "",
}
default_repositories = ["slack", "sbo", "rlw", "alien", "conrad",
default_repositories = ["slack", "sbo", "alien", "conrad",
"slonly", "ktown", "multi", "salix",
"slackl", "msb", "csb", "connos"]

View file

@ -57,13 +57,6 @@ def repo_data(PACKAGES_TXT, repo, flag):
runsize
) = slack_filter(name, location, size, unsize, flag)
elif repo == "rlw":
(rname,
rlocation,
rsize,
runsize
) = rlw_filter(name, location, size, unsize)
elif repo == "alien":
(rname,
rlocation,
@ -112,29 +105,6 @@ def slack_filter(name, location, size, unsize, flag):
return [fname, flocation, fsize, funsize]
def rlw_filter(name, location, size, unsize):
"""Filter rlw repository data
"""
arch = _meta_.arch
if arch.startswith("i") and arch.endswith("86"):
arch = "i486"
(fname, flocation, fsize, funsize) = ([] for i in range(4))
for n, l, s, u in zip(name, location, size, unsize):
loc = l.split("/")
if arch == loc[-1]:
fname.append(n)
flocation.append(l)
fsize.append(s)
funsize.append(u)
return [fname, flocation, fsize, funsize]
def alien_filter(name, location, size, unsize):
"""Fix to avoid packages include in slackbuilds folder
"""
@ -187,38 +157,20 @@ class Requires:
def get_deps(self):
"""Grabs package requirements from repositories
"""
if self.repo == "rlw":
PACKAGES_TXT = Utils().read_file(f"{_meta_.lib_path}"
f"{self.repo}_repo/PACKAGES.TXT")
dependencies = {}
rlw_deps = Utils().read_file(_meta_.conf_path + "rlworkman.deps")
for line in PACKAGES_TXT.splitlines():
for line in rlw_deps.splitlines():
if line.startswith("PACKAGE NAME:"):
pkg_name = split_package(line[14:].strip())[0]
if line and not line.startswith("#"):
pkgs = line.split(":")
dependencies[pkgs[0]] = pkgs[1]
if line.startswith("PACKAGE REQUIRED:"):
if self.name in dependencies.keys():
return dependencies[self.name].split()
if pkg_name == self.name:
else:
return ""
else:
PACKAGES_TXT = Utils().read_file(f"{_meta_.lib_path}"
f"{self.repo}_repo/PACKAGES.TXT")
for line in PACKAGES_TXT.splitlines():
if line.startswith("PACKAGE NAME:"):
pkg_name = split_package(line[14:].strip())[0]
if line.startswith("PACKAGE REQUIRED:"):
if pkg_name == self.name:
if line[18:].strip():
return self._req_fix(line)
if line[18:].strip():
return self._req_fix(line)
@lru_cache
def _req_fix(self, line):

View file

@ -57,9 +57,6 @@ class RepoInit(Utils):
def _init_slack(self):
self.mirror = mirrors(name="", location="")
def _init_rlw(self):
self.mirror = f"{self.def_repo_dict}{slack_ver()}/"
def _init_alien(self):
ver = slack_ver()
arch = "x86"

View file

@ -46,7 +46,6 @@ class Updates:
self.all_repos = {
"slack": self._init.slack,
"sbo": self._init.sbo,
"rlw": self._init.rlw,
"alien": self._init.alien,
"conrad": self._init.conrad,
"slonly": self._init.slonly,

View file

@ -195,36 +195,6 @@ class Init(Utils):
self.remote(log, ChangeLog_txt, lib, SLACKBUILDS_TXT, CHECKSUMS_MD5,
FILELIST_TXT, repo_name)
def rlw(self):
"""Creating rlw local library
"""
repo = self.def_repos_dict["rlw"]
log = self.log_path + "rlw/"
lib = self.lib_path + "rlw_repo/"
repo_name = Init.rlw.__name__
lib_file = "PACKAGES.TXT"
# lst_file = ""
md5_file = "CHECKSUMS.md5"
log_file = "ChangeLog.txt"
self.make_dir([log, lib])
PACKAGES_TXT = f"{repo}{self.slack_ver}/{lib_file}"
FILELIST_TXT = ""
CHECKSUMS_MD5 = f"{repo}{self.slack_ver}/{md5_file}"
ChangeLog_txt = f"{repo}{self.slack_ver}/{log_file}"
if self.check:
return self.checks_logs(log, ChangeLog_txt)
self.down(lib, PACKAGES_TXT, repo_name)
self.down(lib, CHECKSUMS_MD5, repo_name)
self.down(log, ChangeLog_txt, repo_name)
self.remote(log, ChangeLog_txt, lib, PACKAGES_TXT, CHECKSUMS_MD5,
FILELIST_TXT, repo_name)
def alien(self):
"""Creating alien local library
"""