diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-04-18 16:52:30 +0000 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-04-18 16:52:30 +0000 |
| commit | 1d554a424a59093b4bf69e2bad0aec1c7eb09cbe (patch) | |
| tree | ce86eaf4c38eb5d21b189c0cd5014c96b5596fab /eclass | |
| parent | aspell-dict goes last on the inherit line (diff) | |
| download | historical-1d554a424a59093b4bf69e2bad0aec1c7eb09cbe.tar.gz historical-1d554a424a59093b4bf69e2bad0aec1c7eb09cbe.tar.bz2 historical-1d554a424a59093b4bf69e2bad0aec1c7eb09cbe.zip | |
removed unneeded path install for /usr/local/share; fix i18n install bug, start with vdr-1.7.27 bug 411945, thanks to Marc Perrudin for this workaround
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/vdr-plugin.eclass | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a818e47b24df..1f46bb9383ce 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.213 2012/04/16 10:28:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.214 2012/04/18 16:52:30 hd_brummy Exp $ + + 18 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass: + removed unneeded path install for /usr/local/share; fix i18n install bug, + start with vdr-1.7.27 bug 411945, thanks to Marc Perrudin for this workaround 16 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> cmake-utils.eclass: Whitespace cmake dep. Add build_rules to CMAKE_BUILD_DIR rather than to T as diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass index 172548c7bad1..2cbf99571019 100644 --- a/eclass/vdr-plugin.eclass +++ b/eclass/vdr-plugin.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.86 2012/04/07 10:18:24 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.87 2012/04/18 16:52:30 hd_brummy Exp $ # @ECLASS: vdr-plugin.eclass # @MAINTAINER: @@ -378,11 +378,7 @@ vdr-plugin_pkg_setup() { DVB_INCLUDE_DIR="/usr/include" TMP_LOCALE_DIR="${WORKDIR}/tmp-locale" - if has_version ">=media-video/vdr-1.6.0_p2-r7"; then - LOCDIR="/usr/share/locale" - else - LOCDIR="/usr/share/vdr/locale" - fi + LOCDIR="/usr/share/locale" if ! has_vdr; then # set to invalid values to detect abuses @@ -436,8 +432,11 @@ vdr-plugin_src_util() { vdr_patchmakefile ;; i18n) - cd "${S}" || die "Could not change to plugin-source-directory!" - vdr_i18n + # i18n-to-gettext tool removed starting with version 1.7.27 + if has_version "<media-video/vdr-1.7.27"; then + cd "${S}" || die "Could not change to plugin-source-directory!" + vdr_i18n + fi ;; esac |