summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/ChangeLog7
-rw-r--r--sys-apps/util-linux/Manifest14
-rw-r--r--sys-apps/util-linux/metadata.xml1
-rw-r--r--sys-apps/util-linux/util-linux-2.18-r1.ebuild7
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild9
5 files changed, 23 insertions, 15 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index b1eb37589c93..f17b31804d28 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.322 2010/10/08 17:29:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.323 2010/11/22 01:04:58 vapier Exp $
+
+ 22 Nov 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.18-r1.ebuild,
+ util-linux-9999.ebuild, metadata.xml:
+ Add USE=cramfs to control cramfs dep (since it implies zlib too) #343081
+ #343095 by Kfir Lavi.
08 Oct 2010; Mike Frysinger <vapier@gentoo.org>
files/util-linux-2.18-slang.patch:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 821875c6a69b..f44769d831d2 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,14 +12,14 @@ DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62
DIST util-linux-ng-2.18-20100706.diff.bz2 58805 RMD160 5b1d645ecf33af652c7be704f213558d5c70202e SHA1 c36d29f27a2ce3f2ec746ae48712ae8ea74af856 SHA256 cde75f181eb998316a7d695da3c93b1894de3cc2b45df2f2c3f21e8b0280b4a4
DIST util-linux-ng-2.18.tar.bz2 7669676 RMD160 4781871a8f86195b886e81d364d41a57d67869e3 SHA1 154db0512caae0b6e90eee4b7312d4caf3d6b978 SHA256 b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
EBUILD util-linux-2.17.2.ebuild 3028 RMD160 bdc2fdd1d3f3ff61b98a74d7e449c11404e6dd4f SHA1 657e44b9e330468a8e1a4a32f772d636813e59e8 SHA256 19f04f2948416d5ce9c598f0bf159e75fd7d70ad1653a35c98b05839d8baeddf
-EBUILD util-linux-2.18-r1.ebuild 3253 RMD160 83af54588e9daafcb38eda85433dfed0cc04e956 SHA1 edecbabfc2ef71fc3e5b64d3ced964eb9479b482 SHA256 45a110c47f5cfdbc896895c06dac6bd8eacf0bfd4a641be263fd923e4d1f7fdd
-EBUILD util-linux-9999.ebuild 3057 RMD160 99092b9db2f5fad5e1d4d7ea5028182a0a5df9df SHA1 d39ae6544a28b9973f69b94321b21b9fd089c049 SHA256 0516d07aed00faee00dcca4ab29e35bc0e87aedf3a25b4e0ca3d5288b5b56295
-MISC ChangeLog 48942 RMD160 8d0cfa40edd074666aadf1a5550cb6c181dee243 SHA1 c77c5b80ec09967566febc2418d622b778c12bcd SHA256 06011b9cb05122e525d3ded7efc422b72421f5cc1b26c5c721f7b28346a1e9c4
-MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
+EBUILD util-linux-2.18-r1.ebuild 3293 RMD160 807f96ec829d7052b644a9d82d02f7026ec37faa SHA1 38b5f5f7cfccfe981374aa4cd5ae153c35341e77 SHA256 f9faf4e7d07e65d6810c63e60294c3bcd8ab51febb8ee55115afe163423f9090
+EBUILD util-linux-9999.ebuild 3095 RMD160 def8168e05bdea1b13f7c1276c893c522bc6b151 SHA1 6d8864caa44b38207e19b92bf39d77448f87adf0 SHA256 87a7b10d2bb423e213b41df4f5fcb59ca2f94b297f6e85dc210291ca1caa61a7
+MISC ChangeLog 49159 RMD160 650c99a664fa46db9488727058d4b049304cadc7 SHA1 1a21f65e8958b1226f8a2647513af0640128dc96 SHA256 fdc1706ff3fe4a9dc359e93c3a629be51e6462c4fb3434ad6fe773634ac1b49d
+MISC metadata.xml 384 RMD160 edc316c85d2496b41a73c9d7f135f3eaa3170a3f SHA1 98e669843d3432322128d58d296c559ec8f3a65c SHA256 bc2d4dcca297085f924ce7f2103e0972817ed3793a1973786d5f6d014f0384fc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iF4EAREIAAYFAkyvVH0ACgkQTwhj9JtAlp6UpgEAuttBCtupU/7zKpGXx2OKc2af
-EDiU49Nmf+nLpxhqF3IA/3wgwMMzVjHLIoRB+2SZIZ9Ztn32uvTiQOiEVHORm8gS
-=G4m2
+iF4EAREIAAYFAkzpwUEACgkQTwhj9JtAlp7yEwEAwCjhpXbiZL3I248XdZeH2L1Z
+s7a7lq6/0L/AdQ6/SIkA/iZk4Gb9BaKj88XulakN8Dk434QIeCWVx1QLqHdfoHcw
+=gjuC
-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 6c7b30308f37..3bce99d96753 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>base-system</herd>
<use>
+ <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
<flag name='loop-aes'>include support for Loop AES encryption</flag>
<flag name='perl'>install the chkdupexe helper script</flag>
</use>
diff --git a/sys-apps/util-linux/util-linux-2.18-r1.ebuild b/sys-apps/util-linux/util-linux-2.18-r1.ebuild
index 693478cf078d..a4cc8a4e46cc 100644
--- a/sys-apps/util-linux/util-linux-2.18-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.18-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-apps/util-linux/util-linux-2.18-r1.ebuild,v 1.2 2010/10/03 20:09:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.18-r1.ebuild,v 1.3 2010/11/22 01:04:58 vapier Exp $
EAPI="2"
@@ -25,13 +25,14 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
RDEPEND="!sys-process/schedutils
!sys-apps/setarch
>=sys-libs/ncurses-5.2-r2
!<sys-libs/e2fsprogs-libs-1.41.8
!<sys-fs/e2fsprogs-1.41.8
+ cramfs? ( sys-libs/zlib )
perl? ( dev-lang/perl )
selinux? ( sys-libs/libselinux )
slang? ( sys-libs/slang )"
@@ -73,7 +74,7 @@ src_configure() {
--enable-fs-paths-extra=/usr/sbin \
$(use_enable nls) \
--enable-agetty \
- --enable-cramfs \
+ $(use_enable cramfs) \
$(use_enable old-linux elvtune) \
--disable-init \
--disable-kill \
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 50e85189d2e7..968e09dcccd3 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.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-apps/util-linux/util-linux-9999.ebuild,v 1.15 2010/07/06 03:53:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.16 2010/11/22 01:04:58 vapier Exp $
EAPI="2"
@@ -19,19 +19,20 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
SRC_URI="mirror://kernel/linux/utils/util-linux-ng/v${PV:0:4}/${MY_P}.tar.bz2
- loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17.1-20100308.diff.bz2 )"
+ loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-ng-2.18-20100706.diff.bz2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
+IUSE="+cramfs crypt loop-aes nls old-linux perl selinux slang uclibc unicode"
RDEPEND="!sys-process/schedutils
!sys-apps/setarch
>=sys-libs/ncurses-5.2-r2
!<sys-libs/e2fsprogs-libs-1.41.8
!<sys-fs/e2fsprogs-1.41.8
+ cramfs? ( sys-libs/zlib )
perl? ( dev-lang/perl )
selinux? ( sys-libs/libselinux )
slang? ( sys-libs/slang )"
@@ -69,7 +70,7 @@ src_configure() {
--enable-fs-paths-extra=/usr/sbin \
$(use_enable nls) \
--enable-agetty \
- --enable-cramfs \
+ $(use_enable cramfs) \
$(use_enable old-linux elvtune) \
--disable-init \
--disable-kill \