Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/, sys-libs/e2fsprogs-libs/files/
Date: Tue, 17 May 2022 19:09:31
Message-Id: 1652814456.1b3bff233fdc124d709576f67772371abe36a986.jsmolic@gentoo
1 commit: 1b3bff233fdc124d709576f67772371abe36a986
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 17 18:58:46 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue May 17 19:07:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3bff23
7
8 sys-libs/e2fsprogs-libs: treeclean
9
10 Closes: https://bugs.gentoo.org/806875
11 Closes: https://bugs.gentoo.org/834106
12 Closes: https://bugs.gentoo.org/423453
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 sys-libs/e2fsprogs-libs/Manifest | 1 -
16 .../e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild | 91 ----------------------
17 .../e2fsprogs-libs-1.42.13-fix-build-cflags.patch | 13 ----
18 sys-libs/e2fsprogs-libs/metadata.xml | 13 ----
19 4 files changed, 118 deletions(-)
20
21 diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
22 deleted file mode 100644
23 index 580fc5c7611f..000000000000
24 --- a/sys-libs/e2fsprogs-libs/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
28
29 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild
30 deleted file mode 100644
31 index 666389defb2c..000000000000
32 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild
33 +++ /dev/null
34 @@ -1,91 +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-fs/e2fsprogs-1.46.4-r51"
55 -BDEPEND="virtual/pkgconfig"
56 -
57 -S="${WORKDIR}/${MY_P}"
58 -
59 -PATCHES=(
60 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
61 -)
62 -
63 -src_prepare() {
64 - default
65 -
66 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
67 -}
68 -
69 -multilib_src_configure() {
70 - local myconf=(
71 - --enable-elf-shlibs
72 - $(tc-has-tls || echo --disable-tls)
73 - --disable-e2initrd-helper
74 - --disable-fsck
75 - )
76 -
77 - # we use blkid/uuid from util-linux now
78 - if use kernel_linux ; then
79 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
80 - myconf+=( --disable-lib{blkid,uuid} )
81 - fi
82 -
83 - ac_cv_path_LDCONFIG=: \
84 - ECONF_SOURCE="${S}" \
85 - CC="$(tc-getCC)" \
86 - BUILD_CC="$(tc-getBUILD_CC)" \
87 - BUILD_LD="$(tc-getBUILD_LD)" \
88 - econf "${myconf[@]}"
89 -}
90 -
91 -multilib_src_compile() {
92 - emake -C lib/et V=1
93 -
94 - emake -C lib/ss V=1
95 -}
96 -
97 -multilib_src_test() {
98 - if multilib_is_native_abi; then
99 - emake -C lib/et V=1 check
100 -
101 - emake -C lib/ss V=1 check
102 - fi
103 -}
104 -
105 -multilib_src_install() {
106 - emake -C lib/et V=1 DESTDIR="${D}" install
107 -
108 - emake -C lib/ss V=1 DESTDIR="${D}" install
109 -
110 - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
111 - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
112 - # links to libcom_err.so).
113 - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
114 -
115 - if ! use static-libs ; then
116 - find "${ED}" -name '*.a' -delete || die
117 - fi
118 -}
119 -
120 -multilib_src_install_all() {
121 - # Package installs same header twice -- use symlink instead
122 - dosym et/com_err.h /usr/include/com_err.h
123 -
124 - einstalldocs
125 -}
126
127 diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
128 deleted file mode 100644
129 index a87f0c697eab..000000000000
130 --- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
131 +++ /dev/null
132 @@ -1,13 +0,0 @@
133 -https://bugs.gentoo.org/516854
134 -
135 ---- e2fsprogs-libs-1.42.13/configure
136 -+++ e2fsprogs-libs-1.42.13/configure
137 -@@ -1315,6 +1315,8 @@
138 - if test $cross_compiling = no; then
139 - BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
140 - BUILD_LDFLAGS="$LDFLAGS"
141 -+else
142 -+ BUILD_CFLAGS="$INCLUDES"
143 - fi
144 -
145 -
146
147 diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
148 deleted file mode 100644
149 index ec439e44fe94..000000000000
150 --- a/sys-libs/e2fsprogs-libs/metadata.xml
151 +++ /dev/null
152 @@ -1,13 +0,0 @@
153 -<?xml version="1.0" encoding="UTF-8"?>
154 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
155 -<pkgmetadata>
156 - <maintainer type="project">
157 - <email>base-system@g.o</email>
158 - <name>Gentoo Base System</name>
159 - </maintainer>
160 - <upstream>
161 - <remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
162 - <remote-id type="github">tytso/e2fsprogs</remote-id>
163 - <remote-id type="sourceforge">e2fsprogs</remote-id>
164 - </upstream>
165 -</pkgmetadata>