Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/
Date: Thu, 30 Dec 2021 21:08:03
Message-Id: 1640898449.bf623fe88cb4fd670688f38eff1e205196517ed9.soap@gentoo
1 commit: bf623fe88cb4fd670688f38eff1e205196517ed9
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 30 21:07:29 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 30 21:07:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf623fe8
7
8 Reverts: 2c59cf7212e96de4d610dc4a2d502bbd0cb07d23 "sys-libs/e2fsprogs-libs: Bump to version 1.46.5"
9
10 * The committer has disappeared from IRC, clearly
11 isn't aware of the change to remove sys-libs/e2fsprogs-libs
12 and communication about this has been ongoing within the
13 team for some time.
14
15 Signed-off-by: David Seifert <soap <AT> gentoo.org>
16
17 sys-libs/e2fsprogs-libs/Manifest | 1 -
18 .../e2fsprogs-libs/e2fsprogs-libs-1.46.5.ebuild | 93 ----------------------
19 2 files changed, 94 deletions(-)
20
21 diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
22 index 4a224a4c3d7e..580fc5c7611f 100644
23 --- a/sys-libs/e2fsprogs-libs/Manifest
24 +++ b/sys-libs/e2fsprogs-libs/Manifest
25 @@ -1,2 +1 @@
26 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
27 -DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
28
29 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.5.ebuild
30 deleted file mode 100644
31 index 41da9ca3221d..000000000000
32 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.5.ebuild
33 +++ /dev/null
34 @@ -1,93 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit toolchain-funcs multilib-minimal usr-ldscript
41 -
42 -MY_PN=${PN%-libs}
43 -MY_P="${MY_PN}-${PV}"
44 -
45 -DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
46 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
47 -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0"
51 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
52 -IUSE="static-libs"
53 -
54 -RDEPEND="!sys-libs/com_err
55 - !sys-libs/ss
56 - !<sys-fs/e2fsprogs-1.41.8"
57 -BDEPEND="virtual/pkgconfig"
58 -
59 -S="${WORKDIR}/${MY_P}"
60 -
61 -PATCHES=(
62 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
63 -)
64 -
65 -src_prepare() {
66 - default
67 -
68 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
69 -}
70 -
71 -multilib_src_configure() {
72 - local myconf=(
73 - --enable-elf-shlibs
74 - $(tc-has-tls || echo --disable-tls)
75 - --disable-e2initrd-helper
76 - --disable-fsck
77 - )
78 -
79 - # we use blkid/uuid from util-linux now
80 - if use kernel_linux ; then
81 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
82 - myconf+=( --disable-lib{blkid,uuid} )
83 - fi
84 -
85 - ac_cv_path_LDCONFIG=: \
86 - ECONF_SOURCE="${S}" \
87 - CC="$(tc-getCC)" \
88 - BUILD_CC="$(tc-getBUILD_CC)" \
89 - BUILD_LD="$(tc-getBUILD_LD)" \
90 - econf "${myconf[@]}"
91 -}
92 -
93 -multilib_src_compile() {
94 - emake -C lib/et V=1
95 -
96 - emake -C lib/ss V=1
97 -}
98 -
99 -multilib_src_test() {
100 - if multilib_is_native_abi; then
101 - emake -C lib/et V=1 check
102 -
103 - emake -C lib/ss V=1 check
104 - fi
105 -}
106 -
107 -multilib_src_install() {
108 - emake -C lib/et V=1 DESTDIR="${D}" install
109 -
110 - emake -C lib/ss V=1 DESTDIR="${D}" install
111 -
112 - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
113 - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
114 - # links to libcom_err.so).
115 - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
116 -
117 - if ! use static-libs ; then
118 - find "${ED}" -name '*.a' -delete || die
119 - fi
120 -}
121 -
122 -multilib_src_install_all() {
123 - # Package installs same header twice -- use symlink instead
124 - dosym et/com_err.h /usr/include/com_err.h
125 -
126 - einstalldocs
127 -}