[media-video/lives] Version bump to 2.0.5 (gtk+3 version) and drop old.

3 files changed, 33 insertions, 19 deletions

diff --git a/media-video/lives/ChangeLog b/media-video/lives/ChangeLog
index fa4fa41..3961ae6 100644
--- a/media-video/lives/ChangeLog
+++ b/media-video/lives/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-video/lives
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lives-2.0.5 (07 Jul 2013)
+
+  07 Jul 2013; Dustin Polke <DuPol@gmx.de> -lives-1.6.0.ebuild,
+  +lives-2.0.5.ebuild:
+  Version bump to 2.0.5 (gtk+3) and drop old.
+
 *lives-1.6.1 (23 May 2012)
 
   23 May 2012; Dustin Polke <DuPol@gmx.de> +lives-1.6.1.ebuild:
diff --git a/media-video/lives/Manifest b/media-video/lives/Manifest
index fe89fdb..9e0d3d0 100644
--- a/media-video/lives/Manifest
+++ b/media-video/lives/Manifest
@@ -1,8 +1,8 @@
-AUX lives-1.4.2-config_doxygen.patch 1107 RMD160 b4a7312838e0138ada1938da27cfb13b5d40bf70 SHA1 1259c29b6d2beacf52bfbae4fbba732718f453a4 SHA256 2c486b0e73ef44b91d0d8fc09bcb3eb053f89fcead76664fb964cb0ed3a7573a
-AUX lives-1.6.0-fix-typo-callbacks.c.patch 399 RMD160 c33edff34c16d9bf3e46902799d2694a4609b9b5 SHA1 df08f238c19c9cb48f5590ab6eecbb8b214ea64a SHA256 dce371dddb1e57864aacac476b1d318d71077b54ff94f3cf8cbc13dd03fb9f69
-DIST LiVES-1.6.0.tar.bz2 3323458 RMD160 8a046fc8dd63041c4348e6fd3acbe5dc992253ac SHA1 098c0a4a7947c8d853aeb250d7b2b865f7ea1c24 SHA256 7c1928d87dafc31d13c362201260689ce7e78bad90b155825527a13011fb14dc
-DIST LiVES-1.6.1.tar.bz2 3372854 RMD160 1f9806f8eeb27ae5916ef426c54b938ad17103d7 SHA1 349f8fcc12730abd66dc738de15e981b6b5edc14 SHA256 cb0dc4e909e78db79e33f3dbd0464522cdc494442bd79670d05756ad4d5b9cb7
-EBUILD lives-1.6.0.ebuild 2045 RMD160 2d19ec34322944e30c683815b8e6660408a93758 SHA1 af0b811a36fbd3c1361b8de747ea69822e945ba5 SHA256 8451466659afcb2d6a276841dbd5672e78d97d94fd5264ce929af56c37489aa6
-EBUILD lives-1.6.1.ebuild 2071 RMD160 bf5df172022dc25c7137a2863505d91e38ecaf5f SHA1 b42828bd25a1f6825d185bb2e54a9f9180666b2c SHA256 32ab8981c9defb7b3ac01735e2d394372912f5967ce53d36c627ff3008d99934
-MISC ChangeLog 2146 RMD160 c4932fc5b76f03633452b6fc7fa84bce12e62f53 SHA1 8a70e184a3625e5314b0af344cc2252d3ba70559 SHA256 dc6d5ef3d8cd43b9fe390a131229c6d698c03b5036816ff480eb4a83f67ede29
-MISC metadata.xml 353 RMD160 0584fd4975022e8b387120972780d6f103e128f3 SHA1 0fff4992e774bee0f421d220cb289a9950fcea85 SHA256 1b6cbbf1654efc9e3faef54758a4d096a6b5da88b4c93e8acbfab9d0eb4e3e8b
+AUX lives-1.4.2-config_doxygen.patch 1107 SHA256 2c486b0e73ef44b91d0d8fc09bcb3eb053f89fcead76664fb964cb0ed3a7573a SHA512 fa0cd372ff72a758c163d279f689923c48a82f039c83e0793a750c1f65ea0b3824515e32b109867816aec112aee74e008ce7f51c1cbb8b732bfa3753de4e687d WHIRLPOOL a07d4e83fd65705877849339058123e1d5c6fb3d3030d279d17aa7298194bcd7fc483d81d39e6bb9952a72aefd6f611403531991f3f1a2561b68007822541a8e
+AUX lives-1.6.0-fix-typo-callbacks.c.patch 399 SHA256 dce371dddb1e57864aacac476b1d318d71077b54ff94f3cf8cbc13dd03fb9f69 SHA512 d6aabccc70939565632383839eeaa9fd8e4d50af04298fd6ca9caafce8323855a41eab99c89799f27148df40f52e4b6a5fd64adb0fe54493ded2c17581821708 WHIRLPOOL 716550a7bc33f4f91a7bd24c75800c67f30c446540ccdd4c19b04152c6f78140bf7b841cd6f36a42fb9d4f7551a2f23eaaeaa06552c71146c0bbff9cfe84c866
+DIST LiVES-1.6.1.tar.bz2 3372854 SHA256 cb0dc4e909e78db79e33f3dbd0464522cdc494442bd79670d05756ad4d5b9cb7 SHA512 c84ae4e94f306ff166989445b6bf6bc463e5f9a0fe0dee9fe6d70d3eddb518102697c94da7a8a2059d45a66f3696272367e7229d209b3f0f249eb35c79fc3d00 WHIRLPOOL 5a5aa873d9a45da4495e62970102ff3da6830360c70838f15f0203eea31f11260d873e99724bfbede4b2ff7ea68441c8311435c172bcbad522a7193ebe3aea4e
+DIST LiVES-2.0.5.tar.bz2 3518054 SHA256 28c75b035594f4a3490fb4f4dd419cc02912ca20ec456cbe957b226df2b24f78 SHA512 ec7610bb3769e59b50b352f0c718a50794ebe8dffd0a8890d9ea1ba6ea4b5302197e3e7308686d0fcc37fdc731eda4e316547bb6df925a7b66fec693f6ed38d3 WHIRLPOOL e6c976318ebb0b6a0da1cad6736106ca4f8ae3a01270a81869531b19330aea908c4d753ae68daa0e6a140952a757c5c4760a9c9625d4e12a16d4bd45211a2557
+EBUILD lives-1.6.1.ebuild 2071 SHA256 32ab8981c9defb7b3ac01735e2d394372912f5967ce53d36c627ff3008d99934 SHA512 a56148d8bef2224ba0410835d9ee5cf166c6e65f6f36aba2e73b79e4aac604edfc1c3d357af1e9b6ab97017addc918bb42fb3cf6017618bd4a0e8f3ab59b1a37 WHIRLPOOL ea4a3472ab8e78457859a9a155a5e771b88040833ec016388feea50436ccac88c643bbc1612c4d5fbda832b767da1cfb923c7b6b5fa321b13e4c1aff0e8df0bd
+EBUILD lives-2.0.5.ebuild 2190 SHA256 95764607982e2a3667390b304ea486ca8ae89811932f7aecf942fce798461c01 SHA512 cc79c8b5dd3ac4b3acb069874307229dfa6fcdd818952076ebc247afc57dc9d56f61c520ef8fcb9559ca5bf1eb41084c3924e2e9dbac203a982861b5d464fbd7 WHIRLPOOL 8b34b9dbc2b9b330d05dd00ed05994ef5bf144bdc7e1f25cc3757731c692fe5b28239eb4ffee913a50211c0a8296c0b340803ad6f88f83dc271920140e10220f
+MISC ChangeLog 2308 SHA256 04e854b7ed7261d9556d1309b934eb3141e335b5658ded14b55f93d7caa8bff3 SHA512 a71f71fa3c1f45b047514135c51bc37e9a1e3b668a5a0d53ca34c86db349335ee8e3869e7351e89c9f2e065e660775943dcf9c2bfe0ccab5d07e23379289527d WHIRLPOOL 54797b2becbaa2a9ee3472245f74e084fb04294c2d652e84dc117cbc2e9a89d69601a942b9052990e5c43f84a67db50f5087a0e81de1a8fbcd3c2f410322206e
+MISC metadata.xml 353 SHA256 1b6cbbf1654efc9e3faef54758a4d096a6b5da88b4c93e8acbfab9d0eb4e3e8b SHA512 ff2e33059c42d2830b918a0b19874473f29814eed00d91c25ba16086d0ebf79ff7a11246334d9db1b10e92838c3c358143167b83faef6576fd00ad1ce09ce297 WHIRLPOOL 8e02a7391078c472c3bfe68323749a1644e23e827b3706d14faf028819c2048dc41700313b1ceb6ec0d97499e34a8f355d1b716baec78cb463ad70aa0d74794c
diff --git a/media-video/lives/lives-1.6.0.ebuild b/media-video/lives/lives-2.0.5.ebuild
index 06d85b7..4def4ec 100644
--- a/media-video/lives/lives-1.6.0.ebuild
+++ b/media-video/lives/lives-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,18 +17,19 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc libvisual matroska nls ogg theora" #static-libs
 
-RDEPEND=">=media-video/mplayer-0.90-r2[encode]
-	>=media-gfx/imagemagick-5.5.6
+RDEPEND=">=media-video/mplayer-0.90-r2[encode,jpeg,png]
+	>=media-gfx/imagemagick-5.5.6[jpeg,png]
 	>=dev-lang/perl-5.8.0-r12
-	>=x11-libs/gtk+-2.4:2
-	media-libs/libsdl
-	virtual/ffmpeg
+	x11-libs/gtk+:3
 	virtual/jpeg
-	>=media-sound/sox-12.17.3-r3
-	virtual/cdrtools
+	x11-libs/gdk-pixbuf
+	media-sound/sox
 	>=dev-lang/python-2.3.4
-	>=media-video/mjpegtools-1.6.2
+	media-libs/libsdl
+	media-video/mjpegtools
 	media-sound/jack-audio-connection-kit
+	virtual/ffmpeg
+	virtual/cdrtools
 	sys-libs/libavc1394
 	libvisual? ( media-libs/libvisual )
 	matroska? ( media-video/mkvtoolnix
@@ -36,11 +37,18 @@ RDEPEND=">=media-video/mplayer-0.90-r2[encode]
 	ogg? ( media-sound/ogmtools )
 	theora? ( media-libs/libtheora )"
 DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	sys-devel/autoconf:2.5
+	sys-devel/gettext
+	|| (
+		sys-devel/libtool:2
+		sys-devel/libtool:1.5
+	)
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-config_doxygen.patch
-	epatch "${FILESDIR}"/${P}-fix-typo-callbacks.c.patch
+	#epatch "${FILESDIR}"/${PN}-1.6.0-fix-typo-callbacks.c.patch
 
 	# Don't try to detect installed copies wrt #295293
 	sed -i -e '/^PKG_CHECK_MODULES(WEED/s:true:false:' configure.in || die