Update mint blkid patch, bug #350342 by Alan Hourihane

Package-Manager: portage-2.2.01.17555-prefix/cvs/Darwin powerpc

5 files changed, 60 insertions, 21 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 1fe3effcb1ab..2346d8dd986e 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.230 2010/12/29 08:15:18 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.231 2011/01/03 21:18:58 grobian Exp $
+
+  03 Jan 2011; Fabian Groffen <grobian@gentoo.org>
+  e2fsprogs-1.41.12-r1.ebuild, +files/e2fsprogs-1.41.12-mint-blkid.patch,
+  e2fsprogs-1.41.14.ebuild:
+  Update mint blkid patch, bug #350342 by Alan Hourihane
 
 *e2fsprogs-1.41.14 (29 Dec 2010)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index eff5c342732b..a515fb65932d 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,6 +1,3 @@
------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
@@ -8,6 +5,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 3967 RMD160 a59f721b677dcfb89f29df2b8b77c54112829dde SHA1 0bea4c00a74f46fc55529cdc4f51e74371bd2733 SHA256 d1b5718b965ff1e9be820082827b2685efd3a4d3dac16e41b283647f790ec5b0
 AUX e2fsprogs-1.41.12-getpagesize.patch 1273 RMD160 f0209df76490dfd121387d9e232a178ebe609271 SHA1 dab97753ed07244893ad2d643c6935def2bff60e SHA256 bfd86a4266cd8fb495bcda8857e85f07e30083928f7ca0cbd69d8d0522339021
+AUX e2fsprogs-1.41.12-mint-blkid.patch 1522 RMD160 735bc1f2fd604042589b7d521f0af842c7b2399a SHA1 8f3600fea0753319b30af980e28fb32c81e5d790 SHA256 158c94152e81e065499fbd365a5915b54eabd2a5789440360259104de37cef60
 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
@@ -16,16 +14,9 @@ AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c002
 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
-EBUILD e2fsprogs-1.41.12-r1.ebuild 4302 RMD160 d5e61d2a5976a785e066b00725979bdb7635401c SHA1 dad179011fa16246589240716d4dd05110b4c4af SHA256 efa79ce8086b5ea5607a71a3e720de685b1c49989b16c1679dddd8759e730370
+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 4307 RMD160 003e104aedc34fa109265dccc1a2285bbfd43d86 SHA1 8c84ed8b8c47875a732e83d7b89dfa728badb8c6 SHA256 be5e301edd48bd4b74b3e1e2d939f570d5f472f78272a15687e1b5de0610848a
+EBUILD e2fsprogs-1.41.14.ebuild 4309 RMD160 70efb18356cf061cf4be38ef663459973c6c6fbc SHA1 27e207a40765ec7c495c317b9429ef17007e178a SHA256 bf677691fcd9a134661a6921967c9a40c790019d1a33a90c03a8e2f077f2a7e4
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
-MISC ChangeLog 34104 RMD160 748a0864daba130e733ab18d51d710256761c1a7 SHA1 179d8bc9e61f46c2caec5b5e2fbefe07349657dc SHA256 2fce00022e2b26fb1c053ce623258941d127a7fa9da39f19572603bb075f5b64
+MISC ChangeLog 34316 RMD160 1d588debccfa7e698b8d1296919b41040148fbfb SHA1 acb2f377aefc7180e4333a0c90ce58672c6a72ef SHA256 a63546c9a79a0b9c55e7c0a928e17c65a3c5763a8ccb427f3eaae4c050501f67
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAk0a7g4ACgkQaC/OocHi7JbyMQD/fEKK8uGu7uYLWKHo0dow1Nh7
-Pbalcc5O7NEE+VkDoU0A/3hAXnUVJMZXuVr6Ota4p1lJS+BmdMEK0uSQCTkUhTQB
-=mjHY
------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 73635ff82057..d9da330fafc0 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
+# 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.41.12-r1.ebuild,v 1.4 2010/12/05 14:46:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.5 2011/01/03 21:18:58 grobian Exp $
 
 EAPI="3"
 
@@ -43,7 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-darwin-makefile.patch
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.7-mint-blkid.patch
+		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
 	fi
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
index fc5314602388..53a5d455df9d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.41.14.ebuild,v 1.1 2010/12/29 08:15:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild,v 1.2 2011/01/03 21:18:58 grobian Exp $
 
 EAPI="3"
 
@@ -43,7 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
 	if [[ ${CHOST} == *-mint* ]] ; then
 		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.7-mint-blkid.patch
+		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
 	fi
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch
new file mode 100644
index 000000000000..886ece5b7199
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-mint-blkid.patch
@@ -0,0 +1,43 @@
+http://bugs.gentoo.org/276055
+
+<alanh@fairlite.co.uk>:
+The configure test program links against libblkid to test. This works
+fine on shared library systems as libblkid automatically depends on
+libuuid. But on static systems it needs explicit linking.
+
+
+--- configure.in
++++ configure.in
+@@ -398,8 +398,8 @@
+ 	fi
+ 
+ 	AC_CHECK_LIB(blkid, blkid_get_cache,
+-		[LIBBLKID=`$PKG_CONFIG --libs blkid`;
+-		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
++		[LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
++		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`],
+ 		[AC_MSG_ERROR([external blkid library not found])],
+ 		[$LIBBLKID])
+ 	BLKID_CMT=#
+--- configure.old	2011-01-01 14:20:07.000000000 +0000
++++ configure	2011-01-01 14:22:01.000000000 +0000
+@@ -5228,7 +5228,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lblkid $LIBBLKID $LIBS"
++LIBS="-lblkid -luuid $LIBBLKID $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -5259,8 +5259,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
+ $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
+ if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then :
+-  LIBBLKID=`$PKG_CONFIG --libs blkid`;
+-		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
++  LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
++                 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`
+ else
+   as_fn_error "external blkid library not found" "$LINENO" 5
+ fi