1 |
commit: d7c6d1b65474187c1696a2884f7f78f5a54659a1 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 2 03:28:41 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 2 03:28:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c6d1b6 |
7 |
|
8 |
sys-apps/util-linux: Bump to v2.32 RC2 |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-apps/util-linux/Manifest | 1 + |
13 |
.../{util-linux-9999.ebuild => util-linux-2.32_rc2.ebuild} | 7 ++++--- |
14 |
sys-apps/util-linux/util-linux-9999.ebuild | 4 ++-- |
15 |
3 files changed, 7 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest |
18 |
index 58200855da9..22c234321c2 100644 |
19 |
--- a/sys-apps/util-linux/Manifest |
20 |
+++ b/sys-apps/util-linux/Manifest |
21 |
@@ -2,3 +2,4 @@ DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233 |
22 |
DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760 |
23 |
DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 |
24 |
DIST util-linux-2.32-rc1.tar.xz 4540628 BLAKE2B 2ece393a3ba334cd1e39e38b47330ea588b67034be2fcdd88ff38ac06c8c20099d177119e4e186d207df02d2aefed03470ec2f3538497df3b2cb6fef9c63dbb7 SHA512 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1 |
25 |
+DIST util-linux-2.32-rc2.tar.xz 4552488 BLAKE2B 31b17eff5e500f27e80f8354ebd71fa04c6c3faa8c17a36399362de5f6f8de7ae0344844325053dd680ba5b1ac48ed1b28ab20f76a1ea89d065dd01d1ae1215a SHA512 a7c3b5b84fa78aded1fc7b4e3111c140512f5e2e5851162659423a3905eadd746d65beedd3faf813b77e823d63f3c9b33db1f44f7b85e9006ff64f82fb3cadb7 |
26 |
|
27 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-2.32_rc2.ebuild |
28 |
similarity index 97% |
29 |
copy from sys-apps/util-linux/util-linux-9999.ebuild |
30 |
copy to sys-apps/util-linux/util-linux-2.32_rc2.ebuild |
31 |
index 998ce9b3d72..9b414fd08b9 100644 |
32 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
33 |
+++ b/sys-apps/util-linux/util-linux-2.32_rc2.ebuild |
34 |
@@ -13,7 +13,7 @@ MY_P="${PN}-${MY_PV}" |
35 |
|
36 |
if [[ ${PV} == 9999 ]] ; then |
37 |
inherit git-r3 autotools |
38 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
39 |
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
40 |
else |
41 |
[[ "${PV}" = *_rc* ]] || \ |
42 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
43 |
@@ -30,7 +30,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux |
44 |
# Most lib deps here are related to programs rather than our libs, |
45 |
# so we rarely need to specify ${MULTILIB_USEDEP}. |
46 |
RDEPEND="caps? ( sys-libs/libcap-ng ) |
47 |
- cramfs? ( sys-libs/zlib ) |
48 |
+ cramfs? ( sys-libs/zlib:= ) |
49 |
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) |
50 |
pam? ( sys-libs/pam ) |
51 |
python? ( ${PYTHON_DEPS} ) |
52 |
@@ -55,7 +55,8 @@ RDEPEND+=" |
53 |
!<sys-apps/sysvinit-2.88-r7 |
54 |
!<sys-libs/e2fsprogs-libs-1.41.8 |
55 |
!<sys-fs/e2fsprogs-1.41.8 |
56 |
- !<app-shells/bash-completion-2.7-r1" |
57 |
+ !<app-shells/bash-completion-2.7-r1 |
58 |
+ !<sys-apps/s390-tools-1.36.1-r1" |
59 |
|
60 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
61 |
|
62 |
|
63 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
64 |
index 998ce9b3d72..fd77cb1a772 100644 |
65 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
66 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
67 |
@@ -13,7 +13,7 @@ MY_P="${PN}-${MY_PV}" |
68 |
|
69 |
if [[ ${PV} == 9999 ]] ; then |
70 |
inherit git-r3 autotools |
71 |
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
72 |
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
73 |
else |
74 |
[[ "${PV}" = *_rc* ]] || \ |
75 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
76 |
@@ -30,7 +30,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux |
77 |
# Most lib deps here are related to programs rather than our libs, |
78 |
# so we rarely need to specify ${MULTILIB_USEDEP}. |
79 |
RDEPEND="caps? ( sys-libs/libcap-ng ) |
80 |
- cramfs? ( sys-libs/zlib ) |
81 |
+ cramfs? ( sys-libs/zlib:= ) |
82 |
ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) |
83 |
pam? ( sys-libs/pam ) |
84 |
python? ( ${PYTHON_DEPS} ) |