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

3 files changed, 21 insertions, 11 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index cb5ce2d3860a..1476ec1ac952 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.71 2011/11/09 04:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.72 2011/12/07 16:50:09 vapier Exp $
+
+*e2fsprogs-libs-1.42 (07 Dec 2011)
+
+  07 Dec 2011; Mike Frysinger <vapier@gentoo.org>
+  -e2fsprogs-libs-1.42_pre0702.ebuild, +e2fsprogs-libs-1.42.ebuild:
+  Bump to final 1.42 release #392637 by Christian Inci. Add half-assed
+  USE=static-libs support #377537 by Agostino Sarubbo.
 
   09 Nov 2011; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.41.7.ebuild,
   e2fsprogs-libs-1.41.12.ebuild, e2fsprogs-libs-1.41.14.ebuild,
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 4d9bf1db4c74..681c04981dd7 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST e2fsprogs-libs-1.41.12.tar.gz 490781 RMD160 f44ad14cc6787a6353111967cbb445bada805598 SHA1 6af0664190f46d5b93889d1e54c386f3c21ad271 SHA256 2f2dfc223c3ccaf7064abf13b692561fdc103fa5fbeea895253fe169b6598d2b
 DIST e2fsprogs-libs-1.41.14.tar.gz 489703 RMD160 7bdbe03f21a8ac58179fc98083c7e07d8e37708b SHA1 9182ca542c5368d3e1df1a70040f28006771e240 SHA256 dbc7a138a3218d9b80a0626b5b692d76934d6746d8cbb762751be33785d8d9f5
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 RMD160 e6ba0e313e3edd1a5c001b799c0826bc75c61ae6 SHA1 0863c9291385c42eefe7cfe6787a30af62a7cace SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84
-DIST e2fsprogs-libs-1.42-WIP-0702.tar.gz 502022 RMD160 0f877a83b820b936ac4a156444302b805357b1aa SHA1 8a7bcd9ab939076fb5cb4c64ed45f539a56dddeb SHA256 76cd42684e7b65d663445b71eda32ed3d7e8baaf53c6c34fcb7c0d9ada9f9316
+DIST e2fsprogs-libs-1.42.tar.gz 512745 RMD160 425306efda913b39e2eabb3165808562d35ca4e9 SHA1 5a18043c4933eb1eae9cb316ee47b89ad59c3875 SHA256 21ab3a769988bba04c11a028b767b048a0a4c37a4b20b1991175f7c7276006b4
 EBUILD e2fsprogs-libs-1.41.12.ebuild 1410 RMD160 3127b24da1eaf5b0d4cdcc4e5f76bd8d0df55949 SHA1 65666bbbc045055a2761b8378679e7e44f71a66e SHA256 a49dae7b107f283a2ca86c5ef1c128ef58112df9fd72189f0cb93cf161f7fe48
 EBUILD e2fsprogs-libs-1.41.14.ebuild 1410 RMD160 b09694c807feffc742743639173aeb82bf8bc2da SHA1 e0177b09fa0d5a67cb0152cb6341513c307e1e6a SHA256 eca0aa69f07fbbcf70214404b1ac2cec8441a5bc4b1f0e49051aa1e4a1788eab
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1367 RMD160 919be438bd5bb058a9c2e92126bfea159a79083c SHA1 b7b1ee88ebdb32220d590a2eafc0459630468bf3 SHA256 3597db10756cc4c74e2674f2be773c907f6afbe86aed96221dad9f3ebfde937a
-EBUILD e2fsprogs-libs-1.42_pre0702.ebuild 1551 RMD160 793d4deafd2063dc9986d978e86d1dc32511fa73 SHA1 05691a74ef4645b8edd9c2e75348842e359a7464 SHA256 e0f653015ac33850eab42127d717570084fa2bbf0d1db708306af15eb1a0c4e3
-MISC ChangeLog 10027 RMD160 4feeae40ac0cb44c7a5f53472b22ab1a273eab9c SHA1 054bc516a954d44dbb945d8c8f1cf888d2fe6c10 SHA256 c12fd4f11ea70a6567545124468afe70f06760227a4618d8db0ab3692dd04e3c
+EBUILD e2fsprogs-libs-1.42.ebuild 1672 RMD160 32414e30006a02b9849619466b6337d2d2cf1510 SHA1 4b8b97e1728b5d53a60617fe42cefb7c474a48c5 SHA256 4067f588fea09e8f0029aac13accde2e3bdd97baab78fd734076ca3ad4785a95
+MISC ChangeLog 10308 RMD160 3643cb3652e4ae94d5ec1795b566213a8941fd1b SHA1 e45e18441d66c2b1e506f319707bb4a0c8807f4a SHA256 3b64ce48689f89086a7fd71fe0d2b8c32225c04b71831d636cf7eeb32bb851d0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk66D/EACgkQaC/OocHi7JY9UQD/bQ/z2HbZAnKs+gl0SE4b9MPF
-tOvJqVUo0fJCukunMRUA/ArYaWg6bXtfqPrdhb4wjycTdYz9/esy+/dp5+aUmVEq
-=vCOK
+iF4EAREIAAYFAk7fmUsACgkQaC/OocHi7Ja3pwD+Oad2Tuync6lyk59jNIuQcTyw
+sJL9+Bf3yVC6DuRJzf8BAI0bzLvBDDLPbYewQzTJOCniCB4SEUM2zJncuV/0sg6n
+=7DUF
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
index e11067612d59..085f3d504144 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-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-libs/e2fsprogs-libs/e2fsprogs-libs-1.42_pre0702.ebuild,v 1.2 2011/11/09 04:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.1 2011/12/07 16:50:09 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"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls"
+IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
@@ -45,9 +45,10 @@ src_configure() {
 	ac_cv_lib_uuid_uuid_generate=yes \
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
 	econf \
-		--disable-libblkid \
-		--disable-libuuid \
+		--disable-lib{blkid,uuid} \
+		--disable-quota \
 		--enable-${libtype}-shlibs \
 		$(tc-has-tls || echo --disable-tls) \
 		$(use_enable nls)
@@ -56,4 +57,6 @@ src_configure() {
 src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
+	# configure doesn't have an option to disable static libs :/
+	find "${D}" -name '*.a' -delete
 }