1 |
commit: 6d7e6db5ce57e8bfb471c5eb95400fdcd828506b |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 17 08:18:56 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 17 08:25:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7e6db5 |
7 |
|
8 |
sys-fs/e2fsprogs: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
11 |
|
12 |
sys-fs/e2fsprogs/Manifest | 1 - |
13 |
sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild | 135 ------------------------------- |
14 |
2 files changed, 136 deletions(-) |
15 |
|
16 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
17 |
index b6de354b21b..25fb854dbce 100644 |
18 |
--- a/sys-fs/e2fsprogs/Manifest |
19 |
+++ b/sys-fs/e2fsprogs/Manifest |
20 |
@@ -1,6 +1,5 @@ |
21 |
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 |
22 |
DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 SHA256 4a4a59215efde3b0b398a19c9e74f73ae9bbbca954cf3e2aaaaa5f0a9f836313 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8 WHIRLPOOL a03a7461183b08ac178dc7d0c6a230df93d75902b0abc33ec0c7a19d018fdc4264910e688db4708bd16b23d175a3a9928e38c31f8377f7d28352bac83a8cd90f |
23 |
DIST e2fsprogs-1.43.3.tar.gz 7405892 SHA256 ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea WHIRLPOOL c90dea3d01a103b7d11d0611b1b005748065ae90f15a02f3bde4c4baf9403931b40d2024297a2e02a92d11841d35decf8a4715d682212d4641ff34bb2f80d5db |
24 |
-DIST e2fsprogs-1.43.5.tar.gz 7596581 SHA256 466db1da11e227143fbdf6a401833e0ab17cf43d927f5baa4a7042b3ce8a3932 SHA512 c174a5110d59110cbc5e9982825993e18241a831b26bb5927447ad238172a51b5870b7431b38ce27f26761abf6af0249ddf1229f32be1c2ed58a67a9704991ed WHIRLPOOL 8aec75bd8e103226fb8d92da00cc52cdd86726336a34fd0cc54c0d85d816d190cb0f133aa2f271a637aaccab165a9c5b5feb0ad348d73685f1debd1d9ba91b03 |
25 |
DIST e2fsprogs-1.43.6.tar.gz 7466907 SHA256 233d70ac434cdfba792dc0f83944c0ec854468d604fb22325ae65c4adfc90239 SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 WHIRLPOOL 862769b1775d87297c30a242a2578971435115ebf381156f0c16078a2ad0e19f03e8af41c93d00d6324a11af6d4cf333b0a1a8fe3eee76fcbb47fc825f3481c5 |
26 |
DIST e2fsprogs-1.43.7.tar.gz 7492811 SHA256 87035f2eae8da5f9869f78ffc177969b4e3cf75a5da489521c1ffe4268e1a1c4 SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282 WHIRLPOOL 5fb000e6bbd4770c0361976c4b3d4874c91b005b5e9c0dad108fe428e56a147361d5d265abd8db4605819eb771740b4a362885cb76bf5661f815a434f3bd9a3a |
27 |
|
28 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild |
29 |
deleted file mode 100644 |
30 |
index e3cc852d20e..00000000000 |
31 |
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,135 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-case ${PV} in |
40 |
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; |
41 |
-*) UP_PV=${PV} ;; |
42 |
-esac |
43 |
- |
44 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
45 |
- |
46 |
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
47 |
-HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
48 |
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz |
49 |
- mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz |
50 |
- elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
51 |
- |
52 |
-LICENSE="GPL-2 BSD" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" |
55 |
-IUSE="fuse nls static-libs elibc_FreeBSD" |
56 |
- |
57 |
-RDEPEND="~sys-libs/${PN}-libs-${PV} |
58 |
- >=sys-apps/util-linux-2.16 |
59 |
- fuse? ( sys-fs/fuse ) |
60 |
- nls? ( virtual/libintl )" |
61 |
-DEPEND="${RDEPEND} |
62 |
- nls? ( sys-devel/gettext ) |
63 |
- virtual/pkgconfig |
64 |
- sys-apps/texinfo" |
65 |
- |
66 |
-S="${WORKDIR}/${P%_pre*}" |
67 |
- |
68 |
-PATCHES=( |
69 |
- "${FILESDIR}"/${PN}-1.41.8-makefile.patch |
70 |
- "${FILESDIR}"/${PN}-1.40-fbsd.patch |
71 |
- "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
72 |
- |
73 |
- # Upstream patches (can usually removed with next version bump) |
74 |
-) |
75 |
- |
76 |
-src_prepare() { |
77 |
- if [[ ${CHOST} == *-mint* ]] ; then |
78 |
- PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) |
79 |
- fi |
80 |
- |
81 |
- default |
82 |
- |
83 |
- # blargh ... trick e2fsprogs into using e2fsprogs-libs |
84 |
- rm -rf doc |
85 |
- sed -i -r \ |
86 |
- -e 's:@LIBINTL@:@LTLIBINTL@:' \ |
87 |
- -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
88 |
- -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
89 |
- MCONFIG.in || die "muck libs" #122368 |
90 |
- sed -i -r \ |
91 |
- -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
92 |
- Makefile.in || die "remove subdirs" |
93 |
- ln -s $(which mk_cmds) lib/ss/ || die |
94 |
- |
95 |
- # Avoid rebuild |
96 |
- echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
97 |
-} |
98 |
- |
99 |
-src_configure() { |
100 |
- # Keep the package from doing silly things #261411 |
101 |
- export VARTEXFONTS="${T}/fonts" |
102 |
- |
103 |
- # needs open64() prototypes and friends |
104 |
- append-cppflags -D_GNU_SOURCE |
105 |
- |
106 |
- local myeconfargs=( |
107 |
- --with-root-prefix="${EPREFIX}/" |
108 |
- --enable-symlink-install |
109 |
- $(tc-is-static-only || echo --enable-elf-shlibs) |
110 |
- $(tc-has-tls || echo --disable-tls) |
111 |
- --without-included-gettext |
112 |
- $(use_enable fuse fuse2fs) |
113 |
- $(use_enable nls) |
114 |
- --disable-libblkid |
115 |
- --disable-libuuid |
116 |
- --disable-fsck |
117 |
- --disable-uuidd |
118 |
- ) |
119 |
- ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" |
120 |
- if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
121 |
- eerror "INTL sanity check failed, aborting build." |
122 |
- eerror "Please post your ${S}/config.log file as an" |
123 |
- eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" |
124 |
- die "Preventing included intl cruft from building" |
125 |
- fi |
126 |
-} |
127 |
- |
128 |
-src_compile() { |
129 |
- emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
130 |
- |
131 |
- # Build the FreeBSD helper |
132 |
- if use elibc_FreeBSD ; then |
133 |
- cp "${FILESDIR}"/fsck_ext2fs.c . |
134 |
- emake V=1 fsck_ext2fs |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-src_install() { |
139 |
- # need to set root_libdir= manually as any --libdir options in the |
140 |
- # econf above (i.e. multilib) will screw up the default #276465 |
141 |
- emake \ |
142 |
- STRIP=: \ |
143 |
- root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
144 |
- DESTDIR="${D}" \ |
145 |
- install install-libs |
146 |
- dodoc README RELEASE-NOTES |
147 |
- |
148 |
- insinto /etc |
149 |
- doins "${FILESDIR}"/e2fsck.conf |
150 |
- |
151 |
- # Move shared libraries to /lib/, install static libraries to |
152 |
- # /usr/lib/, and install linker scripts to /usr/lib/. |
153 |
- gen_usr_ldscript -a e2p ext2fs |
154 |
- # configure doesn't have an option to disable static libs :/ |
155 |
- use static-libs || find "${D}" -name '*.a' -delete |
156 |
- |
157 |
- if use elibc_FreeBSD ; then |
158 |
- # Install helpers for us |
159 |
- into / |
160 |
- dosbin "${S}"/fsck_ext2fs |
161 |
- doman "${FILESDIR}"/fsck_ext2fs.8 |
162 |
- |
163 |
- # filefrag is linux only |
164 |
- rm \ |
165 |
- "${ED%/}"/usr/sbin/filefrag \ |
166 |
- "${ED%/}"/usr/share/man/man8/filefrag.8 || die |
167 |
- fi |
168 |
-} |