diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-08-04 06:58:45 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-08-04 06:58:45 +0000 |
commit | dcf75f5f3011e4e20a9ff66ad34e836eed7a7011 (patch) | |
tree | ba05ac1a814b0a5c04f3239c86ced6a1c5c9cd2b /virtual | |
parent | actually use the new $QEMU_BINFMT_FLAGS (diff) | |
download | historical-dcf75f5f3011e4e20a9ff66ad34e836eed7a7011.tar.gz historical-dcf75f5f3011e4e20a9ff66ad34e836eed7a7011.tar.bz2 historical-dcf75f5f3011e4e20a9ff66ad34e836eed7a7011.zip |
Fix not installing anything with USE=systemd,static-libs. That combination should be forbidden via REQUIRED_USE.
Package-Manager: portage-2.2.11/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'virtual')
-rw-r--r-- | virtual/libudev/ChangeLog | 6 | ||||
-rw-r--r-- | virtual/libudev/Manifest | 26 | ||||
-rw-r--r-- | virtual/libudev/libudev-215.ebuild | 8 |
3 files changed, 27 insertions, 13 deletions
diff --git a/virtual/libudev/ChangeLog b/virtual/libudev/ChangeLog index f5e604b80a00..2e06c6a81658 100644 --- a/virtual/libudev/ChangeLog +++ b/virtual/libudev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for virtual/libudev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/libudev/ChangeLog,v 1.9 2014/08/03 13:07:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libudev/ChangeLog,v 1.10 2014/08/04 06:58:41 mgorny Exp $ + + 04 Aug 2014; Michał Górny <mgorny@gentoo.org> libudev-215.ebuild: + Fix not installing anything with USE=systemd,static-libs. That combination + should be forbidden via REQUIRED_USE. 03 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> libudev-215.ebuild: Help Portage make the right decision by introducing USE="systemd" wrt #515230. diff --git a/virtual/libudev/Manifest b/virtual/libudev/Manifest index 392b41a6dc8d..e536e910bf63 100644 --- a/virtual/libudev/Manifest +++ b/virtual/libudev/Manifest @@ -1,17 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD libudev-215.ebuild 806 SHA256 9a874766d819acd1c783b864afd1143e50c53a8d7e8d4cd936312f2bca264cba SHA512 bed52d91a29a6ff06a1408a34c0c49ba996e9cc9c42032aefcc973727fb058d088c4bdf0fbe5b6e94a766409e98e6ef5e462880eb6862da29277d8b59ea192f8 WHIRLPOOL 4dd5bcdc5d47aef35df87499d32f82a26fb5bd229e3c1e44022a7d2c9b41a0a594162d911348ca2d887a26022f623303ae28c768ffe163dca78ddcd2f003374b -MISC ChangeLog 1508 SHA256 16e72f01ed8b37967794d0a6283625e73fab7167720629f2582e4c1e9dc6ec57 SHA512 01601bb4401903c1ab1344a46a21cd9e8e41c220bda10d6ef7a31eda9bc3906cbcebf7d126cb0b49180f1c5ef364762d7de916663178cb43e11ef067e8f6259d WHIRLPOOL 0bdc6868668fe9b2123e13d18eea5b190d0f258bad77dc9c458878d41ef3e8ba81a2553b3aa8d17b2941c95e6c96bf5423b57d71824e22ffc7b4e7ef78e6a8de +EBUILD libudev-215.ebuild 827 SHA256 a278c38c3337a6e7c784df71109c2be446481acb93547274eba1d76659b5b113 SHA512 be1704fd25e67853e00c815820cd50f8cccf5fbc3462b024eea746385c3e87393366ce9ec2fd5c48ece0f671716fddee4e7edfaefc480131a0c8a812d1bc7b6a WHIRLPOOL f94e09cad7f1dd33a2e9b66cb6a87eb4b5820275665b78b01aa7c9f63fdb1b77f043372930339817e4cf73d82dc4be6d722f357c91d7ca5fbd4f8806ec460bfe +MISC ChangeLog 1694 SHA256 3be6e7218e7827c76c8380dca4e07d4a9590756a8e0893330d6e7a129cd3f9a2 SHA512 29bae321af39d5b5573723f007d6fb7cf8bda9746f7e682c2c8eba7629b8080075878b860504b55ae8827bcb8bdcb0fdb444af2d10d1eaffd9d4f6e981505367 WHIRLPOOL 0d4ac8d7ab991dc2dfe4c95fbfa0085b024c10a07f8e2a09ad4283a5c7457d5ef5af07ed2a2844fbebb49c1e5570b74cacf3d45a2be8d42bdd6fb4541e6006bd MISC metadata.xml 334 SHA256 7497081ff0fed40c938a1ffadac47f7d7506bc7bd096fbd5d43d30d2358317d4 SHA512 001652383e5472e3d1fb2b5ab81ae942454e5f0874c81ea1ff29bd233fd1519b5461f8c1fcb8d5b51e82d27746c5dd696fa1ae07a1ba1c9803d6d2dfb8dc1f52 WHIRLPOOL db7d6ac1ba797cb9a5fdebaf9c319405cd522fdb977f2bf24d93fd13bd061af4ddae5970c73ef9906ff03caff52907c89f726cb502c74ebfb0f4621e0c6ab213 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJT3jQKAAoJEEdUh39IaPFNIaYH/3JYnSw/VZVtZJ0MAo5BldMb -iNcXyUxOtjyamz6rhk1U3lk1W4lLMDgm6Oe4/wMrHzmhWPaBR0pw50uoZ5/5fvCE -afQzigrAlB8f4uzkWidLr1nuqXhyqcrmppYDOYeXPk/+KokhjrEgUmwKKWuw5ri4 -FTRcQJQJmLbhq+i4KDTTEPlWSBFVw4dRpHjWpRFWzCcvKDj+xHB1WJoDM71/EYX4 -Xch1s5wMqGsotgChVzGvXMfZ7ifuOtjqI9g9ItQX3cwHkTaDqV+r/927iUPY+4VT -FbLfUupLF8rGFlwioXdWRyG9GnVhOwqMwPnOFs0LT4gEUWdwk9HyCzPAuxrgJ/4= -=DhA3 +iQJ8BAEBCABmBQJT3y9FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5mMP/1BchDQN6zCnZGS6/Qtu6x1v +Py+yi7Md1TVSR80om74k6iqjAaKjPR0nWP13QMyT+8eBro2sN6+7U5D7cpRh3BBq +X4w5SrG+/3Ue1Ox7/4i/YzBU8eK0GgDvw9ZXahyNuZ+u48prpH8m6eYR+eTwl74Y +Nb0z8iq6oeqj4vrj+6dQ1QnTSoWGTrZn+ncjkzi0j9EL6TckP3hD0gveeJglpZHU +Zv/uh7YrQnZpar5fk+hCUoWyZ4s4tFPmX3N4qUBYJjA1PLFi6QNgCD35EaTuU21I +RZSzWwNmKFZFtk+Dnf4kCftjzb2pgQ5SH/6ot2C+Yzq3VPKrCC7MmIcnF0C2sSsU +ysDjzOYTQhuiQQLc3sQveeRhFlKdCbaLpXucN8up6fpUW9z3GwJexGHpBX+a1qBg +DGH0ZK6YR+Rum3+oXTF/XPqmid7KNwYN8OMyXLTRGnnOVh6/9+bMh67R7+bK9bCe +njXiibufPBr1K70GUjvGBDF2WzeyHUKlvI0/zVJEMIcDyYmIEEvoPp4UW9C1Qe+z +7ySLKNIYWvdsFiLy+dCcgsXGpyN4bbsMszcRWF7dzERMVVWiUBPP6ca3O1gKsIxd +Xo5eMzgzW7OH5NA5Xzt2chllAcZzoJP01QIevxwP4sabFKIBQhx8AijB+xeQFq1L +YvZGufyKllObhnFaWxmz +=gUKF -----END PGP SIGNATURE----- diff --git a/virtual/libudev/libudev-215.ebuild b/virtual/libudev/libudev-215.ebuild index 7608b876166a..74ebf1f10f39 100644 --- a/virtual/libudev/libudev-215.ebuild +++ b/virtual/libudev/libudev-215.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/virtual/libudev/libudev-215.ebuild,v 1.2 2014/08/03 13:07:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libudev/libudev-215.ebuild,v 1.3 2014/08/04 06:58:41 mgorny Exp $ EAPI=5 inherit multilib-build @@ -20,8 +20,10 @@ RDEPEND=" >=sys-fs/udev-208-r1:0/0[${MULTILIB_USEDEP},static-libs?] >=sys-fs/eudev-1.3:0/0[${MULTILIB_USEDEP},static-libs?] ) ) - systemd? ( !static-libs? ( || ( + systemd? ( || ( >=sys-apps/systemd-212-r5:0/2[${MULTILIB_USEDEP}] >=sys-apps/systemd-208-r3:0/1[${MULTILIB_USEDEP}] - >=sys-apps/systemd-208:0/0[${MULTILIB_USEDEP}] ) ) + >=sys-apps/systemd-208:0/0[${MULTILIB_USEDEP}] ) )" + +REQUIRED_USE="systemd? ( !static-libs )" |