Undo some useless changes from the prefix merge, and fix implicit getpagesize() warnings.

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

4 files changed, 58 insertions, 62 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 0d049f8b6459..b7226d5953b6 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,18 +1,18 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.226 2010/11/19 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.227 2010/12/04 22:29:24 vapier Exp $
 
-  19 Nov 2010; Justin Lecher <jlec@gentoo.org> e2fsprogs-1.41.12-r1.ebuild:
-  QA empty line
+  04 Dec 2010; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.12-r1.ebuild,
+  +files/e2fsprogs-1.41.12-getpagesize.patch:
+  Undo some useless changes from the prefix merge, and fix implicit
+  getpagesize() warnings.
 
 *e2fsprogs-1.41.12-r1 (19 Nov 2010)
 
-  19 Nov 2010; Justin Lecher <jlec@gentoo.org>
-  +files/e2fsprogs-1.41.4-darwin-no-mntent.patch,
-  +files/e2fsprogs-1.41.7-mint-blkid.patch, +e2fsprogs-1.41.12-r1.ebuild,
+  19 Nov 2010; Justin Lecher <jlec@gentoo.org> +e2fsprogs-1.41.12-r1.ebuild,
+  +files/e2fsprogs-1.41.7-mint-blkid.patch, +files/e2fsprogs-1.41-mint.patch,
   +files/e2fsprogs-1.41.12-darwin-makefile.patch,
-  +files/e2fsprogs-1.41.12-darwin-no-mntent.patch,
-  +files/e2fsprogs-1.41-mint.patch:
+  +files/e2fsprogs-1.41.12-darwin-no-mntent.patch:
   Import Prefix Changes
 
   09 Oct 2010; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.41.12.ebuild:
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild
index 3a868b863151..968798a91ff5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.2 2010/11/19 18:51:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.3 2010/12/04 22:29:24 vapier Exp $
 
 EAPI="3"
 
@@ -15,14 +15,13 @@ 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"
 
-RDEPEND="
+RDEPEND="~sys-libs/${PN}-libs-${PV}
 	>=sys-apps/util-linux-2.16
-	~sys-libs/${PN}-libs-${PV}
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	sys-apps/texinfo
-	nls? ( sys-devel/gettext )"
+	sys-apps/texinfo"
 
 pkg_setup() {
 	if [[ ! -e ${EROOT}/etc/mtab ]] ; then
@@ -35,6 +34,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
 	# use symlinks rather than hardlinks
 	sed -i \
@@ -47,7 +47,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-1.41.7-mint-blkid.patch
 	fi
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc || die
+	rm -rf doc
 	sed -i -r \
 		-e 's:@LIBINTL@:@LTLIBINTL@:' \
 		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
@@ -129,31 +129,17 @@ src_install() {
 		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" \
 		install install-libs || die
-	dodoc README RELEASE-NOTES || die
+	dodoc README RELEASE-NOTES
 
 	insinto /etc
 	doins "${FILESDIR}"/e2fsck.conf || die
 
 	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/,
-	# and install linker scripts to /usr/lib/.
+	# /usr/lib/, and install linker scripts to /usr/lib/.
 	set -- "${ED}"/usr/$(get_libdir)/*.a
 	set -- ${@/*\/lib}
 	gen_usr_ldscript -a "${@/.a}"
 
-	# For correct install_names (on Darwin) we can't do this with
-	# root_libdir=/lib and the code below, instead we need root_libdir=/usr/lib
-	# and gen_usr_ldscript that fixes install_names as the libs are moved
-	## make sure symlinks are relative, not absolute, for cross-compiling
-	#cd "${ED}"/usr/$(get_libdir)
-	#local x l
-	#for x in lib* ; do
-	#	l=$(readlink "${x}")
-	#	[[ ${l} == /* ]] || continue
-	#	rm -f "${x}"
-	#	ln -s "../..${l}" "${x}"
-	#done
-
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
 		into /
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
new file mode 100644
index 000000000000..5b042d3690e7
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
@@ -0,0 +1,42 @@
+From 81c81f5421cb9b85e793c591595a0a4d6ee04e99 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 4 Dec 2010 17:10:53 -0500
+Subject: [PATCH] libext2fs: change getpagesize to sysconf
+
+Newer versions of glibc no longer export the getpagesize() prototype when
+using recent versions of POSIX (_XOPEN_SOURCE).  So building tdb.c gives
+use implicit function declaration warnings.  Fix the issue by using the
+portable sysconf() function which returns the same answer.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/ext2fs/tdb.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
+index 0c82a24..43c5d44 100644
+--- a/lib/ext2fs/tdb.c
++++ b/lib/ext2fs/tdb.c
+@@ -111,10 +111,6 @@ typedef int bool;
+ #define u32 unsigned
+ #endif
+ 
+-#ifndef HAVE_GETPAGESIZE
+-#define getpagesize() 0x2000
+-#endif
+-
+ typedef u32 tdb_len_t;
+ typedef u32 tdb_off_t;
+ 
+@@ -3838,7 +3834,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
+ 	tdb->hash_fn = hash_fn ? hash_fn : default_tdb_hash;
+ 
+ 	/* cache the page size */
+-	tdb->page_size = getpagesize();
++	tdb->page_size = sysconf(_SC_PAGESIZE);
+ 	if (tdb->page_size <= 0) {
+ 		tdb->page_size = 0x2000;
+ 	}
+-- 
+1.7.3.1
+
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch
deleted file mode 100644
index e48d0c208934..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Dirk Tilger <dirk@miriup.de>:
-  For the mntent.patch: e2fsprogs is using a GNU libc specific
-  operation: setmntent and endmntent. Both operate on /etc/mtab, which
-  doesn't exist on MacOSX, thus they are simply not called on Darwin.
-
-http://bugs.gentoo.org/show_bug.cgi?id=263841
-
---- misc/ismounted.c	2008-05-05 21:00:01 +0400
-+++ misc/ismounted.c	2008-05-05 21:00:16 +0400
-@@ -86,8 +86,10 @@
- 	if ((f = fopen(mtab_file, "r")) == NULL)
- 		return errno;
- 
-+	#ifndef __APPLE__
-	if ((f = setmntent (mtab_file, "r")) == NULL)
-		return errno;
-+	#endif
- 	if (stat(file, &st_buf) == 0) {
- 		if (S_ISBLK(st_buf.st_mode)) {
- #ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-@@ -177,7 +173,11 @@
- 
- 	retval = 0;
- errout:
-+	#ifdef __APPLE__
-+	fclose (f);
-+	#else
-	endmntent (f);
-+	#endif
- 	return retval;
- }
-