diff options
author | Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-09-17 19:28:12 +0000 |
---|---|---|
committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2012-09-17 19:28:12 +0000 |
commit | 609aae4ce6cb712dcc377a111b1b1675d918ae3c (patch) | |
tree | d45c07a608b21421cc576298e1bf69d8638e257c /media-video | |
parent | Linux patches 3.0.42 and 3.0.43 (diff) | |
download | gentoo-2-609aae4ce6cb712dcc377a111b1b1675d918ae3c.tar.gz gentoo-2-609aae4ce6cb712dcc377a111b1b1675d918ae3c.tar.bz2 gentoo-2-609aae4ce6cb712dcc377a111b1b1675d918ae3c.zip |
reverted wrong stable commit amd64 x86
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/vdr/ChangeLog | 13 | ||||
-rw-r--r-- | media-video/vdr/vdr-1.6.0_p2-r11.ebuild (renamed from media-video/vdr/vdr-1.6.0_p2-r10.ebuild) | 22 |
2 files changed, 17 insertions, 18 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 84602ffd7061..65d59df3480f 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-video/vdr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.165 2012/06/22 15:53:36 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.166 2012/09/17 19:28:12 hd_brummy Exp $ + + 17 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-1.6.0_p2-r10.ebuild, +vdr-1.6.0_p2-r11.ebuild: + reverted wrong stable commit amd64 x86 + +*vdr-1.6.0_p2-r11 (17 Sep 2012) + + 17 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-1.6.0_p2-r10.ebuild, +vdr-1.6.0_p2-r11.ebuild: + fixed detection of LINGUAS, reported on forums.gentoo.org #7138380; thanks to + heifisch for the hints 22 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r10.ebuild, -files/vdr-1.6.0_p2_linguas-v2.diff, +files/vdr-1.6.0_p2_linguas-v3.diff: diff --git a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild b/media-video/vdr/vdr-1.6.0_p2-r11.ebuild index 2808e5fd90a5..06f04f02b399 100644 --- a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild +++ b/media-video/vdr/vdr-1.6.0_p2-r11.ebuild @@ -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/media-video/vdr/vdr-1.6.0_p2-r10.ebuild,v 1.5 2012/06/22 15:53:36 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r11.ebuild,v 1.1 2012/09/17 19:28:12 hd_brummy Exp $ EAPI="4" @@ -40,7 +40,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2" -KEYWORDS="~arm amd64 ~ppc x86" +KEYWORDS="~arm ~amd64 ~ppc ~x86" SLOT="0" LICENSE="GPL-2" @@ -174,12 +174,8 @@ EOT eend 0 } -lang_linguas() { - LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" ) -} - lang_po() { - LING2=$( ls ${S}/po | tr \\\012 ' ' | sed -e "s:_::g" -e "s:[A-Z]::g" -e "s:.po::g" ) + LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ') } src_prepare() { @@ -315,17 +311,9 @@ src_prepare() { einfo "\n \t VDR supports now the LINGUAS values" lang_po - lang_linguas - - einfo "\t Please set one of this values in /etc/make.conf" - einfo "\t LINGUAS=\"${LING2}\"\n" - if [[ -z ${LINGUAS} ]]; then - eerror "\n \t No values in LINGUAS=" - eerror "\t you will get only english text on OSD \n" - else - einfo "\t Language for ${LING1} will installed \n" - fi + einfo "\t Please set one of this values in /etc/make.conf or /etc/portage/make.conf" + einfo "\t LINGUAS=\"${LING_PO}\"\n" strip-linguas ${LING2} en } |