Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-admin/
Date: Wed, 09 Jun 2021 02:05:42
Message-Id: 1623204294.0f0e6d9aa69347c71c1501644fe2b777b31e3c29.np-hardass@gentoo
1 commit: 0f0e6d9aa69347c71c1501644fe2b777b31e3c29
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 9 01:53:37 2021 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 9 02:04:54 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=0f0e6d9a
7
8 mate-extra/caja-admin: Sync with ::gentoo
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
12
13 mate-extra/caja-admin/Manifest | 2 -
14 mate-extra/caja-admin/caja-admin-0.0.1.ebuild | 40 ------------------
15 mate-extra/caja-admin/caja-admin-0.0.2.ebuild | 47 ----------------------
16 .../caja-admin/caja-admin-0.0.2_p20200328.ebuild | 8 ++--
17 mate-extra/caja-admin/caja-admin-9999.ebuild | 8 ++--
18 5 files changed, 8 insertions(+), 97 deletions(-)
19
20 diff --git a/mate-extra/caja-admin/Manifest b/mate-extra/caja-admin/Manifest
21 index 58fdbbd..84613c3 100644
22 --- a/mate-extra/caja-admin/Manifest
23 +++ b/mate-extra/caja-admin/Manifest
24 @@ -1,3 +1 @@
25 -DIST 0.0.1.tar.gz 26920 BLAKE2B 29aa35ef185cd588fd9242ea2b019cb64c4a4965b77523937b8b36c3a3437f7171dac3a000b85d9c4183a962a9dc6be787589408c7804f696aeac3576b7fee50 SHA512 12f54aad32ac11d34ee8344d564d31f29a53324308923e54426ac3837702e71701cf139b150ec3ff210fb0739eb9c46b05c6380d8596031f71b71899800b767d
26 -DIST 0.0.2.tar.gz 27564 BLAKE2B 975bbba48508ed6a997190ea6d5432330710ee312fe6f1e130b47894331a35c32071a40691cf69f617d268ab85dca62bb8bb4577d49bdb3c75c65ce05b4b9220 SHA512 919a92e258585e4b6275d346c82a1f9fc90462aa0cdedafb78867b80496f44bbd3459ce5a67429c5dda499bff2928a014779e81c781278ac0603f6cbebd3ff9e
27 DIST caja-admin-0.0.2_p20200328.tar.gz 27087 BLAKE2B 1d8ce82026249cff4dc3360cedffb79079e6608414a7718f265a19fce1a579d7f1fc4dadf3b05dd5ef19dbd12a92a61f90c04736cc9196d2dd5d4230c8c31784 SHA512 6a134e1d53bbdbf1a617582de67f7ddba7c7e0193a714246993092dd1c96c2ccc05afdb2da5cd2dfd974f7ab95e0aeedab244f2fa1335fd157ce45b4404a1f90
28
29 diff --git a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild b/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
30 deleted file mode 100644
31 index 60be2b9..0000000
32 --- a/mate-extra/caja-admin/caja-admin-0.0.1.ebuild
33 +++ /dev/null
34 @@ -1,40 +0,0 @@
35 -# Copyright 2019-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -if [[ ${PV} == "9999" ]]; then
41 - inherit git-r3
42 - EGIT_REPO_URI="https://github.com/infirit/caja-admin"
43 -elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
44 - SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
45 - SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
46 - KEYWORDS="~amd64 ~x86"
47 - S="${WORKDIR}/${PN}-${SHA}"
48 -else
49 - SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz"
50 - KEYWORDS="~amd64 ~x86"
51 -fi
52 -
53 -CMAKE_MIN_VERSION="2.6"
54 -PYTHON_COMPAT=( python{3_6,3_7} )
55 -
56 -inherit cmake-utils python-single-r1
57 -
58 -DESCRIPTION="Caja Admin Extension"
59 -HOMEPAGE="https://github.com/infirit/caja-admin"
60 -
61 -LICENSE="GPL-3+"
62 -SLOT="0"
63 -IUSE=""
64 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
65 -
66 -COMMON_DEPEND="${PYTHON_DEPS}"
67 -RDEPEND="${COMMON_DEPEND}
68 - dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
69 - sys-auth/polkit
70 -"
71 -DEPEND="${COMMON_DEPEND}
72 - sys-devel/gettext
73 -"
74 -BDEPEND=""
75
76 diff --git a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
77 deleted file mode 100644
78 index 2e831ad..0000000
79 --- a/mate-extra/caja-admin/caja-admin-0.0.2.ebuild
80 +++ /dev/null
81 @@ -1,47 +0,0 @@
82 -# Copyright 2019-2020 Gentoo Authors
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=7
86 -
87 -if [[ ${PV} == "9999" ]]; then
88 - inherit git-r3
89 - EGIT_REPO_URI="https://github.com/infirit/caja-admin"
90 -elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
91 - SHA="0af109ac79df76fbcc406d577d79f1c64d1a1fca"
92 - SRC_URI="https://github.com/infirit/${PN}/archive/${SHA}.tar.gz -> ${P}.tar.gz"
93 - KEYWORDS="~amd64 ~x86"
94 - S="${WORKDIR}/${PN}-${SHA}"
95 -else
96 - SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz"
97 - KEYWORDS="~amd64 ~x86"
98 -fi
99 -
100 -CMAKE_MIN_VERSION="2.6"
101 -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
102 -
103 -inherit cmake-utils python-single-r1
104 -
105 -DESCRIPTION="Caja Admin Extension"
106 -HOMEPAGE="https://github.com/infirit/caja-admin"
107 -
108 -LICENSE="GPL-3+"
109 -SLOT="0"
110 -IUSE=""
111 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
112 -
113 -COMMON_DEPEND="${PYTHON_DEPS}"
114 -RDEPEND="${COMMON_DEPEND}
115 - app-editors/pluma
116 - dev-python/python-caja[${PYTHON_SINGLE_USEDEP}]
117 - sys-auth/polkit
118 - x11-terms/mate-terminal
119 -"
120 -DEPEND="${COMMON_DEPEND}
121 - sys-devel/gettext
122 -"
123 -BDEPEND=""
124 -
125 -src_install() {
126 - cmake-utils_src_install
127 - python_optimize "${D}/usr/share/caja-python/extensions"
128 -}
129
130 diff --git a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
131 index c28a270..c16514f 100644
132 --- a/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
133 +++ b/mate-extra/caja-admin/caja-admin-0.0.2_p20200328.ebuild
134 @@ -1,4 +1,4 @@
135 -# Copyright 2019-2020 Gentoo Authors
136 +# Copyright 2019-2021 Gentoo Authors
137 # Distributed under the terms of the GNU General Public License v2
138
139 EAPI=7
140 @@ -12,11 +12,11 @@ elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
141 KEYWORDS="~amd64 ~x86"
142 S="${WORKDIR}/${PN}-${SHA}"
143 else
144 - SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz"
145 - KEYWORDS="~amd64 ~x86"
146 + SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
147 + KEYWORDS="amd64 x86"
148 fi
149
150 -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
151 +PYTHON_COMPAT=( python{3_7,3_8} )
152
153 inherit meson python-single-r1
154
155
156 diff --git a/mate-extra/caja-admin/caja-admin-9999.ebuild b/mate-extra/caja-admin/caja-admin-9999.ebuild
157 index c28a270..c16514f 100644
158 --- a/mate-extra/caja-admin/caja-admin-9999.ebuild
159 +++ b/mate-extra/caja-admin/caja-admin-9999.ebuild
160 @@ -1,4 +1,4 @@
161 -# Copyright 2019-2020 Gentoo Authors
162 +# Copyright 2019-2021 Gentoo Authors
163 # Distributed under the terms of the GNU General Public License v2
164
165 EAPI=7
166 @@ -12,11 +12,11 @@ elif [[ ${PV} =~ _p[0-9]{8,} ]]; then
167 KEYWORDS="~amd64 ~x86"
168 S="${WORKDIR}/${PN}-${SHA}"
169 else
170 - SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz"
171 - KEYWORDS="~amd64 ~x86"
172 + SRC_URI="https://github.com/infirit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
173 + KEYWORDS="amd64 x86"
174 fi
175
176 -PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
177 +PYTHON_COMPAT=( python{3_7,3_8} )
178
179 inherit meson python-single-r1