diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-03-21 05:22:24 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-03-21 05:22:24 +0000 |
| commit | af2a5ccf72a5acaba8f53c370f449beefe93961c (patch) | |
| tree | 3a9e02e48659685e9da28f9c2a3dd6c99980e42d /sys-fs | |
| parent | Update HOMEPAGE and SRC_URI. (diff) | |
| download | historical-af2a5ccf72a5acaba8f53c370f449beefe93961c.tar.gz historical-af2a5ccf72a5acaba8f53c370f449beefe93961c.tar.bz2 historical-af2a5ccf72a5acaba8f53c370f449beefe93961c.zip | |
Block <udev-init-scripts-10 due to file collision with /lib/udev/rules.d/40-gentoo.rules.
Package-Manager: portage-2.2.0_alpha93/cvs/Linux i686
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/udev/Manifest | 14 | ||||
| -rw-r--r-- | sys-fs/udev/udev-182.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 3 |
4 files changed, 17 insertions, 10 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 21fbbc076af8..13ac3343cc0b 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.664 2012/03/20 15:15:46 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.665 2012/03/21 05:22:24 zmedico Exp $ + + 21 Mar 2012; Zac Medico <zmedico@gentoo.org> udev-182.ebuild, + udev-9999.ebuild: + Block <udev-init-scripts-10 due to file collision with + /lib/udev/rules.d/40-gentoo.rules. 20 Mar 2012; William Hubbs <williamh@gentoo.org> -udev-181.ebuild: remove old version diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index ddc01d76bd6d..d22e0d542bdf 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -131,15 +131,15 @@ EBUILD udev-149.ebuild 16424 RMD160 463967bffcfe474491b5282bf77b8aef249f9b43 SHA EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302 SHA1 1d3a1a2a21e70ef33c1c5d9288bbe02c77abf04a SHA256 953c62eda14481446518c51eb7fb7fbb8dc0fe5a2c335c72aee833f12cb0adaf EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35 EBUILD udev-171-r5.ebuild 15675 RMD160 3773748421c47184353d475517492d32e09cfe20 SHA1 bda04f4010759eae46b311093c23b863032ee360 SHA256 3d93d104eebe0370af1fffcdddf88023a565b388522a3463a68cf54caa689da6 -EBUILD udev-182.ebuild 9869 RMD160 a810cf586bc5d9afac4c44db346f2c188a94b0fe SHA1 2987e582d54d38ee88e09192c81582da302e3078 SHA256 368c4b96f9aa938e1b169a1adeef34178d3bedb8dcc0920cf259a062b00c6b0b -EBUILD udev-9999.ebuild 9907 RMD160 6119056ff728003ac6e2fcd12a9c6a6bdcc78d9f SHA1 2cd56787ecc4ad2b44e391a48bcbbea8efaf5017 SHA256 43cdb355a0c1980b361a1ab484790bf7c3ff1c34fdc19b7586de3cbc08ff669a -MISC ChangeLog 28096 RMD160 115e0ead1d2beb38b5f0450988d53a6f9a2302d8 SHA1 7c2d8594385673cd09354aa1dd0f04ef527ea4c2 SHA256 b2bf8a5c265be4deb9e5a99e8370435b19439f3c099c8b4d1819be8a4804011b +EBUILD udev-182.ebuild 9898 RMD160 11443089a757b0dc0e359bbc6397eb5f32419304 SHA1 f0b6a88b587134468036b68cf9784f0d8abd8712 SHA256 a5dca41617d42e8bef18ebefc1a81bf23bc0a77853a7d8f786ef3f54441586b8 +EBUILD udev-9999.ebuild 9936 RMD160 3fe898de1734e7f2ecab66c8ac588e8049bb7e0d SHA1 894b1bd173d6a7eea839cd3fde924b5b6c6ecf4b SHA256 1054233d2aeb7d6b73b530018bf5c0780a629c66e71cd40eaf88871ea49dba3c +MISC ChangeLog 28274 RMD160 018b8ccce754271512b8606e89fbdbfafd41fa92 SHA1 fe39b57d11ac4256d83abddc6b3d18cab73ebb50 SHA256 42bda26c19d410e5a2a826b5592b7704e4e53abed6ed6dd2c4c3c8e65be74589 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c MISC metadata.xml 1296 RMD160 d6c93ed6c8ba4c4b6c0598a419778cf4054a187f SHA1 16c4880aa1f705801b6be54001915743e8f6fffd SHA256 57326d475c8c692a17013fb03701b9e63c8e0535fc3d838a725431111c0529fc -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk9ony8ACgkQblQW9DDEZTj/TwCfVxnlt6UfMHStnuUzABjRyKSm -Oq4AnjGB/1ojrWSY/8u/iCOONFFWRK4a -=iFvG +iEYEARECAAYFAk9pZZYACgkQ/ejvha5XGaNqIgCfZ02JFk1mIXpSICQq5YU54dwJ +bp8AoJmYEK1YUWo069tJmaHVmqHt5SWb +=Jrst -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-182.ebuild b/sys-fs/udev/udev-182.ebuild index b5d1553024ab..79f1e90828ee 100644 --- a/sys-fs/udev/udev-182.ebuild +++ b/sys-fs/udev/udev-182.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-fs/udev/udev-182.ebuild,v 1.4 2012/03/20 06:20:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-182.ebuild,v 1.5 2012/03/21 05:22:24 zmedico Exp $ EAPI=4 @@ -64,6 +64,7 @@ RDEPEND="${COMMON_DEPEND} ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) + !<sys-fs/udev-init-scripts-10 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 2246e38b2d8a..3bc497795df6 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-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-fs/udev/udev-9999.ebuild,v 1.86 2012/03/20 06:20:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.87 2012/03/21 05:22:24 zmedico Exp $ EAPI=4 @@ -64,6 +64,7 @@ RDEPEND="${COMMON_DEPEND} ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) + !<sys-fs/udev-init-scripts-10 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper |