diff options
author | Ben de Groot <yngwin@gentoo.org> | 2008-12-18 07:44:50 +0000 |
---|---|---|
committer | Ben de Groot <yngwin@gentoo.org> | 2008-12-18 07:44:50 +0000 |
commit | 5ab6f52b1f557acb76e807dbf5b255656fa6adec (patch) | |
tree | a113b0d88e2827b9b5114d31a7e2b9fbac351ae5 /media-video/smplayer | |
parent | Added ~mips to KEYWORDS, per #205570. (diff) | |
download | gentoo-2-5ab6f52b1f557acb76e807dbf5b255656fa6adec.tar.gz gentoo-2-5ab6f52b1f557acb76e807dbf5b255656fa6adec.tar.bz2 gentoo-2-5ab6f52b1f557acb76e807dbf5b255656fa6adec.zip |
Make stable ebuilds depend on mplayer with either ass or srt useflag. Fixes bug 249588 again.
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-hh8 i686)
Diffstat (limited to 'media-video/smplayer')
-rw-r--r-- | media-video/smplayer/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/smplayer/smplayer-0.6.1-r1.ebuild | 11 | ||||
-rw-r--r-- | media-video/smplayer/smplayer-0.6.2-r1.ebuild | 11 | ||||
-rw-r--r-- | media-video/smplayer/smplayer-0.6.5.ebuild | 92 |
4 files changed, 18 insertions, 103 deletions
diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog index eac4c036ecbe..d6839340a2cd 100644 --- a/media-video/smplayer/ChangeLog +++ b/media-video/smplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/smplayer # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.49 2008/12/02 13:14:34 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.50 2008/12/18 07:44:50 yngwin Exp $ + + 18 Dec 2008; Ben de Groot <yngwin@gentoo.org> smplayer-0.6.1-r1.ebuild, + smplayer-0.6.2-r1.ebuild, -smplayer-0.6.5.ebuild: + Make stable ebuilds depend on mplayer with either ass or srt useflag. + Fixes bug 249588 again. Remove older testing revision. *smplayer-0.6.5-r1 (02 Dec 2008) diff --git a/media-video/smplayer/smplayer-0.6.1-r1.ebuild b/media-video/smplayer/smplayer-0.6.1-r1.ebuild index e0951d7edf5a..ee1a37bd6c53 100644 --- a/media-video/smplayer/smplayer-0.6.1-r1.ebuild +++ b/media-video/smplayer/smplayer-0.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.1-r1.ebuild,v 1.8 2008/09/18 01:20:04 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.1-r1.ebuild,v 1.9 2008/12/18 07:44:50 yngwin Exp $ EAPI="1" inherit eutils qt4 @@ -37,13 +37,14 @@ pkg_setup() { fi qt4_pkg_setup - if ! built_with_use media-video/mplayer srt ; then + if ! built_with_use --missing true media-video/mplayer ass \ + || ! built_with_use --missing true media-video/mplayer srt; then echo - ewarn "SMPlayer needs MPlayer to be built with USE=srt for subtitle" - ewarn "support. Please enable the srt USE flag for mplayer and" + ewarn "SMPlayer needs MPlayer to be built with USE=ass or srt for subtitle" + ewarn "support. Please enable the ass or srt USE flag for mplayer and" ewarn "re-emerge media-video/mplayer before emerging smplayer." echo - die "media-video/mplayer needs USE=srt enabled" + die "media-video/mplayer needs USE=ass or srt enabled" fi if ! built_with_use media-video/mplayer png; then echo diff --git a/media-video/smplayer/smplayer-0.6.2-r1.ebuild b/media-video/smplayer/smplayer-0.6.2-r1.ebuild index 26f40352c2a0..a972fa0bc106 100644 --- a/media-video/smplayer/smplayer-0.6.2-r1.ebuild +++ b/media-video/smplayer/smplayer-0.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.2-r1.ebuild,v 1.5 2008/09/28 16:15:16 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.2-r1.ebuild,v 1.6 2008/12/18 07:44:50 yngwin Exp $ EAPI="1" inherit eutils qt4 @@ -27,13 +27,14 @@ for X in ${NOLONGLANGS}; do done pkg_setup() { - if ! built_with_use media-video/mplayer srt ; then + if ! built_with_use --missing true media-video/mplayer ass \ + || ! built_with_use --missing true media-video/mplayer srt; then echo - ewarn "SMPlayer needs MPlayer to be built with USE=srt for subtitle" - ewarn "support. Please enable the srt USE flag for mplayer and" + ewarn "SMPlayer needs MPlayer to be built with USE=ass or srt for subtitle" + ewarn "support. Please enable the ass or srt USE flag for mplayer and" ewarn "re-emerge media-video/mplayer before emerging smplayer." echo - die "media-video/mplayer needs USE=srt enabled" + die "media-video/mplayer needs USE=ass or srt enabled" fi if ! built_with_use media-video/mplayer png; then echo diff --git a/media-video/smplayer/smplayer-0.6.5.ebuild b/media-video/smplayer/smplayer-0.6.5.ebuild deleted file mode 100644 index aba4b1de7726..000000000000 --- a/media-video/smplayer/smplayer-0.6.5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.5.ebuild,v 1.2 2008/11/13 20:52:57 yngwin Exp $ - -EAPI=2 -inherit eutils qt4 - -DESCRIPTION="Great Qt4 GUI front-end for mplayer" -HOMEPAGE="http://smplayer.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug" -DEPEND="|| ( x11-libs/qt-gui:4 - =x11-libs/qt-4.3* )" -RDEPEND="${DEPEND} - >media-video/mplayer-1.0_rc1[png,srt]" - -LANGS="bg ca cs de en_US es eu fi fr gl hu it ja ka ko ku mk nl pl pt_BR pt_PT sk sr sv tr zh_CN zh_TW" -NOLONGLANGS="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA" -for X in ${LANGS}; do - IUSE="${IUSE} linguas_${X}" -done -for X in ${NOLONGLANGS}; do - IUSE="${IUSE} linguas_${X%_*}" -done - -src_prepare() { - # Fix paths in Makefile and allow parallel building - sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \ - -e "/^CONF_PREFIX=/s:\$(PREFIX)::" \ - -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \ - -e '/get_svn_revision.sh/,+2c\ - cd src && $(DEFS) $(MAKE)' \ - "${S}"/Makefile || die "sed failed" - - # Turn debug message flooding off - if ! use debug ; then - sed -i "s:#DEFINES += NO_DEBUG_ON_CONSOLE:DEFINES += NO_DEBUG_ON_CONSOLE:" \ - "${S}"/src/smplayer.pro || die "sed failed" - fi -} - -src_configure() { - eqmake4 src/${PN}.pro -o src/Makefile -} - -src_compile() { - emake || die "emake failed" - - # Generate translations - cd "${S}"/src/translations - local LANG= - for LANG in ${LINGUAS}; do - if has ${LANG} ${LANGS}; then - einfo "Generating ${LANG} translation ..." - lrelease ${PN}_${LANG}.ts || die "Failed to generate ${LANG} translation!" - continue - elif [[ " ${NOLONGLANGS} " == *" ${LANG}_"* ]]; then - local X= - for X in ${NOLONGLANGS}; do - if [[ "${LANG}" == "${X%_*}" ]]; then - einfo "Generating ${X} translation ..." - lrelease ${PN}_${X}.ts || die "Failed to generate ${X} translation!" - continue 2 - fi - done - fi - ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA." - done - # install fails when no translation is present (bug 244370) - [[ -f *.qm ]] || lrelease ${PN}_en_US.ts -} - -src_install() { - # remove unneeded copies of GPL - rm Copying.txt docs/en/gpl.html docs/ru/gpl.html - for i in de es ja nl ro ; do - rm -rf docs/$i - done - - # remove windows-only files - rm "${S}"/*.bat - - emake DESTDIR="${D}" install || die "emake install failed" - prepalldocs - - einfo "Note that the default configuration files location has changed" - einfo "since 0.6.4. You may want to move your existing configuration:" - einfo "mv ~/.smplayer ~/.config/smplayer" -} |