From: Ben de Groot Date: Fri, 26 Mar 2010 20:20:48 +0000 (+0000) Subject: Remove old version. Migrate 0.6.9 to use qt4-r2.eclass (bug #311481). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a18feb8916af87a29de56c7ed03f64e06a1c6d3a;p=gentoo.git Remove old version. Migrate 0.6.9 to use qt4-r2.eclass (bug #311481). Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog index e73f58758c61..1860eb0990d4 100644 --- a/media-video/smplayer/ChangeLog +++ b/media-video/smplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/smplayer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.84 2010/03/22 23:53:54 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.85 2010/03/26 20:20:48 yngwin Exp $ + + 26 Mar 2010; Ben de Groot -smplayer-0.6.6.ebuild, + smplayer-0.6.9.ebuild: + Remove old version. Migrate 0.6.9 to use qt4-r2.eclass (bug #311481). 22 Mar 2010; Ben de Groot metadata.xml: Co-assign to qt herd diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index c8e1307f5e31..ffc0c6e1d51f 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -1,9 +1,7 @@ AUX smplayer-0.6.8-quit.patch 559 RMD160 57a13ce73bf1bc42ff84afa93740b2b91979c68a SHA1 cd6747917b8a8a71d46b8841d7924c4e304bb636 SHA256 52bd82633b4561613675121ae10af12ef25a11b7343eea043a3a70dd32aa999a -DIST smplayer-0.6.6.tar.bz2 1373258 RMD160 b184d8eef9451a220b894bb46a1eca3ee1d95372 SHA1 6b5299c84650a36ddb73951815e09c100f29e3e5 SHA256 8be72ac3870d0be379b130e84c6168f0ca143dd0112bbe4ce79d5a37394acd29 DIST smplayer-0.6.8.tar.bz2 1670580 RMD160 10db255b8e21658b03fcff66de5554acaf29782e SHA1 0f7d53babe1fd71ea9eddb448622d112495242e7 SHA256 466b589ee2d3944b2e3b8f3a6dae436f7d31f054912cfe56f8d93454594c4ca2 DIST smplayer-0.6.9.tar.bz2 1723032 RMD160 8e47e88b9fddc56d66c338c1886a5079ab279854 SHA1 1879839c229b7ef2dcd6d7e34e2e2057fae5182c SHA256 b91009b6dc2a3cdd5acc2bdacc3cf6870fce8f63d8e6ef9cfe8e199f1acc2e35 -EBUILD smplayer-0.6.6.ebuild 2450 RMD160 a8fb8298d16a1e09df0e69bd5b7980fdfb15a866 SHA1 8ea019a3de509fc08072d8203c4987ebe67c1a89 SHA256 552f061b99f150eb75001e9b1fcdf93adde7910e0ed88bc9c8e29744b3178454 EBUILD smplayer-0.6.8.ebuild 2786 RMD160 04e67cf905669d4a708ec51b1b0572767750fa1c SHA1 590323851d451026bd18fa51c2ca5cba7ab69952 SHA256 c7a407f5e0c93acf87d5c22670f079311a65cc04d938e40d26a93ad71e709ebe -EBUILD smplayer-0.6.9.ebuild 2800 RMD160 1656c0e881b3e5bbd93a14e6dfed3637c1205983 SHA1 0ca0a8727d5f6be94d1e79876e4482c440a3423a SHA256 92c1f7d3b4096e6daab631f7e4e6d661e1e69de6cba4950d4d790822a497be73 -MISC ChangeLog 11846 RMD160 65e330c17a08c90346650a2bcbdf949acf6bd290 SHA1 39c2cfe20a177d905a881f9bf5da0d2361c12f33 SHA256 b72137a94be62622aac5cf8ead2b2a327b4ab51cbed81acb439d3d354af2133e +EBUILD smplayer-0.6.9.ebuild 2564 RMD160 63967f4d57a7f987b7a1e7044c1e291dac6f8f79 SHA1 0686f44c6f2a68123a1bca567a9fda5493af7ada SHA256 b2e090e45fa0362e9111bd8a2193fe49db9ca0dbbb0cb2fb168ad938d255f480 +MISC ChangeLog 12016 RMD160 00e8e6e046909b004171cc02e95ba3ec46bf7579 SHA1 2e968dd2686dcfd002285915d619b9b1a7c8ac50 SHA256 68776b484b832e632461fa2304ab24bc101ebbf360a3b03e1c7c4617ab1f115f MISC metadata.xml 264 RMD160 2937321e864e3410c48cb59a1ad9341c78432556 SHA1 1894e8720488e4cd811817414a5712fa32601c07 SHA256 468e05c3cab9c74a3de9c75929be9fb599a30c3fecd92279e62446d30f4fd2af diff --git a/media-video/smplayer/smplayer-0.6.6.ebuild b/media-video/smplayer/smplayer-0.6.6.ebuild deleted file mode 100644 index 19f7b03ff288..000000000000 --- a/media-video/smplayer/smplayer-0.6.6.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.6.ebuild,v 1.9 2009/07/06 22:34:27 jer 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" -RDEPEND="${DEPEND} - media-video/mplayer[ass,png]" - -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 -} diff --git a/media-video/smplayer/smplayer-0.6.9.ebuild b/media-video/smplayer/smplayer-0.6.9.ebuild index 789da1e00c62..4e6c6e92d9e3 100644 --- a/media-video/smplayer/smplayer-0.6.9.ebuild +++ b/media-video/smplayer/smplayer-0.6.9.ebuild @@ -1,10 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9.ebuild,v 1.1 2010/02/24 16:39:28 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9.ebuild,v 1.2 2010/03/26 20:20:48 yngwin Exp $ EAPI="2" +LANGS="bg ca cs de en_US es et eu fi fr gl hu it ja ka ko ku mk nl pl pt_BR +pt sk sr sv tr zh_CN zh_TW" +LANGSLONG="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA vi_VN" -inherit eutils qt4 +inherit eutils qt4-r2 MY_PV=${PV##*_p} if [[ "${MY_PV}" != "${PV}" ]]; then @@ -19,7 +22,7 @@ else fi DESCRIPTION="Great Qt4 GUI front-end for mplayer" -HOMEPAGE="http://smplayer.sourceforge.net/" +HOMEPAGE="http://smplayer.berlios.de/" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -29,17 +32,6 @@ DEPEND="x11-libs/qt-gui:4" RDEPEND="${DEPEND} media-video/mplayer[ass,png]" -LANGS="bg ca cs de en_US es et eu fi fr gl hu it ja ka ko ku mk nl pl pt_BR -pt sk sr sv tr zh_CN zh_TW" -# langs with long notation in pkg, but no long notation in portage: -NOLONGLANGS="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA vi_VN" -for X in ${LANGS}; do - IUSE="${IUSE} linguas_${X}" -done -for X in ${NOLONGLANGS}; do - IUSE="${IUSE} linguas_${X%_*}" -done - src_prepare() { # Force Ctrl+Q as default quit shortcut epatch "${FILESDIR}/${PN}-0.6.8-quit.patch" @@ -71,7 +63,7 @@ gen_translation() { } src_compile() { - emake || die "emake failed" + emake || die # Generate translations cd "${S}"/src/translations @@ -80,8 +72,8 @@ src_compile() { if has ${lang} ${LANGS}; then gen_translation ${lang} continue - elif [[ " ${NOLONGLANGS} " == *" ${lang}_"* ]]; then - for x in ${NOLONGLANGS}; do + elif [[ " ${LANGSLONG} " == *" ${lang}_"* ]]; then + for x in ${LANGSLONG}; do if [[ "${lang}" == "${x%_*}" ]]; then gen_translation ${x} continue 2 @@ -103,6 +95,6 @@ src_install() { # remove windows-only files rm "${S}"/*.bat - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install || die prepalldocs }