1 |
commit: 2e443a7e0af7339e70246e564a3f4c07fd71ec56 |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Mon Nov 8 04:48:27 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 8 06:07:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e443a7e |
7 |
|
8 |
dev-python/yams: EAPI 7 -> 8, enable py3.10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/816426 |
11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
12 |
|
13 |
dev-python/yams/metadata.xml | 7 ++++++- |
14 |
dev-python/yams/yams-0.7.3.ebuild | 17 ++++++----------- |
15 |
dev-python/yams/yams-9999.ebuild | 17 ++++++----------- |
16 |
3 files changed, 18 insertions(+), 23 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/yams/metadata.xml b/dev-python/yams/metadata.xml |
19 |
index 32d9b15d9..e6e16e8df 100644 |
20 |
--- a/dev-python/yams/metadata.xml |
21 |
+++ b/dev-python/yams/metadata.xml |
22 |
@@ -1,5 +1,5 @@ |
23 |
<?xml version="1.0" encoding="UTF-8"?> |
24 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
25 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
26 |
<pkgmetadata> |
27 |
<maintainer type="person"> |
28 |
<email>myrvogna@×××××××××××.re</email> |
29 |
@@ -7,5 +7,10 @@ |
30 |
</maintainer> |
31 |
<upstream> |
32 |
<remote-id type="github">Berulacks/yams</remote-id> |
33 |
+ <remote-id type="pypi">YAMScrobbler</remote-id> |
34 |
+ <maintainer> |
35 |
+ <name>Derin Yarsuvat</name> |
36 |
+ <email>derin@×××.net</email> |
37 |
+ </maintainer> |
38 |
</upstream> |
39 |
</pkgmetadata> |
40 |
|
41 |
diff --git a/dev-python/yams/yams-0.7.3.ebuild b/dev-python/yams/yams-0.7.3.ebuild |
42 |
index 9b49b7093..77ef4686e 100644 |
43 |
--- a/dev-python/yams/yams-0.7.3.ebuild |
44 |
+++ b/dev-python/yams/yams-0.7.3.ebuild |
45 |
@@ -1,36 +1,31 @@ |
46 |
# Copyright 1999-2021 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
-EAPI=7 |
50 |
- |
51 |
-PYTHON_COMPAT=( python3_{8..9} ) |
52 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
53 |
+EAPI=8 |
54 |
|
55 |
+PYTHON_COMPAT=( python3_{8..10} ) |
56 |
inherit distutils-r1 systemd |
57 |
|
58 |
-DESCRIPTION="A Last.FM scrobbler for MPD (Yet Another Mpd Scrobbler)" |
59 |
+DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)" |
60 |
HOMEPAGE="https://github.com/Berulacks/yams" |
61 |
|
62 |
if [[ ${PV} == 9999 ]]; then |
63 |
- EGIT_REPO_URI="https://github.com/Berulacks/yams.git" |
64 |
+ EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git" |
65 |
inherit git-r3 |
66 |
else |
67 |
- SRC_URI="https://github.com/Berulacks/yams/archive/${PV}.tar.gz -> ${P}.tar.gz" |
68 |
+ SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
69 |
KEYWORDS="~amd64" |
70 |
fi |
71 |
|
72 |
LICENSE="GPL-3" |
73 |
SLOT="0" |
74 |
|
75 |
-DEPEND=" |
76 |
+RDEPEND=" |
77 |
dev-python/psutil[${PYTHON_USEDEP}] |
78 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
79 |
dev-python/python-mpd[${PYTHON_USEDEP}] |
80 |
dev-python/requests[${PYTHON_USEDEP}] |
81 |
-" |
82 |
-RDEPEND=" |
83 |
media-sound/mpd |
84 |
- ${DEPEND} |
85 |
" |
86 |
|
87 |
python_prepare_all() { |
88 |
|
89 |
diff --git a/dev-python/yams/yams-9999.ebuild b/dev-python/yams/yams-9999.ebuild |
90 |
index 9b49b7093..77ef4686e 100644 |
91 |
--- a/dev-python/yams/yams-9999.ebuild |
92 |
+++ b/dev-python/yams/yams-9999.ebuild |
93 |
@@ -1,36 +1,31 @@ |
94 |
# Copyright 1999-2021 Gentoo Authors |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
|
97 |
-EAPI=7 |
98 |
- |
99 |
-PYTHON_COMPAT=( python3_{8..9} ) |
100 |
-DISTUTILS_USE_SETUPTOOLS=rdepend |
101 |
+EAPI=8 |
102 |
|
103 |
+PYTHON_COMPAT=( python3_{8..10} ) |
104 |
inherit distutils-r1 systemd |
105 |
|
106 |
-DESCRIPTION="A Last.FM scrobbler for MPD (Yet Another Mpd Scrobbler)" |
107 |
+DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)" |
108 |
HOMEPAGE="https://github.com/Berulacks/yams" |
109 |
|
110 |
if [[ ${PV} == 9999 ]]; then |
111 |
- EGIT_REPO_URI="https://github.com/Berulacks/yams.git" |
112 |
+ EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git" |
113 |
inherit git-r3 |
114 |
else |
115 |
- SRC_URI="https://github.com/Berulacks/yams/archive/${PV}.tar.gz -> ${P}.tar.gz" |
116 |
+ SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
117 |
KEYWORDS="~amd64" |
118 |
fi |
119 |
|
120 |
LICENSE="GPL-3" |
121 |
SLOT="0" |
122 |
|
123 |
-DEPEND=" |
124 |
+RDEPEND=" |
125 |
dev-python/psutil[${PYTHON_USEDEP}] |
126 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
127 |
dev-python/python-mpd[${PYTHON_USEDEP}] |
128 |
dev-python/requests[${PYTHON_USEDEP}] |
129 |
-" |
130 |
-RDEPEND=" |
131 |
media-sound/mpd |
132 |
- ${DEPEND} |
133 |
" |
134 |
|
135 |
python_prepare_all() { |