Drop media-video/mplayer2 dependency, as that package was removed from portage tree

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 2f004c3e6e223e9c10c1cf4b4623dda25a6f511a..87d58f9bf24d657a6c05dbfe1686a371ff2599da 100644 (file)
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.163 2015/03/22 06:18:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.164 2015/05/08 05:25:55 pinkbyte Exp $
+
+  08 May 2015; Sergey Popov <pinkbyte@gentoo.org> smplayer-14.3.0.ebuild,
+  smplayer-14.9.0-r1.ebuild:
+  Drop media-video/mplayer2 dependency, as that package was removed from
+  portage tree
 
 *smplayer-14.9.0.6690-r3 (22 Mar 2015)
 

diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index a0dc2d799234e3d09524e506e262e57be7b158b7..a3cd96808ff89a21edc4a4ee72e1f572f5cbe02e 100644 (file)
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -6,27 +6,19 @@ AUX smplayer-14.9.0.6690-zero-bidi.patch 410 SHA256 b1dc553f744fdbeddbdf3cc25012
 DIST smplayer-14.3.0.tar.bz2 3675657 SHA256 9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18 SHA512 11ccb390b220a8cf978f9059ed04871c68d91db2a234b7d42a695e17d2bc1ff108d0696439fc148637a5af6d9189fc19cf51dad581c6f59fe84361aa49db4faa WHIRLPOOL 6702e140527c95f5dc284c29fe6e49ac16b01af8162393f20d53ca7124abc9420d20ad3e704f7da79dc5e4341f282ab0ab48389f45dc3e481d2a76f19ea32180
 DIST smplayer-14.9.0.6690.tar.bz2 3813209 SHA256 5ec8a1d2912828e9b19f800e338029e6757fc30e3974cf62a21b67f46632bc5a SHA512 68f5a1ab162e5e722a6058b7e4724201dd37212591174d7045b1cd1a9a32a4a224006a5df3bbade47d6bca951725b5b2ae7c8630cd9baa3cecc57aecb550d882 WHIRLPOOL 67504ff5c475dffdd71267cc533e21afbf27c0c8746f295aed41a276d1747025164d1d6953042b8b0eed3161fd54f668306714a4591b20b4f3946fdd6004fc84
 DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
-EBUILD smplayer-14.3.0.ebuild 2156 SHA256 bcae6caed7f025bf9cdf96c5b352ea06a6b6c93e8474d2e7e8351779e553f052 SHA512 1e5cd636d3f5c204702b871274ebbfc25d2073a7a2208474e409094688cfc58d887a382d0c057426e4828d45a5b8cac95ebb204e33e2228117634f661c056587 WHIRLPOOL cf99299f71a139bb7e6ff7ca1811b2175d97d33f8bbd8e0479ab9118659c0f6c4af1f96535f7d4954fb0bdc716160429a00dd582507eff6b42cf913a350a1ba3
-EBUILD smplayer-14.9.0-r1.ebuild 2490 SHA256 c056216c5ac57e8ef40dfd9896206272a2c4a0268aa82d52f0468765c1911d91 SHA512 6cef8e864077062de8b1c1eca6b7ec5433453f6bd108db1c031fa8f09ae18ccd62401e8eed175e6c1c0a9030e3820bf535aae75c82d5b782c2d2dfc11a417c62 WHIRLPOOL 54c2534e27226ebe20505d65b4c57dfc6e995da472070ab6b758e79ec5662be15851d8cc45bd97ffc6682ffebedaf6d0d388f444367f8927b59646e653fc41f9
+EBUILD smplayer-14.3.0.ebuild 2114 SHA256 9367453934dff2ea3bf2dca5a43d1b65f75e9f3f80386becd66099a3ccfcc9c2 SHA512 1721f2eb8a2b85efe66f88dabb496624d66302f7a1cf017c1da3c92f42d711fe354f708e11b0c58e443d42144cbef5eef512498a54bbd7d3d17a8856fae74fb5 WHIRLPOOL 50a624540283089cfddfafa7c30ba3c9dd975ed93e149b0816b276cbb1d255440746afcd06012948b6338aea245d682b8f2519d21e71f7fb31d99ea837dabcfa
+EBUILD smplayer-14.9.0-r1.ebuild 2448 SHA256 9c278510270219338929f50e8ab6d3582faf08e3428a0e3eb3e3d1cb34c4b774 SHA512 d5da4ec07ca1c633dcc3249acf0c9a34908caafabc0f422ace91be7b95ab77a7f9a89536470e5f6fb775ed4aeab041e2b767ae6cd18002068140b71c27945565 WHIRLPOOL f78300f9a4431d916995b8e3e0d265206a73e6e7377ae0cb2fbb376eca6c249e3ebc4ed335a0233756512f8b0aae938074d42764999bc052cf372726a268078a
 EBUILD smplayer-14.9.0.6690-r3.ebuild 3226 SHA256 c2d21a64bb46320751094988d9f2944ed2e1a63fcb3c57a2f5573c3256e1ffb9 SHA512 3ca8ff602afb1f9be636a6784288b886bd58ec98c29077507c23f2670ccbe933689b1aab49ff04c01099b4fc6651f975eba931e792ebc355ed2d92e87896fc2f WHIRLPOOL 583d8daa614f112f865e172a0ceda265dec8fa442cde28897527c9157bb8bfe371887a946ffcb1d9f26997909f8c90a1b66ee0117bb9116208cccea453db3012
-MISC ChangeLog 22938 SHA256 70cf41b7a0ca60d09f8e2c83cc10668c4fae8cba41e0b2c45dfe9e5665d67379 SHA512 bcebcb5a8335b1c238382989ae81013ec62602a671b0fb7794100923194f32a127a304734c35f1ca5566ea0494b9d5edd2fae01544a327baed9bcaefbe65fe36 WHIRLPOOL d9f17a4f22ad76db896931752aead609e570eab139d0eb3fcb5b71c0ad2e50901ee3af2680d7d9f67b25a190ca61b052596f4e7f045ac511f1e8671634717e63
+MISC ChangeLog 23132 SHA256 367a05804696337c158c83da30a8f87c8910f2dbfa1c3ff532597b2b56d1a6da SHA512 e9837b31c81afe79e4274367300dcaa6c914602d3bfb7609b131b4b2dfc3f91e01c178ac7d609ce3b43b52bdf600aa4fdee0c513e1a56dc5aac1aa08c90b1a83 WHIRLPOOL 1952fd96b8e75da4b56e6f2185aad3fc2b2261f57cac827c59c2d618da182b7b899a6fd9a413fa4363e79d79ea03eb6b40ed55764f87faaea154f4f1b0b949b9
 MISC metadata.xml 505 SHA256 ca8bb6982e46f56f34350483c91999e947f0d30aae50bdb75dc7f8fba8e76e1b SHA512 18a3dbf2bea045c321945434a0933468d27b40cc0984d0c439a6726b25cbf978c9f9886aa09f7dbfa6c0176477095e5c5ddec4267ce52478cc92d053f0697f18 WHIRLPOOL dd5ae89b730a16d4531adc640df01b4d01fad68d8b7018f35e7dfefff3dd30c36cb6d2b3e8ff6d0332de8e639ea850985d5388435744dcbdff8f255822d4e0c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVDl6oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOT44QAJS0D1+1eIA+JIZ+pyGoEamA
-QUD/FZ35S0CfDGHuCjiIRcD6NdAfU3s5dBYZGz3rv+zkYQbDoe1A7wfMbw9nIJ+X
-jr78aodVSTRMGw3pSi1sXfkFhiwSxgnA+KAKV87sQFQ+bH4q+AXZCgDnb4HeFGGB
-2j3T1z5Gmo9oh2yF/CupDwBbm4dvY7mc2Zfh66bkKW9baS0OmR3c9VQDTv7eGfGO
-TZvNycItDUDPPJZm/P9EaTImekdwN3hNmPDfBR8lvq76AUHb84I1V+iyY6Nxqaqw
-ey2E0z4NpMtP2B0rcm/ozRd4T5DgLZkCpQSrsl97cE7hByEva6jgFaMjrddi26ju
-z0Fde6p4tdwjz2ZqnQi992SWrp01XeKEkr6RX33irGHbMwB2EtvkwerMa5hmxcpK
-CZVjh0IAmXVySM7iLsKkeMPZSConxQtYxMFifLntzL4v3Kme7q2BOYy4vs8/FBdT
-9h8amUnKzFLp2Vqlv7dYCIvP5wDjmiH488SGuvO68yaCXlv00Zqxl914PUGCKAew
-n2ZMnoMkzZsDEb/X8OcIyZNiEiYwqOh/x1p5Tdn21Ccz/rX1NTHeT/d8MJue5xJp
-Zw0SG8fSRuOBmjkJuG+q3jixnhpGUHTpWCOcLMBYEgERFDepk4clw+VP8/tme0Gm
-A7Z1kJzMdbiTYleJuLEj
-=9on3
+iQEcBAEBCAAGBQJVTEjtAAoJECo/aRed9267ARcIALj38svezkVzU9Sh0pnDtb+0
+ry5neo6+93NiCPBoPudeeG7UKTZCnywNxs0ysE2RJXIq0jGbq8+7z+MJ9NMttpIV
+2iPNtUkaY+u0B2BHSlBmfKQgd6GH2tyRtofxpWXsqV4OAmUjCrMi3tedFKeGzMFy
+2wVDmy7DvybWXArvgl3K8b/1dxVqIXf84PWslTIQrWv4n+zTrW8tBAhuSaa93SMv
+XYyE222Ja5NfYFpGg26PMYiFZvkM00R5bvUvyxIFN9bRrbfHenc8WHcJJ4rAcPTH
+Rdfvw0brmEG1DSS+j2zlNyGc1r5ta+ibA1zkxjQhaLWW0g1DlKhT2Hdakhrjslg=
+=svOD
 -----END PGP SIGNATURE-----

diff --git a/media-video/smplayer/smplayer-14.3.0.ebuild b/media-video/smplayer/smplayer-14.3.0.ebuild
index 82370fd87de33c0a4927eba06938b8e3f3f7bf6b..d9ae44f36849a25f94c9abd5503fea9d4bcf530e 100644 (file)
--- a/media-video/smplayer/smplayer-14.3.0.ebuild
+++ b/media-video/smplayer/smplayer-14.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.3.0.ebuild,v 1.7 2014/09/29 10:05:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.3.0.ebuild,v 1.8 2015/05/08 05:25:55 pinkbyte Exp $
 
 EAPI=5
 PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
@@ -23,10 +23,8 @@ DEPEND="dev-qt/qtcore:4
        dev-qt/qtgui:4"
 COMMON_USE="libass,png,X"
 RDEPEND="${DEPEND}
-       || (
-               media-video/mplayer[bidi,${COMMON_USE}]
-               media-video/mplayer2[${COMMON_USE}]
-       )"
+       media-video/mplayer[bidi,${COMMON_USE}]
+"
 
 src_prepare() {
        # Upstream Makefile sucks

diff --git a/media-video/smplayer/smplayer-14.9.0-r1.ebuild b/media-video/smplayer/smplayer-14.9.0-r1.ebuild
index 942cdc0db4a19e3afd7e92f03f951812615e7855..20f4d631f4c35b5990b1e1721fa6cd094ed94b4a 100644 (file)
--- a/media-video/smplayer/smplayer-14.9.0-r1.ebuild
+++ b/media-video/smplayer/smplayer-14.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0-r1.ebuild,v 1.4 2015/02/25 15:44:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-14.9.0-r1.ebuild,v 1.5 2015/05/08 05:25:55 pinkbyte Exp $
 
 EAPI=5
 PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
@@ -24,10 +24,8 @@ DEPEND="dev-qt/qtcore:4
        autoshutdown? ( dev-qt/qtdbus:4 )"
 COMMON_USE="libass,png,X"
 RDEPEND="${DEPEND}
-       || (
-               media-video/mplayer[bidi?,${COMMON_USE}]
-               media-video/mplayer2[${COMMON_USE}]
-       )"
+       media-video/mplayer[bidi?,${COMMON_USE}]
+"
 
 src_prepare() {
        use bidi || epatch "${FILESDIR}"/${P}-zero-bidi.patch