diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/leechcraft.eclass | 20 |
2 files changed, 11 insertions, 14 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 18d825c30905..acb96aa5ce5d 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1237 2014/05/02 16:16:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1238 2014/05/03 21:25:46 pinkbyte Exp $ + + 03 May 2014; Sergey Popov <pinkbyte@gentoo.org> leechcraft.eclass: + Omit some obsolete version checks 02 May 2014; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass, multilib-minimal.eclass: diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass index 55508f82eaed..829dc0c7717d 100644 --- a/eclass/leechcraft.eclass +++ b/eclass/leechcraft.eclass @@ -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/eclass/leechcraft.eclass,v 1.14 2014/04/15 16:06:56 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.15 2014/05/03 21:25:46 pinkbyte Exp $ # # @ECLASS: leechcraft.eclass # @MAINTAINER: @@ -42,11 +42,7 @@ else fi HOMEPAGE="http://leechcraft.org/" -if version_is_at_least 0.5.95; then - LICENSE="Boost-1.0" -else - LICENSE="GPL-3" -fi +LICENSE="Boost-1.0" # @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY # @DEFAULT_UNSET @@ -72,13 +68,11 @@ EXPORT_FUNCTIONS "pkg_pretend" leechcraft_pkg_pretend() { debug-print-function ${FUNCNAME} "$@" - if version_is_at_least 0.5.85; then - # 0.5.85 and later requires at least gcc 4.6 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - && die "Sorry, but gcc 4.6 or higher is required." - fi + # 0.5.85 and later requires at least gcc 4.6 + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + && die "Sorry, but gcc 4.6 or higher is required." fi if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then # 0.6.65 monocle and all later plugins require at least gcc 4.8 |