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

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

5 files changed, 65 insertions, 69 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/Manifest b/sys-fs/e2fsprogs/Manifest
index 38d8932c668b..e3c8f04eecdb 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -8,7 +8,7 @@ AUX e2fsprogs-1.40-fbsd.patch 352 RMD160 2d3f0979522a29bdf5aae1af9c73b33e76b02f2
 AUX e2fsprogs-1.41-mint.patch 39366 RMD160 c2b42e8d5d40e6444f415c5b0ed8de96feb2f3d8 SHA1 4355418c5162230fa6039104514b5f609215be36 SHA256 5a0027d6897cbe025ea393daac8e2ad9f5e887e2a1a22409f31e663edc6c4976
 AUX e2fsprogs-1.41.12-darwin-makefile.patch 3546 RMD160 6e369f8b31166a9681b2b86e3599e1c6b43aea16 SHA1 60fdfb2d93255438e0e34fc46e88c787b065b530 SHA256 b12fec2f960dc610ff3cd88f57edea5f6dbc8623ad2684b76731a6b0f828c3da
 AUX e2fsprogs-1.41.12-darwin-no-mntent.patch 776 RMD160 0e6b2a4e6919630b2f2adb11a45e48cc2fba6b7a SHA1 4ce06fbe8e3f33040e9d41503d581508cda850f1 SHA256 91e59f9790be59c73a461f5589add4498218d026fb81d4546b4e8b9b96569c78
-AUX e2fsprogs-1.41.4-darwin-no-mntent.patch 825 RMD160 e7b12579cf145a543645eba0638dadc94a0546f3 SHA1 3d3a6e502c7a049360e10762465c6f3facde023d SHA256 846eebf4a78cb017bb6339ae419aa0b3bd5c1b260e1175b9b5521ecf9bc5bef7
+AUX e2fsprogs-1.41.12-getpagesize.patch 1273 RMD160 f0209df76490dfd121387d9e232a178ebe609271 SHA1 dab97753ed07244893ad2d643c6935def2bff60e SHA256 bfd86a4266cd8fb495bcda8857e85f07e30083928f7ca0cbd69d8d0522339021
 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
@@ -18,15 +18,15 @@ DIST e2fsprogs-1.41.11.tar.gz 4472354 RMD160 1190540e1df3b873faf2179ce8cbc618a91
 DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
 EBUILD e2fsprogs-1.41.11.ebuild 3899 RMD160 129ae8c958065444e0e88e0a5763ae23fd5b42e6 SHA1 719e947c09de398b7224466d88927a4f52fb7af0 SHA256 549b1b8b45f4fb8522eeb48c7ce49d8252f09ad1cd2a70e0e13c686b54672729
-EBUILD e2fsprogs-1.41.12-r1.ebuild 5056 RMD160 1718c9f92f6652941559aba4b52b4341eb9baab8 SHA1 9746fff26ac5a36a69c5afc8fe42c7e70585648a SHA256 0ef60d59dfb0dc069e75bcfbdb2062b2ff5e3d3802acce4001af83229b19644b
+EBUILD e2fsprogs-1.41.12-r1.ebuild 4638 RMD160 cf526c53f70021f6dc202ba5b722cefbc342c376 SHA1 85bf75179a91373e29fee30d1afcb254c9beb86b SHA256 db12836574a844bc767f9a0d16bde853caf7c3699f348ff1606bef8a0d294dc3
 EBUILD e2fsprogs-1.41.12.ebuild 3900 RMD160 a275d276a051a0498055b2ee6c4833e7dfa3f79c SHA1 f0bff43ac6e5e1369ab0dbb14fcb798ffa68a7b8 SHA256 2c6fca4ab9cd9d2d8341a470c58d470af0ee82367ddc649b50d9ff4c2a6f94dd
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
-MISC ChangeLog 33312 RMD160 932505a6b9fe1d8e0a733d3503a82d16065bd6e2 SHA1 d8ade7ae6e919d620384f87122e4263cf871e298 SHA256 1736e5de7a46b41e71724bfdfda722f086aad6490916b8e7902827bbc56f8ead
+MISC ChangeLog 33482 RMD160 b1f59c91f8d2e9d4fa65a97de6f9b3de778ac133 SHA1 4d0aa9253093b1edf813d3e515d8f2bffb1d8248 SHA256 529d6b8384ce1a5c81aa93b6703e4e96be296c359499c730891aaeed247d9adb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzmxqQACgkQgAnW8HDreRZ+kQCffVOukmbAwQWOKVxGtwC7xdwE
-FAIAoI0l9Tm5QMIYoHPo0s0bIGirUDqb
-=GQ/A
+iF4EAREIAAYFAkz6v4UACgkQTwhj9JtAlp7+mgEAtQKGM0CKll4/3v/MB1hNexmY
+urZd9kSR9YVP92VkQCUA/3yYyvsZuYytQ7YLtxto3U/cEkBlV1dCFfv62ANrQsrD
+=kcp2
 -----END PGP SIGNATURE-----
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;
- }
-