summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-08-04 07:11:08 +0000
committerMichał Górny <mgorny@gentoo.org>2014-08-04 07:11:08 +0000
commit60cb75944889bcb30ea63bc41e52dae0b74bf331 (patch)
tree5403c46a36f2cdec17d4fee94075709142720f51 /virtual/libgudev
parentFix not installing anything with USE=systemd,static-libs. That combination sh... (diff)
downloadgentoo-2-60cb75944889bcb30ea63bc41e52dae0b74bf331.tar.gz
gentoo-2-60cb75944889bcb30ea63bc41e52dae0b74bf331.tar.bz2
gentoo-2-60cb75944889bcb30ea63bc41e52dae0b74bf331.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/libgudev')
-rw-r--r--virtual/libgudev/ChangeLog6
-rw-r--r--virtual/libgudev/libgudev-215.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/virtual/libgudev/ChangeLog b/virtual/libgudev/ChangeLog
index efa7c55da871..ddc2ca3e20be 100644
--- a/virtual/libgudev/ChangeLog
+++ b/virtual/libgudev/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/libgudev
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libgudev/ChangeLog,v 1.12 2014/08/03 13:12:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libgudev/ChangeLog,v 1.13 2014/08/04 07:11:08 mgorny Exp $
+
+ 04 Aug 2014; Michał Górny <mgorny@gentoo.org> libgudev-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> libgudev-215.ebuild:
Help Portage make the right decision by introducing USE="systemd" wrt #515230.
diff --git a/virtual/libgudev/libgudev-215.ebuild b/virtual/libgudev/libgudev-215.ebuild
index 7c819a449924..f8e8e11c7038 100644
--- a/virtual/libgudev/libgudev-215.ebuild
+++ b/virtual/libgudev/libgudev-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/libgudev/libgudev-215.ebuild,v 1.2 2014/08/03 13:12:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libgudev/libgudev-215.ebuild,v 1.3 2014/08/04 07:11:08 mgorny Exp $
EAPI=5
inherit multilib-build
@@ -20,8 +20,10 @@ RDEPEND="
>=sys-fs/udev-208-r1:0/0[${MULTILIB_USEDEP},gudev,introspection?,static-libs?]
>=sys-fs/eudev-1.5.3-r1:0/0[${MULTILIB_USEDEP},gudev,introspection?,static-libs?] )
)
- systemd? ( !static-libs? ( || (
+ systemd? ( || (
>=sys-apps/systemd-212-r5:0/2[${MULTILIB_USEDEP},gudev,introspection?]
>=sys-apps/systemd-208-r3:0/1[${MULTILIB_USEDEP},gudev,introspection?]
- >=sys-apps/systemd-208:0/0[${MULTILIB_USEDEP},gudev,introspection?] ) )
+ >=sys-apps/systemd-208:0/0[${MULTILIB_USEDEP},gudev,introspection?] )
)"
+
+REQUIRED_USE="systemd? ( !static-libs )"