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-fs/e2fsprogs/
Date: Fri, 02 Sep 2016 08:08:15
Message-Id: 1472803675.8718f9ceca0551d98f442fce1f4ad5a79b3f2a67.polynomial-c@gentoo
1 commit: 8718f9ceca0551d98f442fce1f4ad5a79b3f2a67
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 2 07:58:51 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 08:07:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8718f9ce
7
8 sys-fs/e2fsprogs: Removed old.
9
10 Package-Manager: portage-2.3.0
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/Manifest | 1 -
14 sys-fs/e2fsprogs/e2fsprogs-1.43.ebuild | 129 ---------------------------------
15 2 files changed, 130 deletions(-)
16
17 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
18 index cdf0548..a83741f 100644
19 --- a/sys-fs/e2fsprogs/Manifest
20 +++ b/sys-fs/e2fsprogs/Manifest
21 @@ -2,4 +2,3 @@ DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9
22 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
23 DIST e2fsprogs-1.43.1.tar.xz 5078696 SHA256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d SHA512 5bc9c8f992519acaadf44925357ddb03569801e65d889de4bb40a85b61a8d78c9d97bd33fb9c099d3dac8039e837f7c525a84053e17b6c9b296948a39f6f60fd WHIRLPOOL 034d393487fbadabf6e8a75a7a647bfc55f1c762143f2add7e90cd41954350f2f02cf0d6e90ae6ed5034de266420d63e41f713f3b27eac5e9f2a0545b5509e7d
24 DIST e2fsprogs-1.43.2.tar.gz 7389995 SHA256 20085fd43d52b8f81bda259a7df5c2b1a7a745b6fd3d082a2915965dd77f5365 SHA512 4a008f2200024685df37d5fb5c01097ca005d335c7bb2b0c6b2f13db71d9046da7dbbd367ef25800e0e16312bbfdbab603d78ac675581bb39610234002756be4 WHIRLPOOL f6d193b14e1a6b8160d419e78f43981176b1ddcb8edc6d5a2daac12647565948006eb415b332be19b3e8c3e29ea7b4f8583dce1fa9002d9f0968327b2542432d
25 -DIST e2fsprogs-1.43.tar.xz 5086756 SHA256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 SHA512 f5f2d9331ebbec6530c9f41ce9c2e2296454f76b125e61802a36b8fe1f0d0f71f036275d7ff2d29bb0555b9daa6be8ac925d38192eb5085d3427ff6003d4bb78 WHIRLPOOL 4bcf553285e8cb4b347e3edc22e0d3cac206be1aa50196be5356561aabed57568f2cb6ef56988dba5c305bf801723b2cd15fc2fc907ba2f0373a16ef19ff765e
26
27 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.ebuild
28 deleted file mode 100644
29 index 2af95b0..00000000
30 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.ebuild
31 +++ /dev/null
32 @@ -1,129 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI="5"
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.xz
49 - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.xz
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 -src_prepare() {
69 - epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
70 - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
71 - if [[ ${CHOST} == *-mint* ]] ; then
72 - epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
73 - fi
74 - epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
75 - epatch "${FILESDIR}"/${PN}-1.43-sysmacros.patch
76 -
77 - # blargh ... trick e2fsprogs into using e2fsprogs-libs
78 - rm -rf doc
79 - sed -i -r \
80 - -e 's:@LIBINTL@:@LTLIBINTL@:' \
81 - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
82 - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
83 - MCONFIG.in || die "muck libs" #122368
84 - sed -i -r \
85 - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
86 - Makefile.in || die "remove subdirs"
87 - ln -s $(which mk_cmds) lib/ss/ || die
88 -
89 - # Avoid rebuild
90 - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
91 -}
92 -
93 -src_configure() {
94 - # Keep the package from doing silly things #261411
95 - export VARTEXFONTS=${T}/fonts
96 -
97 - # needs open64() prototypes and friends
98 - append-cppflags -D_GNU_SOURCE
99 -
100 - ac_cv_path_LDCONFIG=: \
101 - econf \
102 - --with-root-prefix="${EPREFIX}/" \
103 - --enable-symlink-install \
104 - $(tc-is-static-only || echo --enable-elf-shlibs) \
105 - $(tc-has-tls || echo --disable-tls) \
106 - --without-included-gettext \
107 - $(use_enable fuse fuse2fs) \
108 - $(use_enable nls) \
109 - --disable-libblkid \
110 - --disable-libuuid \
111 - --disable-fsck \
112 - --disable-uuidd
113 - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
114 - eerror "INTL sanity check failed, aborting build."
115 - eerror "Please post your ${S}/config.log file as an"
116 - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
117 - die "Preventing included intl cruft from building"
118 - fi
119 -}
120 -
121 -src_compile() {
122 - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
123 -
124 - # Build the FreeBSD helper
125 - if use elibc_FreeBSD ; then
126 - cp "${FILESDIR}"/fsck_ext2fs.c .
127 - emake V=1 fsck_ext2fs
128 - fi
129 -}
130 -
131 -src_install() {
132 - # need to set root_libdir= manually as any --libdir options in the
133 - # econf above (i.e. multilib) will screw up the default #276465
134 - emake \
135 - STRIP=: \
136 - root_libdir="${EPREFIX}/usr/$(get_libdir)" \
137 - DESTDIR="${D}" \
138 - install install-libs
139 - dodoc README RELEASE-NOTES
140 -
141 - insinto /etc
142 - doins "${FILESDIR}"/e2fsck.conf
143 -
144 - # Move shared libraries to /lib/, install static libraries to
145 - # /usr/lib/, and install linker scripts to /usr/lib/.
146 - gen_usr_ldscript -a e2p ext2fs
147 - # configure doesn't have an option to disable static libs :/
148 - use static-libs || find "${D}" -name '*.a' -delete
149 -
150 - if use elibc_FreeBSD ; then
151 - # Install helpers for us
152 - into /
153 - dosbin "${S}"/fsck_ext2fs
154 - doman "${FILESDIR}"/fsck_ext2fs.8
155 -
156 - # filefrag is linux only
157 - rm \
158 - "${ED}"/usr/sbin/filefrag \
159 - "${ED}"/usr/share/man/man8/filefrag.8 || die
160 - fi
161 -}