From 3fd13358fb1c36bf45d1a1f138b8bd2421d176e2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Dec 2011 16:51:08 +0000 Subject: [PATCH] Bump to final 1.42 release #392637 by Christian Inci. Add half-assed USE=static-libs support #377537 by Agostino Sarubbo. Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- sys-fs/e2fsprogs/ChangeLog | 10 ++- sys-fs/e2fsprogs/Manifest | 17 ++++- ...2_pre0702.ebuild => e2fsprogs-1.42.ebuild} | 16 ++--- .../files/e2fsprogs-1.42-no-quota.patch | 62 +++++++++++++++++++ 4 files changed, 93 insertions(+), 12 deletions(-) rename sys-fs/e2fsprogs/{e2fsprogs-1.42_pre0702.ebuild => e2fsprogs-1.42.ebuild} (93%) create mode 100644 sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 98c6a6f996b8..0ff531e0f8b4 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.236 2011/11/06 13:28:13 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.237 2011/12/07 16:51:08 vapier Exp $ + +*e2fsprogs-1.42 (07 Dec 2011) + + 07 Dec 2011; Mike Frysinger + -e2fsprogs-1.42_pre0702.ebuild, +e2fsprogs-1.42.ebuild, + +files/e2fsprogs-1.42-no-quota.patch: + Bump to final 1.42 release #392637 by Christian Inci. Add half-assed + USE=static-libs support #377537 by Agostino Sarubbo. 06 Nov 2011; Brent Baude e2fsprogs-1.41.14.ebuild: Marking e2fsprogs-1.41.14 ppc for bug 378039 diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 8c744dd16682..e0faf68c9409 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 RMD160 37ccdd9081c35d0e527850a280d8aadb989a3bd0 SHA1 79944cb3a4b33529e43b7fd142f6d85d4eb9a073 SHA256 01dc8bf59f6d5f435abd4b26dda92897abc338f452a80de33600594d25586013 AUX e2fsck.conf 138 RMD160 9e818294ac6d2facbde100768371143ec33e4e6d SHA1 bdbc4e2c823367ea203f869f496b310867ecba18 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08 AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 @@ -9,16 +12,24 @@ AUX e2fsprogs-1.41.12-mint-blkid.patch 1522 RMD160 735bc1f2fd604042589b7d521f0af AUX e2fsprogs-1.41.5-makefile.patch 3253 RMD160 822300273927fbdea60fc3dc747a9b6ba9c375dd SHA1 96855d5afb8d294ca57c06889d9a7ce5de29baef SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10 AUX e2fsprogs-1.41.7-mint-blkid.patch 1484 RMD160 3fc716efd32aca0c83be55813ca3951b0101c5f0 SHA1 a29f146bdf7a6d6300597f1179acc0771eb0ba74 SHA256 848080b7005bb1aabfcf05e4440951ab37ff3eec063fa4652954e3c14afdeb70 AUX e2fsprogs-1.41.8-makefile.patch 317 RMD160 f07a8fdd75e8dd43bf6ff0b6b8dad5e12dec2f05 SHA1 5d95d5ef3c07a40617e453ff328c4195f9155dac SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d +AUX e2fsprogs-1.42-no-quota.patch 1829 RMD160 f6cf3c225a7aec0c7651da1e992393ecb035e7b9 SHA1 678eed2526418a6a4b4f858bb44c2091c15551db SHA256 f2cc98da84595bce5eeac3c2c4115384a9e6ee9f2c3cf727e0b2c9c85e57bfc4 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c0027c5e031b87dd8a5d50a3a256ac7637e59fd3 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20 DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c -DIST e2fsprogs-1.42-WIP-0702.tar.gz 5544716 RMD160 a07f7031ce13bc72c44d5f2f2df74954c7cc8664 SHA1 66f0ca4a959b2a54e0e3a528aabdd176e6b906ef SHA256 dbd229ede377a6a299317a461c951575ca4a5acf2a534cffeb4ce407ff56e6a0 +DIST e2fsprogs-1.42.tar.gz 5709827 RMD160 91136a82c35f86f54f6573f9788d32da66b972cb SHA1 e69bc63bc319e4d1e4242cc278bfd442a60646e6 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46 EBUILD e2fsprogs-1.41.12-r1.ebuild 4303 RMD160 a1daa7568c42aa832e6feb4dc6193c25d75596da SHA1 81344ff29dd3541b0514e53034500da85480f59e SHA256 8bf1da67f59d7ef8adecaf73c31c7f7c6e41716e97b3b5f79ba023cd52eb70b3 EBUILD e2fsprogs-1.41.12.ebuild 3900 RMD160 a275d276a051a0498055b2ee6c4833e7dfa3f79c SHA1 f0bff43ac6e5e1369ab0dbb14fcb798ffa68a7b8 SHA256 2c6fca4ab9cd9d2d8341a470c58d470af0ee82367ddc649b50d9ff4c2a6f94dd EBUILD e2fsprogs-1.41.14.ebuild 4297 RMD160 765e35ba0b673cfc81c1c13cdf8e31bfb73c5213 SHA1 9168e46aa875531f3a9b944287c98fa6b0ab8409 SHA256 b9993169fb83cc4b23ec4b2d561d681391a8c4d1be193de17b21749760fe0f47 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5 -EBUILD e2fsprogs-1.42_pre0702.ebuild 4438 RMD160 8b11d80f2652db12dc2441f7e1ec0c7516dfb3eb SHA1 c268c2516bbe4d4ec7a2a4ab64b0d06247f8a6ac SHA256 40d943151d1cda7fb89d78a469793eea20834e98057108229994253003a1bf03 -MISC ChangeLog 34954 RMD160 d4574a6cd9550a3c053d3b1b2ab9e264fc7bdf0c SHA1 1160b495964313dcc1f515d398711a6b72af4f26 SHA256 beadd847055cf20c8a4c421dc011ba24fa8522d5fbb0070dd0f75e6584397574 +EBUILD e2fsprogs-1.42.ebuild 4458 RMD160 f9c80baa4fdb1e8f0e84303c916753faf80e5335 SHA1 16a91633d7909f152ff64a96d9a7496c68039f0e SHA256 5fc5ccd84b09de4c13346c8c163957857b81ef2174d229fce9338f477f4b5182 +MISC ChangeLog 35260 RMD160 df92a2da98155eb382b9a6c7f1d0ac9b5e5f29b7 SHA1 c91bfb53ea2f53d007b7192336cd8235afa6bcc9 SHA256 b969efb12be94c7bcffef3c9647b9ffacb5ff7bdb02e6f5b595d058e8d9bdbce MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk7fmYUACgkQaC/OocHi7JbUMwD/RZVv+lgyRw+eCH3uKOZVjhLZ +G5RHdFvSNzFgxEhAXs4A/1KUsCwntgTIWqeU6nAkmOboa/Pxs+L1IjCfkH2h0s72 +=z3iD +-----END PGP SIGNATURE----- diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild similarity index 93% rename from sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild rename to sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild index 900d84f4868a..0ad546099c46 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild,v 1.1 2011/09/01 19:32:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.1 2011/12/07 16:51:08 vapier Exp $ case ${PV} in *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" -IUSE="nls elibc_FreeBSD" +IUSE="nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 @@ -43,6 +43,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch # use symlinks rather than hardlinks sed -i \ -e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \ @@ -62,9 +63,6 @@ src_prepare() { sed -i -r \ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ Makefile.in || die "remove subdirs" - sed -i \ - -e '/^#define _XOPEN/i#define _GNU_SOURCE' \ - misc/mke2fs.c || die # needs open64() prototype # Avoid rebuild touch lib/ss/ss_err.h @@ -84,6 +82,7 @@ src_configure() { esac ac_cv_path_LDCONFIG=: \ + QUOTA_CMT='#' \ econf \ --with-root-prefix="${EPREFIX}/" \ ${libtype} \ @@ -92,6 +91,7 @@ src_configure() { $(use_enable nls) \ --disable-libblkid \ --disable-libuuid \ + --disable-quota \ --disable-fsck \ --disable-uuidd if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then @@ -135,9 +135,9 @@ src_install() { # Move shared libraries to /lib/, install static libraries to # /usr/lib/, and install linker scripts to /usr/lib/. - set -- "${ED}"/usr/$(get_libdir)/*.a - set -- ${@/*\/lib} - gen_usr_ldscript -a "${@/.a}" + gen_usr_ldscript -a e2p ext2fs + # configure doesn't have an option to disable static libs :/ + find "${D}" -name '*.a' -delete if use elibc_FreeBSD ; then # Install helpers for us diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch new file mode 100644 index 000000000000..775b820dac21 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch @@ -0,0 +1,62 @@ +quota was meant to be turned off in the 1.42 release as it's half +baked, but the commit to disable didn't really work either. + +--- a/lib/quota/Makefile.in ++++ b/lib/quota/Makefile.in +@@ -76,7 +76,8 @@ + $(DESTDIR)$(includedir)/quota $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(libdir)/pkgconfig + +-install:: all installdirs ++install:: ++disabled:: all installdirs + $(E) " INSTALL_DATA $(libdir)/libquota.a" + $(Q) $(INSTALL_DATA) libquota.a $(DESTDIR)$(libdir)/libquota.a + -$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libquota.a +--- a/configure ++++ b/configure +@@ -5224,11 +5224,11 @@ + + fi + +-LIBQUOTA='$(LIB)/libquota'$LIB_EXT ++LIBQUOTA= + DEPLIBQUOTA=$LIBQUOTA +-STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT ++STATIC_LIBQUOTA= + DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA +-PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT ++PROFILED_LIBQUOTA= + DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA + + +--- a/lib/quota/mkquota.h ++++ b/lib/quota/mkquota.h +@@ -60,4 +60,17 @@ + int quota_file_exists(ext2_filsys fs, int qtype, int fmt); + void quota_set_sb_inum(ext2_filsys fs, ext2_ino_t ino, int qtype); + ++#define quota_init_context(a, ...) ++#define quota_data_inodes(a, ...) ++#define quota_data_add(a, ...) ++#define quota_data_sub(a, ...) ++#define quota_write_inode(a, ...) ++#define quota_update_inode(a, ...) 0 ++#define quota_compute_usage(a, ...) ++#define quota_release_context(a, ...) ++#define quota_remove_inode(a, ...) ++#define quota_is_on(a, ...) ++#define quota_file_exists(a, ...) -1 ++#define quota_set_sb_inum(a, ...) ++ + #endif /* __QUOTA_QUOTAIO_H__ */ +--- a/lib/quota/quotaio.h ++++ b/lib/quota/quotaio.h +@@ -167,4 +167,7 @@ + const char *quota_get_qf_path(const char *mntpt, int qtype, int fmt, + char *path_buf, size_t path_buf_size); + ++#define quota_get_qf_name(a, ...) ++#define quota_get_qf_path(a, ...) ++ + #endif /* GUARD_QUOTAIO_H */ -- 2.26.2