diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-01-21 03:01:38 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-01-21 03:01:38 +0000 |
| commit | b603af5f7011913f1ab7ac003f09a90ced9f5501 (patch) | |
| tree | 2b1eb170cb5c05c3e45f694b30742e20ed3266a5 | |
| parent | 2017-01-21 02:05:32 UTC (diff) | |
| parent | eutils.eclass: move EAPI conditional funcs under the multiple inclusion prote... (diff) | |
| download | gentoo-b603af5f7011913f1ab7ac003f09a90ced9f5501.tar.gz gentoo-b603af5f7011913f1ab7ac003f09a90ced9f5501.tar.bz2 gentoo-b603af5f7011913f1ab7ac003f09a90ced9f5501.zip | |
Merge updates from master
| -rw-r--r-- | eclass/eutils.eclass | 4 | ||||
| -rw-r--r-- | eclass/udev.eclass | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index d8684676e859..b55f50613e5e 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1620,8 +1620,6 @@ optfeature() { fi } -fi - check_license() { die "you no longer need this as portage supports ACCEPT_LICENSE itself" } @@ -1845,3 +1843,5 @@ in_iuse() { ;; esac + +fi diff --git a/eclass/udev.eclass b/eclass/udev.eclass index eb5c6590e5f6..0968559100bf 100644 --- a/eclass/udev.eclass +++ b/eclass/udev.eclass @@ -28,6 +28,9 @@ # } # @CODE +if [[ -z ${_UDEV_ECLASS} ]]; then +_UDEV_ECLASS=1 + inherit toolchain-funcs case ${EAPI:-0} in @@ -113,3 +116,5 @@ udev_reload() { eend $? fi } + +fi |