summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-05 18:38:40 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-05 18:38:40 +0000
commit4422695f932db152f44bff4f78e7c961710ff9c7 (patch)
treef942c0bf6d3e7eaf9906c319fc265f0bfc9503d3 /sys-apps/util-linux
parentRevision bump adds patch which fixes typo in localized string by Jeff 'jeffer... (diff)
downloadhistorical-4422695f932db152f44bff4f78e7c961710ff9c7.tar.gz
historical-4422695f932db152f44bff4f78e7c961710ff9c7.tar.bz2
historical-4422695f932db152f44bff4f78e7c961710ff9c7.zip
Block the eject package now that util-linux includes it.
Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/util-linux')
-rw-r--r--sys-apps/util-linux/ChangeLog5
-rw-r--r--sys-apps/util-linux/Manifest30
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild3
3 files changed, 21 insertions, 17 deletions
diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 5fedbf092136..3c396f21d01a 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/util-linux
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.376 2012/03/30 20:31:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.377 2012/04/05 18:38:40 vapier Exp $
+
+ 05 Apr 2012; Mike Frysinger <vapier@gentoo.org> util-linux-9999.ebuild:
+ Block the eject package now that util-linux includes it.
30 Mar 2012; Mike Frysinger <vapier@gentoo.org> util-linux-2.21.ebuild,
util-linux-2.21.1.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 2e7c8b7e699b..677d0eb453d2 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -23,23 +23,23 @@ EBUILD util-linux-2.20.1-r2.ebuild 3679 RMD160 13ce8cc23225aba2a484058d53866b014
EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
EBUILD util-linux-2.21.1.ebuild 3413 RMD160 e96f52860e1770eb3fd951d777ec85abc87933d1 SHA1 b85abd402335d23dbdbc7d4dd68cecb1a77ee3e9 SHA256 1dbbc9714b73c0d6366ad65597f78bcada8b9e86fd70d3d00f00f4b789c97472
EBUILD util-linux-2.21.ebuild 3608 RMD160 8f40b519ec0a7bc5d95d00f71dc7042d99614947 SHA1 fa91be772698974568e3a7d9ec7ff873c9f829c2 SHA256 aec386a2c0a8acf1e5ed3ebb2de308bcb384d8df58c0971c431880fd8aa37225
-EBUILD util-linux-9999.ebuild 3412 RMD160 7c490b30962ff82c9f55144106222ce72be1d7d2 SHA1 0e7b8c482787a424b0853c5dc8cd20606b123853 SHA256 684a2d6929ba190d3711bdd406ad007e06152461aee2f9528f978ca9e537e835
-MISC ChangeLog 57786 RMD160 42ee9b1452891529619f65f9745e97afa85ea44b SHA1 4a22fdd4cecc97b9f97a18da0a43a2eb909d4047 SHA256 21e73639ae11825e0c4f4c398cf54958c21240efc4193621a75fee0e6c5a7a33
+EBUILD util-linux-9999.ebuild 3430 RMD160 37f8eda1a440d74ce354605974c74bc0902b3b36 SHA1 088a3e73987440687655584cac9c8334bdf5c46c SHA256 fb23e215463c27234e3b6e9a9c8355b46a83cba24b06d6c760e13e4ef26a7a32
+MISC ChangeLog 57920 RMD160 ace6c9410f73e73abeba7654b38a2248a34c29ba SHA1 452485a95ad4e240ac3fb589a8f7e52af2ab9166 SHA256 4ce4f81923a9fec59cc7b28f7cbc0d6ab223cbd01cabfd01f10077ac8802fafa
MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBAgAGBQJPdhg5AAoJELEHsLL7fEFWGUkP/369SSI8e4nOrSEJthvDIE3Q
-DgStffV8zoAwrN4FuI1hqKju2F92CoYheXwuZ/Mo9a2yDuMGNX/EuwEAGlzNwC3J
-O1cd/D2Sp0zr6d1K1SRDk2jw88LN3wqb0txp4fQN2QmdRYgEuToSR3q/5wKf3Por
-s7IiChXdfWZnlbQao4+vGythO/iczNvzFFz5hqK6tkyUaeZDV4AavR+vjLMHh5DC
-5ZcMQIGIZ/ouTJ7QsgJtSwRbFT2F0XeuS0OoZ8EhP+3pRWe1JIUefO2dLz9CEvYB
-XNIbcAAor4weFP4uKF7DE7D00M8rKJq4Dn4H2W06p0VqMDXLMOyg/mSBOlh9iFGi
-w0/iGXWPdlTSU8qg6VJcfbwALAE9fakVtFUzofCkfRaT6FpOsFXq2WSR5E4+g2Sj
-pRLur5UexqShRIGxHBniwAFXxcRBa7jA4HNdI8V93VqeoncomzV6Xb25l9hWPHeR
-+b7qJuvv1WQrkNZ7v0mVchpbbf1to19x6WoiFNCBQUn9m7V4MCJYJ8HBdJ+3R4Z+
-QyvcnzIoL5KSvzhcogTWlrTBMv1cOmSwgvUTwFrmodYRpbJUZ+IxOjQp+nC3ndRe
-57iLkI7IX4MtCO0kysw8XUcnGcu9O9ibmT5P+wMDhFlbvJjvDPaHVy29Gjy7Zeh4
-4wcshxIKg9aB07kGJc3A
-=+jpS
+iQIcBAEBAgAGBQJPfebTAAoJELEHsLL7fEFWn4oP/0pZxJQdlNDi5FyVuXddVs2o
+hwrWVl3MoqyHBhSql/Tc72N7BZOU15rcLW60HgQz0OUZcChZFjCND+RvqBGh5uJ+
+MuLKeHApVAE96Eo4ZIOIw7hbBiveTNnm4MHH48QuoAcZqa1ZudgUmbW38HbdsKZP
+ze/lbu3FCv1h0y+JU3BYIM/Kxg5OfeRZQrUwvwg+EOH4WCQGAeDVSW6VSzUhHFUT
+T8qJsD8yHSjigkxURtd7GUqRmTblDldPVl/pkuL5rKXBKjvkSJ6Qc6UvKJPveeZk
+NyPKc/X8/JamSGPJ/0kjy19CsQWcpTEP/eLX5kDeH7Wjj1weO+5gWQXSmhGPIsqz
+O/pxUNRzzGPtyHUgxS7jTs8mNgTMwam5D6mPjSIXPRNHZJSv0HRz/AkkpQBMfQ2z
+jLhmJrjNX1YC5fdy0SHlHVIvkfUC7ssK+Fh0q03/jZT9WuGOtq+EzxFdu3l7mb1P
+WMolmzcVVrAXiR5EY0NAe/i9Vhxdes1yzxuzNKlNpnrPdrskfjqTqr0VUBTcM13r
+w2GlKcmXdWcLv1r9UihyVCcdXO7chify9bMkUcs4AH3SfdfWg3C9rFx7LF8AcnMe
++CC0MZAA6FMolPeKNZ6dzo8rSlo2PZnWr2iY7YwWdLpar3dOGoon3uYH6bbDzrAV
+NAKFZSLcJhwNdyvVMFCN
+=3rgu
-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 131fcd1b8f96..4c84362490c8 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-2012 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.28 2012/02/24 16:35:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.29 2012/04/05 18:38:40 vapier Exp $
EAPI="3"
@@ -30,6 +30,7 @@ IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang stat
RDEPEND="!sys-process/schedutils
!sys-apps/setarch
!<sys-apps/sysvinit-2.88-r3
+ !sys-block/eject
!<sys-libs/e2fsprogs-libs-1.41.8
!<sys-fs/e2fsprogs-1.41.8
cramfs? ( sys-libs/zlib )