1 |
commit: e70e26dba37b28340c631ad00489863ddd412cc6 |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 7 10:49:04 2017 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 7 10:51:55 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70e26db |
7 |
|
8 |
sys-apps/yum: version bump |
9 |
|
10 |
Set Python shebang properly for /usr/bin/yum |
11 |
Add missing 'python' USE-flag to app-arch/rpm dependency |
12 |
Drop old vulnerable versions |
13 |
|
14 |
Gentoo-Bug: 499328 |
15 |
Gentoo-Bug: 563850 |
16 |
|
17 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
18 |
|
19 |
sys-apps/yum/Manifest | 2 +- |
20 |
sys-apps/yum/yum-3.4.3_p20130218.ebuild | 43 ---------------------- |
21 |
...130218-r1.ebuild => yum-3.4.3_p20170619.ebuild} | 22 +++++------ |
22 |
3 files changed, 12 insertions(+), 55 deletions(-) |
23 |
|
24 |
diff --git a/sys-apps/yum/Manifest b/sys-apps/yum/Manifest |
25 |
index b70b9c24bc8..442a88fe63a 100644 |
26 |
--- a/sys-apps/yum/Manifest |
27 |
+++ b/sys-apps/yum/Manifest |
28 |
@@ -1 +1 @@ |
29 |
-DIST yum-3.4.3_p20130218.tar.gz 1389537 SHA256 efc2daeca86ddc893eb0489342686eb4a2b2cbbd1a75fd42fd27624225494ce7 SHA512 b450c6133443f674bd60f59633d5669d9f88e60930657891f428ce8f1bdcf7124a86ed756a6a5912b9237788854331022119a6bfb1d5cac8d8fdc3de11b1020e WHIRLPOOL 18bcff3b9f2e991f255ac5bc07937e67c20df46ec88fff1481e5f64fc36f97e5d741cfb378c4731a1721f1d0a9beb6f9d37a5f91b59055cfcb21ac06fce819b6 |
30 |
+DIST yum-3.4.3_p20170619.tar.gz 1525362 SHA256 c97cb357ca7f1180130007e3f8c733de7868d144b6bdb70356370ed110832d41 SHA512 4dddc3e30be8e86162b7786d7cf4e4e6f00e67c03bc3b16f347df1e54c3c67e5eaa01456e19952452a4eeaa4bc40c9a82a042d43772ad304c87c44bdc36e7ea3 WHIRLPOOL bdca57657b7d2405e04607f622d74aa94d5966bea15e1249ed47a82f3239949e2d380d6415a3e5ee089996762de412c2f60bf0f86f25dac91916322b26725847 |
31 |
|
32 |
diff --git a/sys-apps/yum/yum-3.4.3_p20130218.ebuild b/sys-apps/yum/yum-3.4.3_p20130218.ebuild |
33 |
deleted file mode 100644 |
34 |
index 25cb7e9308c..00000000000 |
35 |
--- a/sys-apps/yum/yum-3.4.3_p20130218.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,43 +0,0 @@ |
38 |
-# Copyright 1999-2017 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=5 |
42 |
-PYTHON_COMPAT=( python2_7 ) |
43 |
-PYTHON_REQ_USE="sqlite" |
44 |
- |
45 |
-MY_PV="a119004" |
46 |
-MY_P="${PN}-${MY_PV}" |
47 |
- |
48 |
-inherit eutils multilib python-single-r1 |
49 |
- |
50 |
-DESCRIPTION="automatic updater and package installer/remover for rpm systems" |
51 |
-HOMEPAGE="http://yum.baseurl.org/" |
52 |
-SRC_URI="https://dev.gentoo.org/~creffett/distfiles/${P}.tar.gz" |
53 |
- |
54 |
-LICENSE="GPL-2" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
57 |
-IUSE="test" |
58 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
59 |
- |
60 |
-RDEPEND="${PYTHON_DEPS} |
61 |
- app-arch/rpm[${PYTHON_USEDEP}] |
62 |
- dev-python/sqlitecachec[${PYTHON_USEDEP}] |
63 |
- dev-libs/libxml2[python,${PYTHON_USEDEP}] |
64 |
- dev-python/urlgrabber[${PYTHON_USEDEP}]" |
65 |
-DEPEND="${RDEPEND} |
66 |
- dev-util/intltool |
67 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
68 |
- |
69 |
-S="${WORKDIR}/${MY_P}" |
70 |
- |
71 |
-src_prepare() { |
72 |
- sed -i -e 's/make/$(MAKE)/' Makefile || die |
73 |
- sed -i -e "s:lib:$(get_libdir):g" rpmUtils/Makefile yum/Makefile || die |
74 |
-} |
75 |
- |
76 |
-src_install() { |
77 |
- emake DESTDIR="${ED}" install |
78 |
- python_optimize "${D%/}$(python_get_sitedir)" "${ED%/}/usr/share/yum-cli" |
79 |
- rm -r "${ED%/}/etc/rc.d" || die |
80 |
-} |
81 |
|
82 |
diff --git a/sys-apps/yum/yum-3.4.3_p20130218-r1.ebuild b/sys-apps/yum/yum-3.4.3_p20170619.ebuild |
83 |
similarity index 75% |
84 |
rename from sys-apps/yum/yum-3.4.3_p20130218-r1.ebuild |
85 |
rename to sys-apps/yum/yum-3.4.3_p20170619.ebuild |
86 |
index 4ef67a210cc..25ff9b059b5 100644 |
87 |
--- a/sys-apps/yum/yum-3.4.3_p20130218-r1.ebuild |
88 |
+++ b/sys-apps/yum/yum-3.4.3_p20170619.ebuild |
89 |
@@ -1,28 +1,27 @@ |
90 |
# Copyright 1999-2017 Gentoo Foundation |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
|
93 |
-EAPI=5 |
94 |
+EAPI=6 |
95 |
+ |
96 |
PYTHON_COMPAT=( python2_7 ) |
97 |
PYTHON_REQ_USE="sqlite" |
98 |
- |
99 |
-MY_PV="a119004" |
100 |
-MY_P="${PN}-${MY_PV}" |
101 |
- |
102 |
-inherit eutils multilib python-single-r1 |
103 |
+inherit python-single-r1 systemd |
104 |
|
105 |
DESCRIPTION="automatic updater and package installer/remover for rpm systems" |
106 |
HOMEPAGE="http://yum.baseurl.org/" |
107 |
-SRC_URI="https://dev.gentoo.org/~creffett/distfiles/${P}.tar.gz" |
108 |
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz" |
109 |
|
110 |
LICENSE="GPL-2" |
111 |
SLOT="0" |
112 |
KEYWORDS="~amd64 ~ppc64 ~ppc ~x86" |
113 |
+ |
114 |
IUSE="test" |
115 |
+ |
116 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
117 |
|
118 |
RDEPEND=" |
119 |
${PYTHON_DEPS} |
120 |
- app-arch/rpm[${PYTHON_USEDEP}] |
121 |
+ app-arch/rpm[python,${PYTHON_USEDEP}] |
122 |
dev-python/sqlitecachec[${PYTHON_USEDEP}] |
123 |
dev-libs/libxml2[python,${PYTHON_USEDEP}] |
124 |
dev-python/pyliblzma[${PYTHON_USEDEP}] |
125 |
@@ -32,15 +31,16 @@ DEPEND="${RDEPEND} |
126 |
dev-util/intltool |
127 |
test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
128 |
|
129 |
-S="${WORKDIR}/${MY_P}" |
130 |
- |
131 |
src_prepare() { |
132 |
sed -i -e 's/make/$(MAKE)/' Makefile || die |
133 |
sed -i -e "s:lib:$(get_libdir):g" rpmUtils/Makefile yum/Makefile || die |
134 |
+ default |
135 |
} |
136 |
|
137 |
src_install() { |
138 |
- emake DESTDIR="${ED}" install |
139 |
+ emake INIT=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${ED}" install |
140 |
python_optimize "${D%/}$(python_get_sitedir)" "${ED%/}/usr/share/yum-cli" |
141 |
rm -r "${ED%/}/etc/rc.d" || die |
142 |
+ # bug #563850 |
143 |
+ python_fix_shebang "${ED}/usr/bin/yum" |
144 |
} |