remove old; prefer mplayer2 (bug #452440)

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64

5 files changed, 11 insertions, 181 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 75d6dc6e07d8..e474290baa2e 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/smplayer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.125 2012/12/23 15:02:45 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.126 2013/01/16 19:13:40 yngwin Exp $
+
+  16 Jan 2013; Ben de Groot <yngwin@gentoo.org> -smplayer-0.8.0.ebuild,
+  -smplayer-0.8.2.1.ebuild, smplayer-0.8.3.ebuild:
+  remove old; prefer mplayer2 (bug #452440)
 
 *smplayer-0.8.3 (23 Dec 2012)
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index bd66bed48260..75c9ceaa4248 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,11 +1,7 @@
 AUX smplayer-0.8.0-quazip.patch 2915 SHA256 ac1e7f6301d14df624c13219397958d2f5ebee3c3f89f46cc9651e9413548bd2 SHA512 a642720f4db2a705ef6380212c6658a8ef34ec34319e575630750b614516f430ce91d40a47989980e695f9e0e6ada031da3ea8608e16c11112e94d5b8ccb6503 WHIRLPOOL b055fa4c97da7505a66e9b4061e0fce4609dc0f68691670cacdd9890cfa68098df11b1ae66ed153ba1c47e58f5786bee4ab4a4fdbf261eca17bcc43f9b722383
-DIST smplayer-0.8.0.tar.bz2 2815007 SHA256 208ad155da3bbcb3924549c7ba81aa7280b59adfdb92adbec5ac7ebc2944576f SHA512 471dd55cce745b89a1d00d823da64bd23881a2b1e45e49b8578323aa3562de8592ed929f166b2b81fd6eefcb71f41144cf7a3678772198414d716b89f75c1bda WHIRLPOOL 7ac387622afc79ca401db981d396801c4a69fd6daa576f31cd18f7910336c0a28f908c22a02dabb043c61568b76ce0ccd21d767ff63a50369c5a420f6b4212bf
 DIST smplayer-0.8.1.tar.bz2 2813484 SHA256 15eccd13e68cee4d564d319e2ae238f19c6445a98c721c573f55502fce618d6b SHA512 3e2afdfb9ae14ce22ff4be36673db328295ee79538fc41bbff2296ee4d050534054f35e13d16efdb2fe40cae1d2874678b614357b3714fde55508e3cae810556 WHIRLPOOL b847b104979ab8d8ca85c9408665fcc3dd30567367635ed8d1d4f56142634160830604f5af6540f05c15d919a675bfb48e43109c3e0c2767da172bf4447d6d19
-DIST smplayer-0.8.2.1.tar.bz2 3153872 SHA256 52353203f6ecada9832b620a0a82cb3dc4a57a1d909775c6aac4a90b6c51f4be SHA512 4124486449209a1bc66546971d42bc40f29ffd1eb00efab90849bccb15e1f934f4167a8ae6c0cb32069e1e63867b5bfbbb8de66d9c8c19f2e471d352a015df8f WHIRLPOOL 60feee43bf0cc40fc99715e09b746f8e8cf50eca0f4fda75598abc8ece83a7a0d217a7d046898860ad13870af8abce907490f7ae9bf076a3e58520cd75c6d06c
 DIST smplayer-0.8.3.tar.bz2 3201389 SHA256 835141111697c9e5b68b6dc5c96b4b38c1c0eed41f02d42ff1467e932a996435 SHA512 14d1830ce4ff3f4bf4b7f6cce1c74c84edf11dbe43fad540b9919a9b06aa148ad22c8a13498a2a61b576677c27b44482d52accf5f5c89294c4e0d7a3eba46252 WHIRLPOOL 7a1d52c0f3b5f6e7d47b1d9b8716ce9f561036697a2ed63b2d6440eeb7b010b68e0476fe8821b931e435644c73aa02428d2b84c59a8f1e7a257955a727407a6b
-EBUILD smplayer-0.8.0.ebuild 2246 SHA256 fafbff169dee6f92fcf3c4c633e5e393285ce2bfbe1bb374cc8c9c7ae61a9b72 SHA512 1b41fbed2ed91d10e7126353a027dd709b7d327f0fa319b48597c97137caeac9ce3f719a838fee522036a705f4cd991fd686dbbb83018e5787a00ac3b9c7348a WHIRLPOOL d7b8118b53ddf915cf48846cd05bb741c07f662ae820ef870b6834e29b4de9fc111ac3ba48e8ae2dcc5cee6042da286e0605dcf9f1504145fc48f63a2e062fce
 EBUILD smplayer-0.8.1.ebuild 2189 SHA256 bed19b90f3e7cc29a8322e23198459a9b78f9bc3ce99cbd5b576e0ffa7b92c86 SHA512 d48f22e76b58a799b296b73be14cede08dd8b418ef9e6e8ffc53db9cd93c698f4096a4cfb2f792ba85c7a606bc910db2e39f6083153d8c10a55fb22d0217738b WHIRLPOOL 43a4c7e4af673347518934b6323b49dc1e0e4d136d3208e2755ef8f01c02d16faa42588350b109f9ae9d6e882d21fc646f27970c38d36ac57d7bb718c0a9301f
-EBUILD smplayer-0.8.2.1.ebuild 2219 SHA256 c080a6bf900b7c8866400878edddfb44307ade0ca2b84eed2d0d59c7ed6257e0 SHA512 c7c0eed0d41e1858f3885e300cc945d20c150c476607f123468b2545469333527bcc56ceca03c7ac44799381abd50f90abfbfe9d44a61a7c1565654895664eac WHIRLPOOL 5ac43ddb0e012aa980ab8a3321b1138f4942f0d805b395bf219cbf7392c84b6019d7023c51f19d2246025caa8ae7521415592ff12b8544b4290c1e97a68d02f5
-EBUILD smplayer-0.8.3.ebuild 2220 SHA256 7da3b22d5310d69ed2ec8e125a1d9fce1fc7f93d4930213cfbee77542308f1bb SHA512 c61e8dd16a3799cfafb8f7fa6256135ec18b7bf37a9c046e2225064390d838a3860b49db2d98a1b38ab577a0f81929093f751ba223ec34fbd2d8efeecc6faa20 WHIRLPOOL 6ca52be59feb64edbf4cb7e6ec6acbb095d0a0a2195381822b5c99515b78a00c0870aebacd7835f554e050e39c6fb7c6351149ac889b6d198a2070f859d6c7d4
-MISC ChangeLog 17131 SHA256 457f4649f2562ddd7b2b86c998698f87c26ef37cbc0e481d7fb08816f400cb9c SHA512 3f5593f23b449b9729ce03edcde8174d125024e643cbb5f486a9458784a8511af3cc74bd8cdba855588ae07d5673b593b24c95f8c55a864d5fcae044e25e7c12 WHIRLPOOL 516397865f205e675efe7e27eb0980ed2e3807e4c983e77445a0d27b1f0ebe2a1682ca7172e47f09cee0e4330575b5960f67cc1931cd33ff8bbabbd4f4183e93
+EBUILD smplayer-0.8.3.ebuild 2220 SHA256 b167ffedf713fddb0c3e4dcab4bdeaa80c1dc20751bb4fe5581fbf4a0588c6c5 SHA512 b5f34641109190e1586fb441a9c13859c961b16fa9b976dc32a2ef3194a2e3d626bfe1a33ddcea0aa82377b230007d430708cf4f88ce6f7b8b325ebeecddb98a WHIRLPOOL 9bc7dab9bdf63a173ba817141650fd0c19a524a3e095974167c1ad80082ed50dd451df1f88fe1d342a91e5c82e1cd616954c7facc2253adabc4812682873a98f
+MISC ChangeLog 17299 SHA256 72ff62400a88b4a40c720f449065e9596f819132e1a4e22f3ada8eb5ac0a5ca7 SHA512 c841f9dfba2991cde9c55fdfdc1fbc056d2819e596f352c8d13108418db404a1539eb77b1ad25dcc42dfd8f2be32b97272597538b073a6edcc5b11a2dd615e36 WHIRLPOOL a98526d4a5a22f1d4159312da7366bfe28724e64a0b09b24ba4830212abe5b7254d3cefcc75794260002105b6ff15787c268c879702b9d2a28bcc4ce97a32ca2
 MISC metadata.xml 174 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa SHA512 bc396506ea847d6a36e400a86b8a575a46d075da58b57a4b085e12ac242e210a7a55c4e8b3da567b97c0e5a8bfc682bb5546b3b657c2f92f6fa00da674bb7062 WHIRLPOOL 0e82e9ab352222683df9da1682d9cc03d2123786218c74f31ac487417100408cd5737aac3355e96f68388ddba76b3a1ea2f4bcf50fd4ec55c87fb6bfd20a5fee
diff --git a/media-video/smplayer/smplayer-0.8.0.ebuild b/media-video/smplayer/smplayer-0.8.0.ebuild
deleted file mode 100644
index 295015d85cab..000000000000
--- a/media-video/smplayer/smplayer-0.8.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.0.ebuild,v 1.8 2012/09/13 00:26:26 blueness Exp $
-
-EAPI=4
-PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl hr hu it ja ka ko
-ku lt mk nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv tr uk_UA vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit eutils l10n qt4-r2
-
-MY_PV=${PV##*_p}
-if [[ "${MY_PV}" != "${PV}" ]]; then
-	# svn snapshot
-	MY_PV=r${MY_PV}
-	MY_P=${PN}-${MY_PV}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	# regular upstream release
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc64 x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4
-	dev-libs/quazip"
-MPLAYER_USE="[libass,png,X]"
-RDEPEND="${DEPEND}
-	|| ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )"
-
-src_prepare() {
-	# Unbundle dev-libs/quazip
-	rm -R src/findsubtitles/quazip/ || die
-	epatch "${FILESDIR}"/${PN}-0.8.0-quazip.patch
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
-		-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\):\1:' \
-			"${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
-	cd "${S}"/src
-	echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
-	eqmake4
-}
-
-gen_translation() {
-	ebegin "Generating $1 translation"
-	lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake
-
-	cd "${S}"/src/translations
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of GPL
-	rm -f Copying.txt docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
-	rm -rf docs/{de,es,nl,ro} || die
-
-	# remove windows-only files
-	rm "${S}"/*.bat || die
-
-	emake DESTDIR="${D}" install
-}
diff --git a/media-video/smplayer/smplayer-0.8.2.1.ebuild b/media-video/smplayer/smplayer-0.8.2.1.ebuild
deleted file mode 100644
index d6bfba3a8211..000000000000
--- a/media-video/smplayer/smplayer-0.8.2.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.2.1.ebuild,v 1.2 2012/12/10 13:16:04 ago Exp $
-
-EAPI=4
-PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl hr hu it ja ka ko
-ku lt mk nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv tr uk_UA vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit eutils l10n qt4-r2
-
-MY_PV=${PV##*_p}
-if [[ "${MY_PV}" != "${PV}" ]]; then
-	# svn snapshot
-	MY_PV=r${MY_PV}
-	MY_P=${PN}-${MY_PV}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	# regular upstream release
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	dev-libs/quazip"
-MPLAYER_USE="[libass,png,X]"
-RDEPEND="${DEPEND}
-	|| ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )"
-
-src_prepare() {
-	# Unbundle dev-libs/quazip
-	rm -R src/findsubtitles/quazip/ || die
-	epatch "${FILESDIR}"/${PN}-0.8.0-quazip.patch
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
-		-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\):\1:' \
-			"${S}"/src/smplayer.pro || die "sed failed"
-	fi
-
-	# l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-src_configure() {
-	cd "${S}"/src
-	echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
-	eqmake4
-}
-
-gen_translation() {
-	ebegin "Generating $1 translation"
-	lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake
-
-	cd "${S}"/src/translations
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of GPL
-	rm -f Copying.txt docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
-	rm -rf docs/{de,es,nl,ro} || die
-
-	emake DESTDIR="${D}" install
-}
diff --git a/media-video/smplayer/smplayer-0.8.3.ebuild b/media-video/smplayer/smplayer-0.8.3.ebuild
index e0021a037130..28da47338a50 100644
--- a/media-video/smplayer/smplayer-0.8.3.ebuild
+++ b/media-video/smplayer/smplayer-0.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.3.ebuild,v 1.1 2012/12/23 15:02:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.3.ebuild,v 1.2 2013/01/16 19:13:40 yngwin Exp $
 
 EAPI=4
 PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl hr hu it ja ka ko
@@ -33,7 +33,7 @@ DEPEND="x11-libs/qt-core:4
 	dev-libs/quazip"
 MPLAYER_USE="[libass,png,X]"
 RDEPEND="${DEPEND}
-	|| ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )"
+	|| ( media-video/mplayer2${MPLAYER_USE} media-video/mplayer${MPLAYER_USE} )"
 
 src_prepare() {
 	# Unbundle dev-libs/quazip