[gentoo-commits] repo/gentoo:master commit in: app-portage/gs-elpa/files/, app-portage/gs-elpa/

2021-05-04 Thread Ulrich Müller
commit: 84f2019652378792b48472019da8db3a185dd5a1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May  4 18:37:53 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue May  4 18:39:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f20196

app-portage/gs-elpa: Version bump to 0.2

Closes: https://bugs.gentoo.org/734076
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-portage/gs-elpa/Manifest   |  1 +
 .../gs-elpa/files/gs-elpa-0.1.3-eapi7.patch| 47 --
 ...{gs-elpa-0.1.3-r2.ebuild => gs-elpa-0.2.ebuild} |  7 ++--
 3 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 129b54ca222..93e933b4abc 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1 +1,2 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 
6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e
 SHA512 
616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
+DIST gs-elpa-0.2.tar.gz 15717 BLAKE2B 
17be05e19134a99109c4be6f3604a26b5183312adcd0ef195f6f460eac4a28e9cb9370d7d980dbe822af7372eccc0c59ae9f4bc49351a4ce398fc787011bd4ac
 SHA512 
e491a5a8d19b9e077cb41b0934aca6b3e9c091f844f8be1905a79da160fb6f725433b6be4d198533080de5951b1af87c22835e759afb864c8533139349f94a72

diff --git a/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch 
b/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch
deleted file mode 100644
index f0289a8a596..000
--- a/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
 gs-elpa-0.1.3/gs_elpa/ebuild.py
-+++ gs-elpa-0.1.3/gs_elpa/ebuild.py
-@@ -16,7 +16,7 @@
- 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 @@
- """
- def __init__(self, package_db):
- 
-+eapi = "7"
-+
- vars_before_inherit = \
-   ["repo_uri", "source_type", "realname", {"name" : "digest_sources", 
"value" : "yes"}]
- 
-@@ -37,7 +39,7 @@
- vars_after_keywords = \
-   ["depend", "rdepend"]
- 
--layout = Layout(vars_before_inherit,
-+layout = Layout(eapi, vars_before_inherit,
- inherit, vars_after_description, vars_after_keywords)
- 
- super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, 
layout)
-@@ -48,6 +50,8 @@
- """
- def __init__(self, package_db):
- 
-+eapi = "7"
-+
- vars_before_inherit = \
-   ["repo_uri", "source_type", "realname"]
- 
-@@ -59,7 +63,7 @@
- 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)

diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild 
b/app-portage/gs-elpa/gs-elpa-0.2.ebuild
similarity index 75%
rename from app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild
rename to app-portage/gs-elpa/gs-elpa-0.2.ebuild
index 3466a950548..2fb30753453 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.2.ebuild
@@ -9,8 +9,9 @@ DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
 
 DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa";
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gs-elpa.git
+   https://github.com/jauhien/gs-elpa";
+SRC_URI="https://gitweb.gentoo.org/proj/gs-elpa.git/snapshot/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,8 +21,6 @@ DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
dev-python/sexpdata[$(python_gen_usedep 'python*')]"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${P}-eapi7.patch")
-
 python_install_all() {
distutils-r1_python_install_all
doman docs/*.8



[gentoo-commits] repo/gentoo:master commit in: app-portage/gs-elpa/files/, app-portage/gs-elpa/

2021-05-01 Thread Ulrich Müller
commit: 30234fdf04d978b3c8ff514f762cea5f812a8ff6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat May  1 19:08:45 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat May  1 19:09:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30234fdf

app-portage/gs-elpa: Generate ebuilds for EAPI 7

Instead of EAPI 5, which is no longer supported by elisp.eclass.

Closes: https://bugs.gentoo.org/787500
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../gs-elpa/files/gs-elpa-0.1.3-eapi7.patch| 47 ++
 app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild| 28 +
 2 files changed, 75 insertions(+)

diff --git a/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch 
b/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch
new file mode 100644
index 000..f0289a8a596
--- /dev/null
+++ b/app-portage/gs-elpa/files/gs-elpa-0.1.3-eapi7.patch
@@ -0,0 +1,47 @@
+--- gs-elpa-0.1.3/gs_elpa/ebuild.py
 gs-elpa-0.1.3/gs_elpa/ebuild.py
+@@ -16,7 +16,7 @@
+ 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 @@
+ """
+ def __init__(self, package_db):
+ 
++eapi = "7"
++
+ vars_before_inherit = \
+   ["repo_uri", "source_type", "realname", {"name" : "digest_sources", 
"value" : "yes"}]
+ 
+@@ -37,7 +39,7 @@
+ vars_after_keywords = \
+   ["depend", "rdepend"]
+ 
+-layout = Layout(vars_before_inherit,
++layout = Layout(eapi, vars_before_inherit,
+ inherit, vars_after_description, vars_after_keywords)
+ 
+ super(ElpaEbuildWithDigestGenerator, self).__init__(package_db, 
layout)
+@@ -48,6 +50,8 @@
+ """
+ def __init__(self, package_db):
+ 
++eapi = "7"
++
+ vars_before_inherit = \
+   ["repo_uri", "source_type", "realname"]
+ 
+@@ -59,7 +63,7 @@
+ 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)

diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild 
b/app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild
new file mode 100644
index 000..3466a950548
--- /dev/null
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="g-sorcery backend for elisp packages"
+HOMEPAGE="https://github.com/jauhien/gs-elpa";
+SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
+   dev-python/sexpdata[$(python_gen_usedep 'python*')]"
+RDEPEND="${DEPEND}"
+
+PATCHES=("${FILESDIR}/${P}-eapi7.patch")
+
+python_install_all() {
+   distutils-r1_python_install_all
+   doman docs/*.8
+}