From ccd7d96c5a2e146e8f346559c44cb580c9aa3b96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 18 Nov 2014 19:25:41 +0000 Subject: [PATCH] Add blockers on eudev & udev due to file collisions. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- sys-apps/gentoo-systemd-integration/ChangeLog | 6 ++++- sys-apps/gentoo-systemd-integration/Manifest | 24 ++++++++++++++----- .../gentoo-systemd-integration-4.ebuild | 8 +++---- .../gentoo-systemd-integration-9999.ebuild | 8 +++---- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/sys-apps/gentoo-systemd-integration/ChangeLog b/sys-apps/gentoo-systemd-integration/ChangeLog index 7856d7d2450f..5a610a4abe05 100644 --- a/sys-apps/gentoo-systemd-integration/ChangeLog +++ b/sys-apps/gentoo-systemd-integration/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/gentoo-systemd-integration # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.30 2014/08/20 12:24:38 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.31 2014/11/18 19:25:39 mgorny Exp $ + + 18 Nov 2014; Michał Górny + gentoo-systemd-integration-4.ebuild, gentoo-systemd-integration-9999.ebuild: + Add blockers on eudev & udev due to file collisions. 20 Aug 2014; Raúl Porcel gentoo-systemd-integration-4.ebuild: diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest index 985c0cdca5d6..713f42594812 100644 --- a/sys-apps/gentoo-systemd-integration/Manifest +++ b/sys-apps/gentoo-systemd-integration/Manifest @@ -4,14 +4,26 @@ Hash: SHA256 DIST gentoo-systemd-integration-2.tar.bz2 51951 SHA256 2466a11d9b6f6e8d726cb5549bc1c38d28d6742d596e2b2c455c9089c1baf7fd SHA512 dc962165516612ca0ff41fdbd53a420549967a3952640ae7d37aafdbb3543a9b37a928e0528fcbbce74e0ded970e311c350272856fc8a75d9c8dc94a960e3bbc WHIRLPOOL 0517b515b9d01605c46d95fc3e86bf38c200923e3b7df1dde59b875c3eeef232c7dec38833007a943390631cb8eeb4f7c89e79c4b8dab737eea8c63bb36341bf DIST gentoo-systemd-integration-4.tar.bz2 52449 SHA256 7027bd2056449e5ec8f9fc3da81c0f157810d482bfa11be48903643335fc6bde SHA512 2f60a98062fc5b9c7247e5df77b8875e532d28b2b903a2770713bbcfb2706f0f1bd7809396dd49ff1cc41f69d8c3dceaef87909fa8683c458a5f818f5e05a574 WHIRLPOOL f87b8aa01f24fad4ff90e694fa03b718425bbb0c0dc8a00950b0ae81230f3b92255d07efc9161707a35c8f3e0e7664c57b7ae061ccc0d896bfc55a632a8b4f09 EBUILD gentoo-systemd-integration-2.ebuild 827 SHA256 d26644c5b2c1cbffa405e6f3fdf3366930f2f8fb15dd8ba071c3fe79b5a3dd7f SHA512 0cfd92cd78b16cac85ab3cd3f6e72542b20f7aa320ee563b6e46a475bdd5bfa5960a1d8d06ff8082092ceade2bbd128d6f7963e64cb9f43940d0d1f1b5c2b797 WHIRLPOOL 21b26b5cbee7795d604238d5e785fe40272a61b2f83670fb8118e6cf569fcc34361e8ea9ec57b29a58bbdb46c436cb604a06abae05556d394bc80def6c9dd64c -EBUILD gentoo-systemd-integration-4.ebuild 862 SHA256 d6d82d8883ecb8ba2dd0c609a155f1705f98e48a5c65cd1a00fa8951b3e24abd SHA512 009f32820a732b62bc5f0403ff1b7cf1cc7eac8671c647fa47a48fa18fcc2231683793d89322f4ad28103a2617bbda8832db9422bfa6b1181165de22d6cb03bd WHIRLPOOL 4e05ee336a7b149d278c410b86404c3a5370d6c14273b292a7f7ca935dfc9e9d946174737c30f928c2479bb6fc9a395eb5feebc2368b69bef1956228cfdc9ecd -EBUILD gentoo-systemd-integration-9999.ebuild 1056 SHA256 7524639d6c5a1ffc6e518ee0adc9743aa25b37f324a367533716a781679fc1e6 SHA512 61b1864f88d651a2dc8a6d218d525e140b95364e0b000553d86ef950edb0c02dbeb7c2dead743367fb2e0f0f59b9eff89c429ac9a74891e886c73de09c943502 WHIRLPOOL bde009e972f176bc304dfd832fce850013526f2bc0fbea542001926af11008224d9e2f9f3a5fec9462460a8a53393853852b676009032463fe5284dbc68c5016 -MISC ChangeLog 4819 SHA256 4bdfc80fbd381708c7e37956c1055b49c38411ac275d891d12a0d64509b59e49 SHA512 e1a0fa4449d13930a694afba840d54fd4163ccf8acaf00bb34a83cfa315580416d38f2f23b4e8e82bb42d96b11dd0db1e8be9595dac9505ce110a056ad81d513 WHIRLPOOL 203b7fd37d4c19f2319aacb7826554784b8e907e3e2562bed20df93284e6ed7324cb5d019d30eb5ce6b35e6d5b2c465b5202f32fb889e58bfd7eb5e0dd22c977 +EBUILD gentoo-systemd-integration-4.ebuild 858 SHA256 bcbe8e40e991a6d799f85d281036a83f3dfce30d9c6f6e174085c5c27c0f7dc7 SHA512 2ce8c213336f07e4bb27048172bcf9000c446fcab598c96f51d7dc23eb2f95f77a1518ae9ac08dd0394740c36cb207180e8c3451bae456151848d56a96633589 WHIRLPOOL 81f2baf6db10a8951e0833a0da27cfd488f06f1853eacc1d5ca58a25e2a0ccea0329fd3226fcce5c08c7a6234b98fffffc5f6068be90931f9544aa7b240d7d20 +EBUILD gentoo-systemd-integration-9999.ebuild 1052 SHA256 a178f6c8c39f424f3ef1cea5aa61278f382f7c1cd873f5e7a0df7fd654f284b9 SHA512 998bf2644fd678a6584b938cfa9430acfb191906b873e632506916d21d2da930a366c2221d80939f220dae5ff72b1edfdaf1186e0d23584ae681ada4f9f737fa WHIRLPOOL 14cd31ab6daf0c9fb8b639ff3419ea5188407a534f677e54dae6d6c9611b963ecbd21f91218fc90b0675e1e7249061e41689fd08bd385018837ed3ac11891b4a +MISC ChangeLog 5003 SHA256 910363aa0554f16affb11f62889e147ab5dabc747ad46366d650235f194631fa SHA512 5a45d443233c90d7ceae64f3d2af3843a31909dd0405bb23689f4f604db3d469534be7879e395c49017a10a68d3b6cfcc79c3e3a984846eb826883b9c67d930a WHIRLPOOL 6f3382e8a7dcef021987f708688fb7f9eeb2f55db19f3fd8248e6b9b237ca9328a1c87668deb7320fc7e5bb1130c84de3d6dcdb5dd688571562c6615b950b660 MISC metadata.xml 239 SHA256 1731c6552b4584e3ca0d760cb9504233311f18bdd2804cebfc06feb2f60b042b SHA512 3e96d13285d9cb02333157714e2d367beb695bb64cd1738bb4af9f284b7cea33c4d6be69a43b4ba559cc95d165cc007f37a3d3df10c4b0fc9bd6b08e42561ea1 WHIRLPOOL 1a0d71075be6a89d3b0cebff7e7bd474ab71b08d79302cbfc38a33e67cbb6d31d553d18b17993698bebd9fc6c29803be7aff3bffb0f1521022bc5a3c1c8723dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlP0k4UACgkQuQc30/atMkBuygCfcuB/tn6A+4ABfAHgIruwBdX2 -PRAAn0e+mipYpct0nhkU6rMYYYqFZQD4 -=Htn/ +iQJ8BAEBCABmBQJUa501XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOCYUP/jRYD8xZ6QqZghT5evyMlT/r +NLVxZl4Mnj3BiAgSTKGQ4Ww7RDT5NSi/osi8OEdFY6ks5sZc3NDS2oWQgO7hC3GZ +p4tCVUM6aApn8ajA3qQjdx0PN3tqGvwORe2me2/4AOIBwAobRluNjY6BqvYNN9YW +d5/Iw5m5DazazCk+33YeElB8p6WM8BaQHeIGKby7tp6Ur8bwn8B6SOJAHD3MBkXK +55YudUGFh1uZBNcy2i1twMGpVWXo75mjiGJxXgM1dEw3LIvnXxRM7Ho5ugTh3QyC +nJN+d55MnzohulPS/iqW47roOIaHxh8JzVGixcqBBMD8sdnZ09FA72vl+mTEX49Z +QqYlQd7dkxmmol0v1ob1J+T5A8LKeZ/B4PFT1NjwtuJc5HJjnBP96klHoy1EBkwF +xqCvhDPqwbkoj/9RZUtzeOxYBZ4+tkG0/59N18iMYY58dCoFfv/uVJKoOBS8ilen +r7Bz3SlbBuiczql2qgxU8HcbzkYbdjsRIOGFnaTD2p2r8KeLuVtfPQf4Lok+hE8f +bC5KGLU8gCtDjbGgqJ998L7+Mh/VtVziOCa/9Fb4xEuhOotY8vTLeEkVrOAVQOzu +tK9t6jWYaxvehsedDlslOPAR44w5RpZPv0STYWN5TRMJ2eOW1gxY4nHS7hqck4yn +J5KO790hpEUhKEL3DUGX +=Da76 -----END PGP SIGNATURE----- diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild index 70b530530d36..c6de56774d99 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v 1.9 2014/08/20 12:24:38 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild,v 1.10 2014/11/18 19:25:39 mgorny Exp $ EAPI=5 @@ -15,9 +15,9 @@ SLOT="0" KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86" IUSE="" -DEPEND="!sys-fs/udev" -RDEPEND="${DEPEND} - >=sys-apps/systemd-207" +RDEPEND=">=sys-apps/systemd-207 + !sys-fs/eudev + !sys-fs/udev" src_configure() { local myeconfargs=( diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild index 9b38aa5c44c8..de0cd9d8cd29 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v 1.8 2014/07/06 13:23:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v 1.9 2014/11/18 19:25:39 mgorny Exp $ EAPI=5 @@ -21,9 +21,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" -DEPEND="!sys-fs/udev" -RDEPEND="${DEPEND} - >=sys-apps/systemd-207" +RDEPEND=">=sys-apps/systemd-207 + !sys-fs/eudev + !sys-fs/udev" #if LIVE SRC_URI= -- 2.26.2