diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-08-04 06:58:41 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-08-04 06:58:41 +0000 |
| commit | 712ebb1b69165af742f41db98f63aa4c76dbdff6 (patch) | |
| tree | ee0f4ea7c2af6414d613aaf8f88a0b9333ff1425 /virtual/libudev | |
| parent | actually use the new $QEMU_BINFMT_FLAGS (diff) | |
| download | gentoo-2-712ebb1b69165af742f41db98f63aa4c76dbdff6.tar.gz gentoo-2-712ebb1b69165af742f41db98f63aa4c76dbdff6.tar.bz2 gentoo-2-712ebb1b69165af742f41db98f63aa4c76dbdff6.zip | |
Fix not installing anything with USE=systemd,static-libs. That combination should be forbidden via REQUIRED_USE.
(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'virtual/libudev')
| -rw-r--r-- | virtual/libudev/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/libudev/libudev-215.ebuild | 8 |
2 files changed, 10 insertions, 4 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/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 )" |