Bump to final 1.42 release #392637 by Christian Inci. Add half-assed USE=static-libs support #377537 by Agostino Sarubbo.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 79 insertions, 9 deletions

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 <vapier@gentoo.org>
+  -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 <ranger@gentoo.org> e2fsprogs-1.41.14.ebuild:
   Marking e2fsprogs-1.41.14 ppc for bug 378039
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild b/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 */