5 files changed, 24 insertions, 73 deletions
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index df94f98af262..f151fde7c9ef 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.80 2012/08/07 18:11:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.81 2012/08/17 12:50:37 scarabeus Exp $
+
+  17 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/kdenlive-0.8.2.1-qt48.patch, -kdenlive-0.8.2.1.ebuild,
+  kdenlive-0.9.2.ebuild:
+  Stable on x86 wrt bug#429144. Remove older.
 
   07 Aug 2012; Agostino Sarubbo <ago@gentoo.org> kdenlive-0.9.2.ebuild:
   Stable for amd64, wrt bug #429144
@@ -316,4 +321,3 @@
 
   18 Mar 2004; Marc Hildebrand <zypher@gentoo.org> kdenlive-0.2.4.ebuild:
   Initial ebuild
-
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index a27960c62355..8182f8314e92 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX kdenlive-0.8.2.1-qt48.patch 344 SHA256 10060c39d870f20f6b74a478914d67a7fb087771a9e258faf53665f304758256 SHA512 c17abeca0a064945a7ae888620fa83e5cf410d0218aa208ce00d06f66a41013f123befe8f290a13b07e322e2f68a470fc239e5a5d98c93c832b4f4b0716908c8 WHIRLPOOL 15f13ef0f33c7d07f342e7480bf79888b92609ffc0b4ebddc0100af669aef04b4dfe8e0cb0d4e28c527d0edf65afccb617190d09323bd3788df30817d0097be9
-DIST kdenlive-0.8.2.1.tar.gz 5135630 RMD160 443ad814827220cd7985cf3160e77f6e6899a1cf SHA1 14c3d17ed3388ef6f90a00f4d5f58934307e3e40 SHA256 a454a0659c9673453800df8382dfdbcb87acfb9b174712ffeb46b8304bf00717
 DIST kdenlive-0.9.2.tar.bz2 5341243 SHA256 410e4261d2300a306be05484559490a7533c4655dfe5caf7d3e883c0800644c0 SHA512 8ce4cc9e5802f5ee42abc06db2ec539f4b8b99c783d59ce72d03b226d79b3e28891b83e049611e00ec889a487e6ef0246ce5325b373c945cac985cef098ef740 WHIRLPOOL c1586f3f9c5a72f7ee018644cdd85dde087cd506fabcd43c126bea4cc39f3a5aa241f4494654ccb5df6ae53eed3e97c234335b7387482b19189514cc08f8f22e
-EBUILD kdenlive-0.8.2.1.ebuild 1018 SHA256 a38a56990fc2a8241f373f87fbb8c03e7b01b77aa3aa3ada2eb18775ba6302f8 SHA512 70130704033734640ad995c37a9ac0760b88bec6035249cf5ca68f63009aab903ceb81b9f5a7dfc27bde148ca85102d14dcfda0651e86e19a644e4879bce3070 WHIRLPOOL dc7d4db33977ef651ff7d687d68fa82f658d422306b3da329c33b4abae6f3ec476179468bc4dc74cb08f52f329a0e5773182629e84a848b2ce98186329630761
-EBUILD kdenlive-0.9.2.ebuild 1043 SHA256 45b2ac35ed0fb8db01701c60c4ff8681435c02b26c56a6c939a181291bd3a8ee SHA512 c9ee5f894b188383a254a2b8e9a482e5249027a66e3b9cabcd28170800a5d5ed7410fc53a62ff993e232003efcc8737d1173c7dac44bc05d46844918b9be853d WHIRLPOOL 4f5ae568f6e240b6bca6a477330733e5492a4e5818a1fffb5e4d50af8fcf1105689ee06cd0095cf7b24a6a155ef6f63088ce928fc56445188a98e1d0eedabad6
-MISC ChangeLog 11046 SHA256 9d7eb2b874e914e19317f56f7ce726e247019ff56215cd4577e4220cbc4e2800 SHA512 23facc678d34237779eddeed68b62a12d8f46669fa56f4dad385f2457ed8ed9f839231c626e42af8274232c1d56b35268c9915cde705a4ecdd683e5c6a8af498 WHIRLPOOL 6485feea25a13f8f6f1f46b782c9a971215f77143b60565cfd5d9082fedfb353c43512a6c4433b36f7d59a7bcdb3981353b593d71353264a3e602f27c3822ba5
+EBUILD kdenlive-0.9.2.ebuild 1048 SHA256 6b6b37dea6f2edd152a0daf12b402b91eae063c3864c5dc9422ce1185994d4dd SHA512 425f3dae910cd55420fee97162e32c346015ffa7b035e055f15963dbb81cb109c5490be82b523862c286ef9faa75186b3d24fd83cb8a5363f65f13d9cb9d54ac WHIRLPOOL 6b367c37559d37a6d418c6a907299fd3a7c2e8df572e2941b02b2024fe10de211ccbeffb2252e083dfcca1882cfd2c92f3d68f5ff79ab16b578353661bf52a1b
+MISC ChangeLog 11242 SHA256 646b52ea30f2596b5462343d420ddb6339b5efd90669fd24a3257343bcb0ae36 SHA512 7135b819d516820ced74bf75a06f851e2e4a491d76ad139bbe082a13a4a9a992aca5d17d4488dac01a841c2845b7c5f9803011f8cbe4ad18139804f5192af4f8 WHIRLPOOL 037940cec854c4ce7f83fc129ea49b8d327a0439e9fac13cd09a152f1c98a75f1c28a0a9ad4bfe081a32ba18059ec6a694a6c3441f42d5e41c3b6a1284fc6dcc
 MISC metadata.xml 242 SHA256 87a89e336f95de812afc49fe66d85bd1c69e2beffe7f822c18aa82031a5804bf SHA512 2263a6238b1f00a7720f7effd4598a7d162f854799a30272fee407eae580a05f26cd94401fb4baf02124f3c8056f297efbe5771b5cb044ac83f26ace03294855 WHIRLPOOL 9de61f84fd036461eb4481f72bac798a79e19968a1eebaef7560d4f1339cb7a82cb0e19179026a32d5096903501aadbf9090c75bcafd143ec231b6646ad26436
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQIVpPAAoJEOTDgjZ80txd1ZIH/A/COi79SNYpyhJ9tOYYZNIU
-GVc12nL1O08zbBR7ofICiiTF4W+gWXWFy56mvy2jhVzaVC2oFrp/vN3+FKxwSs88
-YT8Oxk3NYtubAAeEmWjDt7ZgwRor0xOYn0IznuJtAvImnF7/xiVAMCPltuUj0XLm
-WwPNC9wNuOdKOfIteuwUlZwZ3xybdXIIhHBimylmyKTW9RNyEMjJOfd1fpQSyIzm
-uk2BXpmheBhA1GuQZrIWZG3mIGdAL0T6duUKeqOGzcHIXYUK7x5reeak9aTHimKB
-ATxBCcWa9JfK2u1572ie7P8ZFijEi9Abw41wCpinq8+nWu3yyTO1TYxV99+3Bfs=
-=GDLJ
+iQIcBAEBCAAGBQJQLj4EAAoJEOSiRoyO7jvoRuMP/1YQcamET/G2hDNJ91+2ELPX
+SUf/dknlSOs17AoDrlHtfWNDSzR5uI0DkU3Ptd6fP/q7oe78l1TdQ7BaPS9MVbt2
+w/RDJyuKLVOiEBrtW2UDsO9lhnaYiK5ouATOwoq32j4DXVx7V/SYMVHGDjR4VRFt
+A2UxCLOMkBw8OzSGcQXhu0lFd2TxWrTF3u0c1tfZukcdNcBCF4N71+E0U6AJd0Ur
+rguR6ZpPt86nTSBbYESFXe8MZkFHhowJiVN+cc82N19ixWO6g3gmWOxEXv6RWuBF
+Lba/t3cptMvv91LRmGKv+WNHYYd8JjmZUKhO22BIYnZWrOpciGIHbfRwDBGMYVPv
+YLUUtxTyJymLkEBLbTIbZfJroPyC1HNBbaqOWi7CJ3zZs09RHGQR0ETNjRUSLLsf
+bCbX/wwlkwJ7wg4hjMffHDZAR9nBG8RVPrFeBXBIkq96smloliHSk5JPatX383H3
+fF/1hWvqF+1U7AkJDkTSezhp9ctNxenIxmbI7NHmeF2TbcErovI3/hr2FR6ONFO+
+RtKjOtelCG14t9c74XHE6Fl3dlFeWkzfLk6o/uktbiQ3pkp8XemPSkwFdcYumG8w
+bf/f3TU4xCiCoLhwekHrPorFYafsimDmpJqraTzN+sF1pbNH+4k3nHF1dn7ZcGiR
+a68dSdr6bqdHPTcZvZt1
+=wBOQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/kdenlive/files/kdenlive-0.8.2.1-qt48.patch b/media-video/kdenlive/files/kdenlive-0.8.2.1-qt48.patch
deleted file mode 100644
index e0e84349db6b..000000000000
--- a/media-video/kdenlive/files/kdenlive-0.8.2.1-qt48.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp
-index d010b22..9595ef2 100644
---- a/src/videoglwidget.cpp
-+++ b/src/videoglwidget.cpp
-@@ -1,6 +1,11 @@
- 
- #include <QtGui>
- #include <QtOpenGL>
-+#ifdef Q_WS_MAC
-+#include <OpenGL/glu.h>
-+#else
-+#include <GL/glu.h>
-+#endif
- #include "videoglwidget.h"
- 
- #ifndef GL_TEXTURE_RECTANGLE_EXT
-\ No newline at end of file
diff --git a/media-video/kdenlive/kdenlive-0.8.2.1.ebuild b/media-video/kdenlive/kdenlive-0.8.2.1.ebuild
deleted file mode 100644
index 3356119747d2..000000000000
--- a/media-video/kdenlive/kdenlive-0.8.2.1.ebuild
+++ /dev/null
@@ -1,40 +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/kdenlive/kdenlive-0.8.2.1.ebuild,v 1.4 2012/03/16 18:01:34 tomka Exp $
-
-EAPI=4
-KDE_LINGUAS="ca cs da de el es et fi fr gl he hr hu it nl pl pt pt_BR ru sl tr
-uk zh zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE."
-HOMEPAGE="http://www.kdenlive.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux"
-IUSE="debug semantic-desktop"
-
-RDEPEND="
-	dev-libs/qjson
-	>=media-libs/mlt-0.7.6[ffmpeg,sdl,xml,melt,qt4,kde]
-	virtual/ffmpeg[encode,sdl,X]
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt48.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-video/kdenlive/kdenlive-0.9.2.ebuild b/media-video/kdenlive/kdenlive-0.9.2.ebuild
index ebd8ce73e46c..231616b5097b 100644
--- a/media-video/kdenlive/kdenlive-0.9.2.ebuild
+++ b/media-video/kdenlive/kdenlive-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.2.ebuild,v 1.2 2012/08/07 18:11:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.2.ebuild,v 1.3 2012/08/17 12:50:37 scarabeus Exp $
 
 EAPI=4
 KDE_LINGUAS="ca cs da de el es et fi fr ga gl he hr hu it ja lt nb nds nl pl pt
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux"
 IUSE="debug semantic-desktop"
 
 RDEPEND="