* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2021-05-04 18:04 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2021-05-04 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 12ac8f645cfb7305ecbce7220cea73ea58acf1db
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 17:59:25 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 17:59:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=12ac8f64
gs_elpa/ebuild.py: Generate ebuilds for EAPI 7
Instead of EAPI 5, which is no longer supported by elisp.eclass.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/ebuild.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py
index d1d63f2..cf1b2dd 100644
--- a/gs_elpa/ebuild.py
+++ b/gs_elpa/ebuild.py
@@ -16,7 +16,7 @@ import collections
from g_sorcery.ebuild import DefaultEbuildGenerator
Layout = collections.namedtuple("Layout",
- ["vars_before_inherit", "inherit",
+ ["eapi", "vars_before_inherit", "inherit",
"vars_after_description", "vars_after_keywords"])
@@ -26,6 +26,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
+ eapi = "7"
+
vars_before_inherit = \
["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}]
@@ -37,8 +39,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(vars_before_inherit,
- inherit, vars_after_description, vars_after_keywords)
+ layout = Layout(eapi, vars_before_inherit, inherit,
+ vars_after_description, vars_after_keywords)
super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout)
@@ -48,6 +50,8 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
+ eapi = "7"
+
vars_before_inherit = \
["repo_uri", "source_type", "realname"]
@@ -59,7 +63,7 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(vars_before_inherit, inherit,
+ layout = Layout(eapi, vars_before_inherit, inherit,
vars_after_description, vars_after_keywords)
super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2021-05-04 18:25 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2021-05-04 18:25 UTC (permalink / raw
To: gentoo-commits
commit: d42fc8be1ccede451a61a77bed83bc61d144a7cd
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 18:23:36 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 18:23:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=d42fc8be
gs_elpa/ebuild.py: Generate ebuilds for EAPI 7
Instead of EAPI 5, which is no longer supported by elisp.eclass.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/ebuild.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py
index d1d63f2..cf1b2dd 100644
--- a/gs_elpa/ebuild.py
+++ b/gs_elpa/ebuild.py
@@ -16,7 +16,7 @@ import collections
from g_sorcery.ebuild import DefaultEbuildGenerator
Layout = collections.namedtuple("Layout",
- ["vars_before_inherit", "inherit",
+ ["eapi", "vars_before_inherit", "inherit",
"vars_after_description", "vars_after_keywords"])
@@ -26,6 +26,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
+ eapi = "7"
+
vars_before_inherit = \
["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}]
@@ -37,8 +39,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(vars_before_inherit,
- inherit, vars_after_description, vars_after_keywords)
+ layout = Layout(eapi, vars_before_inherit, inherit,
+ vars_after_description, vars_after_keywords)
super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout)
@@ -48,6 +50,8 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
+ eapi = "7"
+
vars_before_inherit = \
["repo_uri", "source_type", "realname"]
@@ -59,7 +63,7 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(vars_before_inherit, inherit,
+ layout = Layout(eapi, vars_before_inherit, inherit,
vars_after_description, vars_after_keywords)
super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2021-05-05 16:47 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2021-05-05 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 3ecda98fcd590fed73966df7f7f1fca86de019a7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed May 5 16:14:14 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed May 5 16:14:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=3ecda98f
gs_elpa/elpa_db.py: Check version numbers for sanity
Packages with negative version numbers have been seen in melpa-stable.
These appear to be the result of mapping non-numeric versions,
which are defined in version-regexp-alist as follows (Emacs 27.2):
(("^[-._+ ]?snapshot$" . -4)
("^[-._+]$" . -4)
("^[-._+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)$" . -4)
("^[-._+ ]?unknown$" . -4)
("^[-._+ ]?alpha$" . -3)
("^[-._+ ]?beta$" . -2)
("^[-._+ ]?\\(pre\\|rc\\)$" . -1))
We could try to map them to Gentoo _alpha, _beta, etc. suffixes, but
it would require more effort to determine the name of the distfile
(and record it in the ebuild). Therefore skip these packages for now.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/elpa_db.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py
index ad0e374..f307c87 100644
--- a/gs_elpa/elpa_db.py
+++ b/gs_elpa/elpa_db.py
@@ -88,6 +88,11 @@ class ElpaDBGenerator(DBGenerator):
if self.in_config([common_config, config], "exclude", realname):
continue
+ # Version numbers with negative elements have been seen
+ # in melpa-stable. Skip these packages for now.
+ if not all(i >= 0 for i in desc[INFO_VERSION]):
+ continue
+
pkg = Package("app-emacs", realname,
'.'.join(map(str, desc[INFO_VERSION])))
source_type = desc[INFO_SRC_TYPE].value()
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2021-11-04 14:09 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2021-11-04 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 111b15fbfe02f49c2450f8c6f90c6efad2e8e09a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 4 14:08:07 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 4 14:08:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=111b15fb
Revert "gs_elpa/ebuild.py: Generate ebuilds for EAPI 7"
Keep the default in one central place in g-sorcery, otherwise it would
have to be maintained in two places.
This reverts commit d42fc8be1ccede451a61a77bed83bc61d144a7cd.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/ebuild.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gs_elpa/ebuild.py b/gs_elpa/ebuild.py
index 834d3a6..d0353d3 100644
--- a/gs_elpa/ebuild.py
+++ b/gs_elpa/ebuild.py
@@ -16,7 +16,7 @@ import collections
from g_sorcery.ebuild import DefaultEbuildGenerator
Layout = collections.namedtuple("Layout",
- ["eapi", "vars_before_inherit", "inherit",
+ ["vars_before_inherit", "inherit",
"vars_after_description", "vars_after_keywords"])
@@ -26,8 +26,6 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
- eapi = "7"
-
vars_before_inherit = \
["repo_uri", "source_type", "realname", {"name" : "digest_sources", "value" : "yes"}]
@@ -39,8 +37,8 @@ class ElpaEbuildWithDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(eapi, vars_before_inherit, inherit,
- vars_after_description, vars_after_keywords)
+ layout = Layout(vars_before_inherit,
+ inherit, vars_after_description, vars_after_keywords)
super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, layout)
@@ -50,8 +48,6 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
"""
def __init__(self, package_db):
- eapi = "7"
-
vars_before_inherit = \
["repo_uri", "source_type", "realname"]
@@ -63,7 +59,7 @@ class ElpaEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
vars_after_keywords = \
["depend", "rdepend"]
- layout = Layout(eapi, vars_before_inherit, inherit,
+ layout = Layout(vars_before_inherit, inherit,
vars_after_description, vars_after_keywords)
super(ElpaEbuildWithoutDigestGenerator, self).__init__(package_db, layout)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2023-02-19 14:50 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-02-19 14:50 UTC (permalink / raw
To: gentoo-commits
commit: a0924d50b6346fe86c7f0db34a92eb9760d1b17a
Author: Markus Walter <houseofsuns <AT> houseofsuns <DOT> org>
AuthorDate: Sat Feb 18 20:14:26 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 14:46:56 2023 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=a0924d50
Adjust to sexpdata version 0.0.4.
https://bugs.gentoo.org/895314
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/elpa_db.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py
old mode 100644
new mode 100755
index d9cac6c..c189712
--- a/gs_elpa/elpa_db.py
+++ b/gs_elpa/elpa_db.py
@@ -7,7 +7,7 @@
ELPA package database
- :copyright: (c) 2013-2021 Jauhien Piatlicki and others
+ :copyright: (c) 2013-2023 Jauhien Piatlicki and others
:license: GPL-2, see LICENSE for more details.
"""
@@ -82,8 +82,8 @@ class ElpaDBGenerator(DBGenerator):
#DEP_VERSION = 1 #we do not use it at the moment
for entry in sexpdata.cdr(archive_contents):
- desc = entry[PKG_INFO].value()
- realname = entry[PKG_NAME].value()
+ desc = entry[PKG_INFO].I
+ realname = str(entry[PKG_NAME])
if self.in_config([common_config, config], "exclude", realname):
continue
@@ -95,7 +95,7 @@ class ElpaDBGenerator(DBGenerator):
pkg = Package("app-emacs", realname,
'.'.join(map(str, desc[INFO_VERSION])))
- source_type = desc[INFO_SRC_TYPE].value()
+ source_type = str(desc[INFO_SRC_TYPE])
allowed_ords = set(range(ord('a'), ord('z'))) \
| set(range(ord('A'), ord('Z'))) | \
@@ -112,8 +112,9 @@ class ElpaDBGenerator(DBGenerator):
dependencies = serializable_elist(separator="\n\t")
for dep in deps:
- dep = self.convert_dependency([common_config, config],
- dep[DEP_NAME].value(), external = False)
+ dep = self.convert_dependency(
+ [common_config, config], str(dep[DEP_NAME]),
+ external=False)
if dep:
dependencies.append(dep)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/
@ 2023-05-20 9:35 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2023-05-20 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 5b9e13c7e0e1a45ede9f95a0cf7301b2d474d170
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 09:34:34 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 20 09:34:34 2023 +0000
URL: https://gitweb.gentoo.org/proj/gs-elpa.git/commit/?id=5b9e13c7
elpa_db.py: Drop the workaround for sexpdata-0.0.4
The value field was added back in sexpdata-1.0.0:
https://github.com/jd-boyd/sexpdata/commit/861cc5c8c96724b3e34ee1b6e15997b1d136635d
This partially reverts commit a0924d50b6346fe86c7f0db34a92eb9760d1b17a.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
gs_elpa/elpa_db.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gs_elpa/elpa_db.py b/gs_elpa/elpa_db.py
old mode 100755
new mode 100644
index c189712..2032603
--- a/gs_elpa/elpa_db.py
+++ b/gs_elpa/elpa_db.py
@@ -82,8 +82,8 @@ class ElpaDBGenerator(DBGenerator):
#DEP_VERSION = 1 #we do not use it at the moment
for entry in sexpdata.cdr(archive_contents):
- desc = entry[PKG_INFO].I
- realname = str(entry[PKG_NAME])
+ desc = entry[PKG_INFO].value()
+ realname = entry[PKG_NAME].value()
if self.in_config([common_config, config], "exclude", realname):
continue
@@ -95,7 +95,7 @@ class ElpaDBGenerator(DBGenerator):
pkg = Package("app-emacs", realname,
'.'.join(map(str, desc[INFO_VERSION])))
- source_type = str(desc[INFO_SRC_TYPE])
+ source_type = desc[INFO_SRC_TYPE].value()
allowed_ords = set(range(ord('a'), ord('z'))) \
| set(range(ord('A'), ord('Z'))) | \
@@ -112,9 +112,8 @@ class ElpaDBGenerator(DBGenerator):
dependencies = serializable_elist(separator="\n\t")
for dep in deps:
- dep = self.convert_dependency(
- [common_config, config], str(dep[DEP_NAME]),
- external=False)
+ dep = self.convert_dependency([common_config, config],
+ dep[DEP_NAME].value(), external = False)
if dep:
dependencies.append(dep)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-20 9:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-04 14:09 [gentoo-commits] proj/gs-elpa:master commit in: gs_elpa/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2023-05-20 9:35 Ulrich Müller
2023-02-19 14:50 Ulrich Müller
2021-05-05 16:47 Ulrich Müller
2021-05-04 18:25 Ulrich Müller
2021-05-04 18:04 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox