From 420eeee727d39d869d864caddb04a80dafda7160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2017 17:51:45 +0100 Subject: gentoo resync : 17.10.2017 --- sys-fs/e2fsprogs/Manifest | 6 +- sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild | 135 ------------------------------- sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild | 2 +- sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild | 135 +++++++++++++++++++++++++++++++ 4 files changed, 139 insertions(+), 139 deletions(-) delete mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild (limited to 'sys-fs/e2fsprogs') diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index e936b908fa6c..8c885f954b5e 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -8,11 +8,11 @@ AUX fsck_ext2fs.c 2793 SHA256 7ec106ba31bf93dc334f946a88301d7eb26c2c35a65a7b8938 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 SHA256 4a4a59215efde3b0b398a19c9e74f73ae9bbbca954cf3e2aaaaa5f0a9f836313 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8 WHIRLPOOL a03a7461183b08ac178dc7d0c6a230df93d75902b0abc33ec0c7a19d018fdc4264910e688db4708bd16b23d175a3a9928e38c31f8377f7d28352bac83a8cd90f DIST e2fsprogs-1.43.3.tar.gz 7405892 SHA256 ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea WHIRLPOOL c90dea3d01a103b7d11d0611b1b005748065ae90f15a02f3bde4c4baf9403931b40d2024297a2e02a92d11841d35decf8a4715d682212d4641ff34bb2f80d5db -DIST e2fsprogs-1.43.5.tar.gz 7596581 SHA256 466db1da11e227143fbdf6a401833e0ab17cf43d927f5baa4a7042b3ce8a3932 SHA512 c174a5110d59110cbc5e9982825993e18241a831b26bb5927447ad238172a51b5870b7431b38ce27f26761abf6af0249ddf1229f32be1c2ed58a67a9704991ed WHIRLPOOL 8aec75bd8e103226fb8d92da00cc52cdd86726336a34fd0cc54c0d85d816d190cb0f133aa2f271a637aaccab165a9c5b5feb0ad348d73685f1debd1d9ba91b03 DIST e2fsprogs-1.43.6.tar.gz 7466907 SHA256 233d70ac434cdfba792dc0f83944c0ec854468d604fb22325ae65c4adfc90239 SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66 WHIRLPOOL 862769b1775d87297c30a242a2578971435115ebf381156f0c16078a2ad0e19f03e8af41c93d00d6324a11af6d4cf333b0a1a8fe3eee76fcbb47fc825f3481c5 +DIST e2fsprogs-1.43.7.tar.gz 7492811 SHA256 87035f2eae8da5f9869f78ffc177969b4e3cf75a5da489521c1ffe4268e1a1c4 SHA512 71694c57d076517f6e1f2a5bffcbc49c32fcf11283e26739304f50ff0aae28646ea7af80dc85b636b87db57a0042a5bce82411e631f7d5c055440ebeadb90282 WHIRLPOOL 5fb000e6bbd4770c0361976c4b3d4874c91b005b5e9c0dad108fe428e56a147361d5d265abd8db4605819eb771740b4a362885cb76bf5661f815a434f3bd9a3a EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 SHA256 8eda4767977a467c700bd79f9b4b1b70ccabf76b007db75498101fc6edfe977e SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c WHIRLPOOL 278072ab829a9e9ea8810b98d70f43211ab71b187b3500b0c9297ca337a308f1eecc6978ffe685da06988debe2059301b49cb7b67b035b977a200a5fe35d1c7b -EBUILD e2fsprogs-1.43.5.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f -EBUILD e2fsprogs-1.43.6.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f +EBUILD e2fsprogs-1.43.6.ebuild 3800 SHA256 09ad6fdfef0dbecba3f3990ed59907a99cf8911480c7123c91122b73ce9f74de SHA512 b303f44bf560a65e998c84737759fd4bad5d3a169f318e0d23a877bee8d0f68f360826ec6711a22a8892e6da18bc01ce8e64de2986ee7eb9701061d46a925087 WHIRLPOOL ceed394146eb2f78f5bda9cfe27c5a60718f1b9a9b720a1ab7442057c2f3d48ab6641ded667fb8e15fa4e6ae52d11e50cf5fb00a498612dd23234865401f1301 +EBUILD e2fsprogs-1.43.7.ebuild 3803 SHA256 25d55af84a2f9710128989a2d3882bac946bd1bef23e4027494f0fc6af5b91da SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9 WHIRLPOOL afd8d04b1ccef5a2b532b18992bf609844fb4fb52b74e1c3b5f67677d217d095f20389d089e447af4dd2f9f06a97a390123d1633b17e3dea23533dd985cc714f MISC ChangeLog 7643 SHA256 c0cf2dd26e491ad39b3f867c0bd9296e10749d0f1838cb7cec65ba1d15e5956f SHA512 f46d87e5a695385f4642bb03316ceb7b622461d938c3af2c5e15836a07384cae7a573c86750217c3d49bf00b870187c248aaefa2bac1e819a6b21ae9e7f4b2cd WHIRLPOOL 0fe755f687bedb25e32f4d6050f77e6dcc4179e24211589fb6c10ceef98ad12e3bc2733a86db9de11bdaf618cf290901705fe947b30c87bab719f0182e44a036 MISC ChangeLog-2015 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2 MISC metadata.xml 520 SHA256 d7e8aff0886fa1a93bdd7f347cd5850753bc1cf1cf6eefde71e98a8aa6ac5eb4 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 WHIRLPOOL 2f2712617962a77cc37b8761ec4965fd61654a084de695f72cb1c2a4a678a76dbb9cd4e1b5aed67ac6649f7222cb75f86bc36e24fce96a68f8448d33a733f69a diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild deleted file mode 100644 index e3cc852d20ef..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.5.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" - -LICENSE="GPL-2 BSD" -SLOT="0" -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" -IUSE="fuse nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S="${WORKDIR}/${P%_pre*}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.41.8-makefile.patch - "${FILESDIR}"/${PN}-1.40-fbsd.patch - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - - # Upstream patches (can usually removed with next version bump) -) - -src_prepare() { - if [[ ${CHOST} == *-mint* ]] ; then - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) - fi - - default - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next ' > lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS="${T}/fonts" - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - local myeconfargs=( - --with-root-prefix="${EPREFIX}/" - --enable-symlink-install - $(tc-is-static-only || echo --enable-elf-shlibs) - $(tc-has-tls || echo --disable-tls) - --without-included-gettext - $(use_enable fuse fuse2fs) - $(use_enable nls) - --disable-libblkid - --disable-libuuid - --disable-fsck - --disable-uuidd - ) - ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED%/}"/usr/sbin/filefrag \ - "${ED%/}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild index e3cc852d20ef..e5d937291fb7 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz LICENSE="GPL-2 BSD" SLOT="0" -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" +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" IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild new file mode 100644 index 000000000000..e3cc852d20ef --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.7.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +case ${PV} in +*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; +*) UP_PV=${PV} ;; +esac + +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz + mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz + elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" + +LICENSE="GPL-2 BSD" +SLOT="0" +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" +IUSE="fuse nls static-libs elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + >=sys-apps/util-linux-2.16 + fuse? ( sys-fs/fuse ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig + sys-apps/texinfo" + +S="${WORKDIR}/${P%_pre*}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.41.8-makefile.patch + "${FILESDIR}"/${PN}-1.40-fbsd.patch + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 + + # Upstream patches (can usually removed with next version bump) +) + +src_prepare() { + if [[ ${CHOST} == *-mint* ]] ; then + PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) + fi + + default + + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ + -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ + Makefile.in || die "remove subdirs" + ln -s $(which mk_cmds) lib/ss/ || die + + # Avoid rebuild + echo '#include_next ' > lib/ss/ss_err.h +} + +src_configure() { + # Keep the package from doing silly things #261411 + export VARTEXFONTS="${T}/fonts" + + # needs open64() prototypes and friends + append-cppflags -D_GNU_SOURCE + + local myeconfargs=( + --with-root-prefix="${EPREFIX}/" + --enable-symlink-install + $(tc-is-static-only || echo --enable-elf-shlibs) + $(tc-has-tls || echo --disable-tls) + --without-included-gettext + $(use_enable fuse fuse2fs) + $(use_enable nls) + --disable-libblkid + --disable-libuuid + --disable-fsck + --disable-uuidd + ) + ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" + if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + eerror "INTL sanity check failed, aborting build." + eerror "Please post your ${S}/config.log file as an" + eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" + die "Preventing included intl cruft from building" + fi +} + +src_compile() { + emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds + + # Build the FreeBSD helper + if use elibc_FreeBSD ; then + cp "${FILESDIR}"/fsck_ext2fs.c . + emake V=1 fsck_ext2fs + fi +} + +src_install() { + # need to set root_libdir= manually as any --libdir options in the + # econf above (i.e. multilib) will screw up the default #276465 + emake \ + STRIP=: \ + root_libdir="${EPREFIX}/usr/$(get_libdir)" \ + DESTDIR="${D}" \ + install install-libs + dodoc README RELEASE-NOTES + + insinto /etc + doins "${FILESDIR}"/e2fsck.conf + + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a e2p ext2fs + # configure doesn't have an option to disable static libs :/ + use static-libs || find "${D}" -name '*.a' -delete + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs + doman "${FILESDIR}"/fsck_ext2fs.8 + + # filefrag is linux only + rm \ + "${ED%/}"/usr/sbin/filefrag \ + "${ED%/}"/usr/share/man/man8/filefrag.8 || die + fi +} -- cgit v1.2.3