From d06e2fc1e2d6184cbbf3f30b91c08a7012e62fe3 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 4 Nov 2011 17:14:02 +0000 Subject: [PATCH] media-video/smplayer: Fix mplayer2[(lib)ass] dependency (bug #383945) Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- media-video/smplayer/ChangeLog | 6 +++++- media-video/smplayer/Manifest | 12 ++++++------ media-video/smplayer/smplayer-0.6.9-r1.ebuild | 4 ++-- media-video/smplayer/smplayer-0.6.9-r2.ebuild | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog index 911295239f1b..b33c8f63c96c 100644 --- a/media-video/smplayer/ChangeLog +++ b/media-video/smplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/smplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.97 2011/11/01 05:50:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.98 2011/11/04 17:14:02 sping Exp $ + + 04 Nov 2011; Sebastian Pipping smplayer-0.6.9-r1.ebuild, + smplayer-0.6.9-r2.ebuild: + mplayer2[libass] -> mplayer2[ass] (bug #383945) 01 Nov 2011; Markus Meier smplayer-0.6.9-r2.ebuild: add ~arm, bug #383945 diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 1855c6354662..8282c16ec2c6 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -6,15 +6,15 @@ AUX smplayer-0.6.9-quazip.patch 3078 RMD160 e45f97595a53ee2eae603ca41d14e680ac50 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.8.ebuild 2786 RMD160 04e67cf905669d4a708ec51b1b0572767750fa1c SHA1 590323851d451026bd18fa51c2ca5cba7ab69952 SHA256 c7a407f5e0c93acf87d5c22670f079311a65cc04d938e40d26a93ad71e709ebe -EBUILD smplayer-0.6.9-r1.ebuild 2677 RMD160 e1e59e769b0429f15cf1d6bf8621779796ca350e SHA1 e70b0a7ceb19ccef0b0c18e2fa33c10004c1f22a SHA256 e8a0a306afd925e88fcb3842a4bb3a1e6d8c7e6a49f33a339636bc0c09d231ed -EBUILD smplayer-0.6.9-r2.ebuild 2766 RMD160 5e7dd5c57aa9a3d8206fe4af64154a74fd27f28f SHA1 3ec446506d321a99e60124c92261554b35abf6db SHA256 cefc55478f801249d66442589ed73ec1072381e40311ce03c684dffaac92f793 +EBUILD smplayer-0.6.9-r1.ebuild 2642 RMD160 8c8b7a8f14d97685eb89f56413531379b392c288 SHA1 4a4e4e51da9a8ab38bdae8cd7c0b34aee56d1d74 SHA256 b8e1b6df52dd49a904ce871f325a02732bbe645114f3bd05adfe0f2b6686aa2d +EBUILD smplayer-0.6.9-r2.ebuild 2732 RMD160 7fd4d4a42f1a390c189ddc6b4305ad84ee0f066e SHA1 9c22cfe23052d5676dca41e33e669f2c7a8b650f SHA256 f3aba971170d17e47c594e5bd89ba1a0cfc7939f777cd7ca10a8f08e51348460 EBUILD smplayer-0.6.9.ebuild 2559 RMD160 5dec7b33269b7fef6ade928df0be224232f1a1bc SHA1 838c5877a376b5f3a004175833e3fdbdb037ba00 SHA256 00306f46e88c9c1eaa617b788f9dfc2a99150c8e82ecee54e0b53d9edd0fd1ae -MISC ChangeLog 13417 RMD160 7f32d69aed94e8eb31fbe5bc79e39d82e8633586 SHA1 f0460a3b83f024cadfc5e391c3efbda27a552ff8 SHA256 3e34c29627c8a62dfa10242f363dd81baac78e18de09389577a3285b8dd34454 +MISC ChangeLog 13573 RMD160 92044cc675a8d80b5307a1051147459598bf10ec SHA1 1156253e4b43b5846c3209292a65432a6b50bf3f SHA256 467e8dba2ecf4e3d762ed4e555e8d40584ae8850494bca5c9088e609e94942c4 MISC metadata.xml 174 RMD160 0a13b88e8a29e1544788c6a992ec89f0596ce194 SHA1 aba42874330898fd11455305dc72f5c3be472565 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6viRkACgkQkKaRLQcq0GLvCwCfVnR5jSOV7pZWkNn7TGOGDAtd -UjwAnRcVoAMm+yVnubExlwY2AZy44gl2 -=UjGA +iEYEARECAAYFAk60HVkACgkQsAvGakAaFgDGhwCeJleQRUcZPLvS/pApAGLqBkwa +4CYAnRzx/+Iv/jDRuuW8T4TIkKUb3FLE +=OVRT -----END PGP SIGNATURE----- diff --git a/media-video/smplayer/smplayer-0.6.9-r1.ebuild b/media-video/smplayer/smplayer-0.6.9-r1.ebuild index 13bb372c8e7e..495655a38371 100644 --- a/media-video/smplayer/smplayer-0.6.9-r1.ebuild +++ b/media-video/smplayer/smplayer-0.6.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/09/17 00:10:13 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9-r1.ebuild,v 1.2 2011/11/04 17:14:02 sping 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 @@ -31,7 +31,7 @@ IUSE="debug" DEPEND="x11-libs/qt-gui:4" MPLAYER_USE="[ass,png]" RDEPEND="${DEPEND} - || ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2[libass,png] media-video/mplayer2${MPLAYER_USE} )" + || ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )" src_prepare() { # Force Ctrl+Q as default quit shortcut diff --git a/media-video/smplayer/smplayer-0.6.9-r2.ebuild b/media-video/smplayer/smplayer-0.6.9-r2.ebuild index 6f3827511587..f7bdf69d5e07 100644 --- a/media-video/smplayer/smplayer-0.6.9-r2.ebuild +++ b/media-video/smplayer/smplayer-0.6.9-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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-r2.ebuild,v 1.3 2011/11/01 05:50:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9-r2.ebuild,v 1.4 2011/11/04 17:14:02 sping 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 @@ -32,7 +32,7 @@ DEPEND="x11-libs/qt-gui:4 dev-libs/quazip" MPLAYER_USE="[ass,png]" RDEPEND="${DEPEND} - || ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2[libass,png] media-video/mplayer2${MPLAYER_USE} )" + || ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )" src_prepare() { # Force Ctrl+Q as default quit shortcut -- 2.26.2