1 |
commit: 1c6ef07c301c0f2caf1bff484899d80fb08f4a15 |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 1 02:05:47 2019 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 1 02:05:47 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6ef07c |
7 |
|
8 |
app-portage/gentoolkit: bump to 0.4.3 |
9 |
|
10 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
app-portage/gentoolkit/Manifest | 1 + |
14 |
...toolkit-9999.ebuild => gentoolkit-0.4.3.ebuild} | 39 +++++++++++----------- |
15 |
app-portage/gentoolkit/gentoolkit-9999.ebuild | 34 ++++++++++--------- |
16 |
3 files changed, 39 insertions(+), 35 deletions(-) |
17 |
|
18 |
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest |
19 |
index 0bba7e52368..e994394a379 100644 |
20 |
--- a/app-portage/gentoolkit/Manifest |
21 |
+++ b/app-portage/gentoolkit/Manifest |
22 |
@@ -2,3 +2,4 @@ DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2 |
23 |
DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56 |
24 |
DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945 |
25 |
DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff |
26 |
+DIST gentoolkit-0.4.3.tar.gz 3218723 BLAKE2B d305db514e48446c0341c1ddc7a6c1bcd464eee11b8ee58f1a16bdf797670a9bb13eacfb2afa666d9ef292ad1dcbdf9970f8ded64bd5d12ca9d73ffae8923119 SHA512 81058d4787b291b6398d82d9a32f41b78d939f8d20ad8afbf9e22a47311ff0a270098c69e53d903ab3ec72a4cd11f13f3be30279a538a6a52972e1651efe447d |
27 |
|
28 |
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.3.ebuild |
29 |
similarity index 55% |
30 |
copy from app-portage/gentoolkit/gentoolkit-9999.ebuild |
31 |
copy to app-portage/gentoolkit/gentoolkit-0.4.3.ebuild |
32 |
index 084927bf88c..81df6c1880e 100644 |
33 |
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild |
34 |
+++ b/app-portage/gentoolkit/gentoolkit-0.4.3.ebuild |
35 |
@@ -1,24 +1,22 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
+# Copyright 1999-2019 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-EAPI="6" |
41 |
+EAPI=7 |
42 |
|
43 |
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy) |
44 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) |
45 |
PYTHON_REQ_USE="xml(+),threads(+)" |
46 |
|
47 |
-inherit distutils-r1 git-r3 |
48 |
- |
49 |
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" |
50 |
+inherit distutils-r1 |
51 |
|
52 |
DESCRIPTION="Collection of administration scripts for Gentoo" |
53 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" |
54 |
-SRC_URI="" |
55 |
+SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" |
56 |
|
57 |
LICENSE="GPL-2" |
58 |
SLOT="0" |
59 |
IUSE="" |
60 |
|
61 |
-KEYWORDS="" |
62 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
63 |
|
64 |
DEPEND=" |
65 |
|| ( |
66 |
@@ -26,28 +24,23 @@ DEPEND=" |
67 |
sys-apps/portage-mgorny[${PYTHON_USEDEP}] |
68 |
)" |
69 |
RDEPEND="${DEPEND} |
70 |
- !app-portage/gentoolkit-dev |
71 |
sys-apps/gawk |
72 |
sys-apps/gentoo-functions" |
73 |
|
74 |
python_prepare_all() { |
75 |
python_setup |
76 |
- echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
77 |
- VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
78 |
+ echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
79 |
+ VERSION="${PVR}" "${PYTHON}" setup.py set_version |
80 |
distutils-r1_python_prepare_all |
81 |
} |
82 |
|
83 |
python_install_all() { |
84 |
distutils-r1_python_install_all |
85 |
+} |
86 |
|
87 |
- # remove on Gentoo Prefix platforms where it's broken anyway |
88 |
- if use prefix; then |
89 |
- elog "The revdep-rebuild command is removed, the preserve-libs" |
90 |
- elog "feature of portage will handle issues." |
91 |
- rm "${ED}"/usr/bin/revdep-rebuild* |
92 |
- rm "${ED}"/usr/share/man/man1/revdep-rebuild.1 |
93 |
- rm -rf "${ED}"/etc/revdep-rebuild |
94 |
- rm -rf "${ED}"/var |
95 |
+pkg_preinst() { |
96 |
+ if has_version "<${CATEGORY}/${PN}-0.4.0"; then |
97 |
+ SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 |
98 |
fi |
99 |
} |
100 |
|
101 |
@@ -56,6 +49,14 @@ pkg_postinst() { |
102 |
mkdir -p -m 0755 "${EROOT%/}"/var/cache |
103 |
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild |
104 |
|
105 |
+ if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then |
106 |
+ elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" |
107 |
+ elog "part of the gentoolkit package." |
108 |
+ elog "The gentoolkit-dev package is now deprecated in favor of a single" |
109 |
+ elog "gentoolkit package. The remaining tools from gentoolkit-dev" |
110 |
+ elog "are now obsolete/unused with the git based tree." |
111 |
+ fi |
112 |
+ |
113 |
# Only show the elog information on a new install |
114 |
if [[ ! ${REPLACING_VERSIONS} ]]; then |
115 |
elog |
116 |
|
117 |
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild |
118 |
index 084927bf88c..a36db0ec310 100644 |
119 |
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild |
120 |
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild |
121 |
@@ -1,14 +1,13 @@ |
122 |
-# Copyright 1999-2018 Gentoo Foundation |
123 |
+# Copyright 1999-2019 Gentoo Authors |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
|
126 |
-EAPI="6" |
127 |
+EAPI=7 |
128 |
|
129 |
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy) |
130 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) |
131 |
PYTHON_REQ_USE="xml(+),threads(+)" |
132 |
|
133 |
-inherit distutils-r1 git-r3 |
134 |
- |
135 |
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" |
136 |
+inherit distutils-r1 git-r3 |
137 |
|
138 |
DESCRIPTION="Collection of administration scripts for Gentoo" |
139 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" |
140 |
@@ -26,28 +25,23 @@ DEPEND=" |
141 |
sys-apps/portage-mgorny[${PYTHON_USEDEP}] |
142 |
)" |
143 |
RDEPEND="${DEPEND} |
144 |
- !app-portage/gentoolkit-dev |
145 |
sys-apps/gawk |
146 |
sys-apps/gentoo-functions" |
147 |
|
148 |
python_prepare_all() { |
149 |
python_setup |
150 |
- echo VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
151 |
- VERSION="9999-${EGIT_VERSION}" "${PYTHON}" setup.py set_version |
152 |
+ echo VERSION="${PVR}" "${PYTHON}" setup.py set_version |
153 |
+ VERSION="${PVR}" "${PYTHON}" setup.py set_version |
154 |
distutils-r1_python_prepare_all |
155 |
} |
156 |
|
157 |
python_install_all() { |
158 |
distutils-r1_python_install_all |
159 |
+} |
160 |
|
161 |
- # remove on Gentoo Prefix platforms where it's broken anyway |
162 |
- if use prefix; then |
163 |
- elog "The revdep-rebuild command is removed, the preserve-libs" |
164 |
- elog "feature of portage will handle issues." |
165 |
- rm "${ED}"/usr/bin/revdep-rebuild* |
166 |
- rm "${ED}"/usr/share/man/man1/revdep-rebuild.1 |
167 |
- rm -rf "${ED}"/etc/revdep-rebuild |
168 |
- rm -rf "${ED}"/var |
169 |
+pkg_preinst() { |
170 |
+ if has_version "<${CATEGORY}/${PN}-0.4.0"; then |
171 |
+ SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 |
172 |
fi |
173 |
} |
174 |
|
175 |
@@ -56,6 +50,14 @@ pkg_postinst() { |
176 |
mkdir -p -m 0755 "${EROOT%/}"/var/cache |
177 |
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild |
178 |
|
179 |
+ if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then |
180 |
+ elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" |
181 |
+ elog "part of the gentoolkit package." |
182 |
+ elog "The gentoolkit-dev package is now deprecated in favor of a single" |
183 |
+ elog "gentoolkit package. The remaining tools from gentoolkit-dev" |
184 |
+ elog "are now obsolete/unused with the git based tree." |
185 |
+ fi |
186 |
+ |
187 |
# Only show the elog information on a new install |
188 |
if [[ ! ${REPLACING_VERSIONS} ]]; then |
189 |
elog |