Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/
Date: Wed, 06 Mar 2019 11:59:19
Message-Id: 1551873546.15394f1e8dde9eec74dd6761fe1008f6a31d1701.polynomial-c@gentoo
1 commit: 15394f1e8dde9eec74dd6761fe1008f6a31d1701
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 6 11:59:06 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 6 11:59:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15394f1e
7
8 sys-libs/e2fsprogs-libs: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-libs/e2fsprogs-libs/Manifest | 2 -
14 .../e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild | 68 ----------------
15 .../e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild | 94 ----------------------
16 3 files changed, 164 deletions(-)
17
18 diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
19 index 74e9b26f8f6..add3206f3a4 100644
20 --- a/sys-libs/e2fsprogs-libs/Manifest
21 +++ b/sys-libs/e2fsprogs-libs/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
24 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
25 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
26 -DIST e2fsprogs-libs-1.43.6.tar.gz 595409 BLAKE2B a5edf65b637b7f3fab16174a695baa232b8aeab6e8d28140a3a68ed63eee309949ca85a28f33d15199068fffe9174ef76b28f403ec09118296a458611592a36e SHA512 80a643ba349aac79c88548e9692066f777c5f9e82e309b348606a8078de456171535e6e5df91f73ca3db9d03bb539b1a19883cf74615357bdf77f3bd20cc0b11
27 DIST e2fsprogs-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
28
29 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
30 deleted file mode 100644
31 index 2f7c5f54159..00000000000
32 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.6.ebuild
33 +++ /dev/null
34 @@ -1,68 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -case ${PV} in
41 -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
42 -*) UP_PV=${PV} ;;
43 -esac
44 -
45 -inherit toolchain-funcs eutils multilib-minimal
46 -
47 -DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
48 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
49 -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
50 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz"
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
55 -IUSE="nls static-libs"
56 -
57 -RDEPEND="!sys-libs/com_err
58 - !sys-libs/ss
59 - !<sys-fs/e2fsprogs-1.41.8"
60 -DEPEND="nls? ( sys-devel/gettext )
61 - virtual/pkgconfig"
62 -
63 -S="${WORKDIR}/${P%_pre*}"
64 -
65 -PATCHES=(
66 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
67 -)
68 -
69 -src_prepare() {
70 - printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
71 - default
72 -}
73 -
74 -multilib_src_configure() {
75 - local myconf=()
76 - # we use blkid/uuid from util-linux now
77 - if use kernel_linux ; then
78 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
79 - myconf+=( --disable-lib{blkid,uuid} )
80 - fi
81 - ac_cv_path_LDCONFIG=: \
82 - ECONF_SOURCE="${S}" \
83 - CC="$(tc-getCC)" \
84 - BUILD_CC="$(tc-getBUILD_CC)" \
85 - BUILD_LD="$(tc-getBUILD_LD)" \
86 - econf \
87 - $(tc-is-static-only || echo --enable-elf-shlibs) \
88 - $(tc-has-tls || echo --disable-tls) \
89 - $(use_enable nls) \
90 - "${myconf[@]}"
91 -}
92 -
93 -multilib_src_compile() {
94 - emake V=1
95 -}
96 -
97 -multilib_src_install() {
98 - emake V=1 STRIP=: DESTDIR="${D}" install || die
99 - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
100 - # configure doesn't have an option to disable static libs :/
101 - use static-libs || find "${ED}" -name '*.a' -delete
102 -}
103
104 diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild
105 deleted file mode 100644
106 index 72ddfa6dac2..00000000000
107 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.4.ebuild
108 +++ /dev/null
109 @@ -1,94 +0,0 @@
110 -# Copyright 1999-2018 Gentoo Foundation
111 -# Distributed under the terms of the GNU General Public License v2
112 -
113 -EAPI="6"
114 -
115 -inherit toolchain-funcs multilib-minimal
116 -
117 -MY_PN=${PN%-libs}
118 -MY_P="${MY_PN}-${PV}"
119 -
120 -DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
121 -HOMEPAGE="http://e2fsprogs.sourceforge.net/"
122 -SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
123 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
124 -
125 -LICENSE="GPL-2"
126 -SLOT="0"
127 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
128 -IUSE="static-libs"
129 -
130 -RDEPEND="!sys-libs/com_err
131 - !sys-libs/ss
132 - !<sys-fs/e2fsprogs-1.41.8"
133 -DEPEND="virtual/pkgconfig"
134 -
135 -S="${WORKDIR}/${MY_P}"
136 -
137 -PATCHES=(
138 - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
139 -)
140 -
141 -src_prepare() {
142 - default
143 -
144 - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
145 -}
146 -
147 -multilib_src_configure() {
148 - local myconf=(
149 - --enable-elf-shlibs
150 - $(tc-has-tls || echo --disable-tls)
151 - --disable-e2initrd-helper
152 - --disable-fsck
153 - )
154 -
155 - # we use blkid/uuid from util-linux now
156 - if use kernel_linux ; then
157 - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
158 - myconf+=( --disable-lib{blkid,uuid} )
159 - fi
160 -
161 - ac_cv_path_LDCONFIG=: \
162 - ECONF_SOURCE="${S}" \
163 - CC="$(tc-getCC)" \
164 - BUILD_CC="$(tc-getBUILD_CC)" \
165 - BUILD_LD="$(tc-getBUILD_LD)" \
166 - econf "${myconf[@]}"
167 -}
168 -
169 -multilib_src_compile() {
170 - emake -C lib/et V=1 || die "Failed to build libcom"
171 -
172 - emake -C lib/ss V=1 || die "Failed to build libss"
173 -}
174 -
175 -multilib_src_test() {
176 - if multilib_is_native_abi; then
177 - emake -C lib/et V=1 check || die "Failed to test libcom"
178 -
179 - emake -C lib/ss V=1 check || die "Failed to test libss"
180 - fi
181 -}
182 -
183 -multilib_src_install() {
184 - emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom"
185 -
186 - emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss"
187 -
188 - # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
189 - # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
190 - # links to libcom_err.so).
191 - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
192 -
193 - if ! use static-libs ; then
194 - find "${ED%/}" -name '*.a' -delete || die
195 - fi
196 -}
197 -
198 -multilib_src_install_all() {
199 - # Package installs same header twice -- use symlink instead
200 - dosym et/com_err.h /usr/include/com_err.h
201 -
202 - einstalldocs
203 -}