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, 09 Feb 2018 09:57:11
Message-Id: 1518170215.c4385689c975310831fd273797eacc525b2a2ac5.polynomial-c@gentoo
1 commit: c4385689c975310831fd273797eacc525b2a2ac5
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 9 09:50:43 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 9 09:56:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4385689
7
8 sys-fs/e2fsprogs: Removed old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-fs/e2fsprogs/Manifest | 1 -
13 sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild | 135 -------------------------------
14 2 files changed, 136 deletions(-)
15
16 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
17 index c8e81b5247e..9b0baf9551b 100644
18 --- a/sys-fs/e2fsprogs/Manifest
19 +++ b/sys-fs/e2fsprogs/Manifest
20 @@ -2,6 +2,5 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d
21 DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 BLAKE2B ec53c0aca102e137fce437f98f299b674b25110a7df38139c35fa4da6756992a0923c65bbcd39e4739c3d454b119c8b30681b7426b1c22853538f9d4d00d2a02 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8
22 DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1bd78ea9ee418c8ad85d2bf422d49ea93ad6c1b33c9b7bdafceacb4c0975da776c6e5b2df8962baf0d368c894db5a8 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea
23 DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
24 -DIST e2fsprogs-1.43.7.tar.gz 7492811 BLAKE2B 122158f0824de632b93fab651be60ca45096b5dac20438a6407c69577017a5f117ce402166b529072a81a2b6ac96f9237ea1a0f55d7d23d05ba758d42d86451a SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282
25 DIST e2fsprogs-1.43.8.tar.gz 7474876 BLAKE2B b5d550a646facd2aae9de9758976e987ab6ddfc7c92fc1ea2ca71140010f3e10627a5dee5e17caa77746c6de508a652e26a31df123732603c9cbcc8df5edaa54 SHA512 158e9fa928de61716d57eeac1a64c3c40043c00594ce397419de71fc1f260f1a8f932971b1cef62ed8a01e865f4d97f6bc86289c3a60d33b160874b20744cbe5
26 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
27
28 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild
29 deleted file mode 100644
30 index e3cc852d20e..00000000000
31 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.7.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 -}