Add USE dependency default in preparation for the removal of the semantic-desktop USE flag. Remove semantic-desktop USE flag from testing versions. Remove old.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 23 insertions, 60 deletions

diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index bdc8e0b9dba2..437ee69b42e2 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.85 2013/04/20 21:27:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.86 2013/05/30 12:14:42 kensington Exp $
+
+  30 May 2013; Michael Palimaka <kensington@gentoo.org> -kdenlive-0.9.4.ebuild,
+  kdenlive-0.9.2.ebuild, kdenlive-0.9.6.ebuild:
+  Add USE dependency default in preparation for the removal of the semantic-
+  desktop USE flag. Remove semantic-desktop USE flag from testing versions.
+  Remove old.
 
 *kdenlive-0.9.6 (20 Apr 2013)
 
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index f729db044db6..d2e13395f77b 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA256
 
 DIST kdenlive-0.9.2.tar.bz2 5341243 SHA256 410e4261d2300a306be05484559490a7533c4655dfe5caf7d3e883c0800644c0 SHA512 8ce4cc9e5802f5ee42abc06db2ec539f4b8b99c783d59ce72d03b226d79b3e28891b83e049611e00ec889a487e6ef0246ce5325b373c945cac985cef098ef740 WHIRLPOOL c1586f3f9c5a72f7ee018644cdd85dde087cd506fabcd43c126bea4cc39f3a5aa241f4494654ccb5df6ae53eed3e97c234335b7387482b19189514cc08f8f22e
-DIST kdenlive-0.9.4.tar.bz2 5265904 SHA256 2eba9c53f0e0e57b0f0f80697ce7f52f016892f09506e64d76ed0de487eb6ad0 SHA512 cc6033ed2b44fcfa55316d45919adef496b4af0e2164d53ffe04699841585da4fabf655b2f61d6c090d75e01aa1df705cf505646658bb367ebb79b7219ee9fa5 WHIRLPOOL 93c9c5b3ec1d10af6d20caf59bd6d0ad6f554929aa6015c09ceeb83b14f3aca0f63514a9da88504ff7c8dabd8dd9bced87691f3aa5cd527db6916ff7769e6477
 DIST kdenlive-0.9.6.tar.bz2 5355764 SHA256 fdc447135428864a283c48122f8bffc236fa2e5cdffbbc65e44bd5e2ff6282e7 SHA512 6af8b76c7f4c96825ad659bdf32ae54d84a41f96ff56479b3778fe28be3df2ee88006bd6319659c22bd35e3c237840807dbf7718bea7d844a5322cd33a182197 WHIRLPOOL 9e5182ea466f43245df278ff6b8a9ea1f8bfa0446891448773fa204ce8dbd91368e5669b46430257cd8d06626411653c08dc29fda02ac574d3c0c60954975f8d
-EBUILD kdenlive-0.9.2.ebuild 1115 SHA256 6c67941382e4a6666ce1787f2fa019ee1a6f71f04cd3af22f66b09095dc31f77 SHA512 2a2ae095536531f64312d31ae6ba5f62e5de5274ec3057b55fe06deb7798340c543445c39318bd807eec226c19bea6e393906a58b481f8aac64b723d524d65de WHIRLPOOL 82f8d4b836235576502182a56384b098e8a2b8cd5ce5fbec818a4a556d70e34b5422f479c30f1c9253d2b5faee5f320d85c67ab2247b4767ab90e542ebb1d2c8
-EBUILD kdenlive-0.9.4.ebuild 1011 SHA256 4625cfdf71bc20a9b6fed4fc67b32db1ea0e8a95b20819b5c8a602feb5247b6b SHA512 0f4f25daa162ac51db57e02e82449c4a2e95b389ef8aea25df688936134238a7e592c495d2a6da33d1024cace005e3284524d443944847833d48d096b6b44d49 WHIRLPOOL f9d261e4f318085b98a09698392b1667f9edf26f6553f96d58d69e7e7b00358580dcb7aa9628a19412b4211d4bfe38aa5a167596204a04be945252da419baf05
-EBUILD kdenlive-0.9.6.ebuild 1024 SHA256 9caa49680c6a11881f56f9d986ee5c19c5f5ed13389ca333a3eb5b97f11eb3e3 SHA512 34415c4ad58a6e9dfdca8626845c08a6d90385ede5d06b4109aec4e644b79eb2cf20b41dcdfd7c2be3666fb230ae859a2eb9eb17ae02ada30606533847698d9e WHIRLPOOL 49665718ede4ab92e9d5487b639e192309bfdbdf93ecdb6d74cbea4da238c9e5ab47c1be79f5a0568e13d18d13b58ad7f9beba684bc5f2aaa8d5b5245eb944ed
-MISC ChangeLog 11750 SHA256 11f7f10d5a5467b67fac77c80b8d66c5dd12fd7567fe5211c9111d092e315d43 SHA512 a9b9b8f6311819cf0bfa506ad21a3f8f52b5e5c73a966d94d3d28483d1af4d91232d21d4e4828e26f3bddb97e3397e89cd07195ae1935dd24bb7e99b788efc83 WHIRLPOOL a52474756dbfd7b16938fedd5892ef59526ca73dbd3946d4ec74d638418020651f25ecf3f38ffc96702523a79b5a62985a795b53e78a1fdfca31572c7f49ee88
+EBUILD kdenlive-0.9.2.ebuild 1122 SHA256 3696521bc16af513b19ac3ea1029c0b6bbe5edd2c97ca4c0dd4f5d0ac5d8e5f7 SHA512 0c4be01ef93622ef63d6b25d34599572a4020b39d411387b356beb35ce0677abbbea51451e3dd83d5d7f4e33391b9e8bced28c7e1657da68d86ccc238844d9d6 WHIRLPOOL 9576782434c8397f92098c0d22c777c3e272a18409929078537cde128199e1135bf8e3e3fc2be1f2eed26bbf33a15799c4134978bf85be3879394b8dccc0bcfb
+EBUILD kdenlive-0.9.6.ebuild 894 SHA256 25a9ca21d30d1a789e3738ffd5dd33a212fb76443504727c6a1e7ef965a6b938 SHA512 29175e744f1e0460b6c3179b7d2a0c5143c62df1d49fb086f19dfdd09cb1d859bc4bfd504e556cc2ad1f2e8be04b74ac83a21c3896e176979e2115941681528b WHIRLPOOL 041baa11e560d44a8d3c941ff9a00d29d7d6516abdd3a5550c321f0d1d4c36d5f4a9c8d6708a770f87fe5ea2edfba5b42e5a1bb95f60da6881f92ea754d559ba
+MISC ChangeLog 12052 SHA256 8d4c813b04da5dacdbb80337c2f1ab7f2fb1fdace1f4bee60da6e8d85c74c8ca SHA512 bbf44a89683436ad26669c2dc9e1986d7d028ec3bb6ab056093c3ba6006b37a01ea4d512b915fe82dfb689ce03400f4d496bb8449eb0aef5f5b18764d1617709 WHIRLPOOL 16877f09308991bca022ba23360e651360d4bdc5784e96bb7cbb3c71224cc8bab204f8284a0c756cd48e669df1d5cb5de86dd1399ec6cdf6ec161efc2375f66b
 MISC metadata.xml 242 SHA256 87a89e336f95de812afc49fe66d85bd1c69e2beffe7f822c18aa82031a5804bf SHA512 2263a6238b1f00a7720f7effd4598a7d162f854799a30272fee407eae580a05f26cd94401fb4baf02124f3c8056f297efbe5771b5cb044ac83f26ace03294855 WHIRLPOOL 9de61f84fd036461eb4481f72bac798a79e19968a1eebaef7560d4f1339cb7a82cb0e19179026a32d5096903501aadbf9090c75bcafd143ec231b6646ad26436
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRcwhlAAoJEO+t9ga+3I3a4eIH/Rn5bcGdGuxFROizSvRFGFzE
-O/FRCNsHg6THCylk6V55xirlanGOZUmvVNf1Kq71vuwFvMJUHdHgvL/iqZeVXf8f
-7fDjX/bzVJ+2P5DQETcwNTUsotZ2jsZ1MBdnl6FVrADwX4mWU+N6yVgskl/Z7Vbx
-78FD/L9tynaqfn+FMux4CAkB11ybcYZkX3PQdMYmJVXa0nskHEJVZO7Z73apBpqa
-f1Lq3XJrRripeh+5+KEizE2YqqD7ZHERCfq3iztk+EH5GipNMg8HVBlRlxHWv0Ah
-7gS8EVeq4ZymdfyFP6b5zan94EKgFyisXrh2zbdSazh0kAihtlctXDS18JmC1WY=
-=5ok6
+iQEcBAEBCAAGBQJRp0JmAAoJEMbwO6tnXQ0sjc4IAJz2D9zt6LFxsu5dkzwCvb+F
+3WqxqvPtGpXjB16BNUGZKsNP2xmMJyb9lmyBXlvmX69iWrur/blBrW4ojANZtTpE
+gqv3okp2UGGtSwf2nwa9MBkqKKpzewJrrzK6jf0hA6i3hxg8x+kKsR9eXFormvN1
+GDj2agIWCCaX9JLdsWqzig/pQQF211tPw6HwWnQIieGJ2ts9OlQIfk1ZuD4y5kgc
+vXXGz0rxq9iZseYv2sx8CATlXCF20f23VwLtiK2q2Rnq0w8wt0NkQXzq2YToVhHI
+OZ43vFPfmPGNFZiZMZ4FD6600mq0+lK/JHjg8ru82kJMiRgdIiHBQwvIjyvwnfQ=
+=4Y48
 -----END PGP SIGNATURE-----
diff --git a/media-video/kdenlive/kdenlive-0.9.2.ebuild b/media-video/kdenlive/kdenlive-0.9.2.ebuild
index 4b36477c9e6c..a025c9aba1af 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-2013 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.4 2013/01/20 18:47:26 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.2.ebuild,v 1.5 2013/05/30 12:14:42 kensington 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
@@ -23,7 +23,7 @@ RDEPEND="
 	|| ( >=media-libs/mlt-0.8.6-r1[ffmpeg,sdl,xml,melt,qt4,kdenlive]
 		 <=media-libs/mlt-0.8.6[ffmpeg,sdl,xml,melt,qt4,kde] )
 	virtual/ffmpeg[encode,sdl,X]
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)?')
 "
 DEPEND="${RDEPEND}"
 
diff --git a/media-video/kdenlive/kdenlive-0.9.4.ebuild b/media-video/kdenlive/kdenlive-0.9.4.ebuild
deleted file mode 100644
index 7b511e4fb866..000000000000
--- a/media-video/kdenlive/kdenlive-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.4.ebuild,v 1.2 2013/02/07 13:07:42 yngwin Exp $
-
-EAPI=5
-KDE_LINGUAS="ca cs da de el es et fi fr ga gl he hr hu it ja lt nb nds nl pl pt
-pt_BR ru sk sl sv tr uk zh zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="A non-linear video editing suite for KDE"
-HOMEPAGE="http://www.kdenlive.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="debug semantic-desktop"
-
-RDEPEND="dev-libs/qjson
-	>=media-libs/mlt-0.8.6-r1[ffmpeg,sdl,xml,melt,qt4,kdenlive]
-	virtual/ffmpeg[encode,sdl,X]
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-	kde4-base_src_configure
-}
diff --git a/media-video/kdenlive/kdenlive-0.9.6.ebuild b/media-video/kdenlive/kdenlive-0.9.6.ebuild
index 5ed55e0d1547..1ac58677ac3c 100644
--- a/media-video/kdenlive/kdenlive-0.9.6.ebuild
+++ b/media-video/kdenlive/kdenlive-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.6.ebuild,v 1.1 2013/04/20 21:27:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.9.6.ebuild,v 1.2 2013/05/30 12:14:42 kensington Exp $
 
 EAPI=5
 KDE_LINGUAS="bs ca ca@valencia cs da de el es et fi fr ga gl he hr hu it ja lt
@@ -16,19 +16,12 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="debug semantic-desktop"
+IUSE="debug"
 
 RDEPEND="dev-libs/qjson
 	>=media-libs/mlt-0.8.6-r1[ffmpeg,sdl,xml,melt,qt4,kdenlive]
 	virtual/ffmpeg[encode,sdl,X]
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')"
+	$(add_kdebase_dep kdelibs 'semantic-desktop(+)')"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-	kde4-base_src_configure
-}