[media-video/subtitlecomposer] - revbumped 0.5.3, added live, updated keywords/unmasks

14 files changed, 113 insertions, 25 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index 6b8f97d5709..aa4c96a1540 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/ksayit:3.5
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index d5b5970dd19..52130ddbdb9 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -316,6 +316,7 @@
 ~media-video/kaffeine-9999 **
 ~media-video/kmplayer-9999 **
 ~media-video/kplayer-9999 **
+~media-video/subtitlecomposer-9999 **
 ~net-ftp/kftpgrabber-9999 **
 ~net-im/kmess-9999 **
 ~net-libs/decibel-9999 **
diff --git a/Documentation/package.unmask/kde-4.2 b/Documentation/package.unmask/kde-4.2
index 00c3d8b577c..afc82977914 100644
--- a/Documentation/package.unmask/kde-4.2
+++ b/Documentation/package.unmask/kde-4.2
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.2 release.
 # Edit Documentation/package.unmask/kde-4.2.d/ files instead."
diff --git a/Documentation/package.unmask/kde-4.3 b/Documentation/package.unmask/kde-4.3
index 37e0f50e0b0..4358649e2ba 100644
--- a/Documentation/package.unmask/kde-4.3
+++ b/Documentation/package.unmask/kde-4.3
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead."
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 0d7ae30bca9..792f994c056 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead."
@@ -167,6 +167,7 @@ kde-base/step:live
 ~media-video/kaffeine-9999
 ~media-video/kmplayer-9999
 ~media-video/kplayer-9999
+~media-video/subtitlecomposer-9999
 ~net-ftp/kftpgrabber-9999
 ~net-im/kmess-9999
 ~net-misc/smb4k-9999
diff --git a/media-video/subtitlecomposer/ChangeLog b/media-video/subtitlecomposer/ChangeLog
index b0fbbb7f11d..479935a2f5e 100644
--- a/media-video/subtitlecomposer/ChangeLog
+++ b/media-video/subtitlecomposer/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*subtitlecomposer-9999 (04 Jun 2009)
+*subtitlecomposer-0.5.3 (04 Jun 2009)
+
+  04 Jun 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  -subtitlecomposer-0.5.2.ebuild,
+  -files/subtitlecomposer-0.5.2-phonon-linkage.patch,
+  +subtitlecomposer-0.5.3.ebuild, +subtitlecomposer-9999.ebuild,
+  +files/subtitlecomposer-linkage-patch.patch:
+  Revbump 0.5.3, added live
+
 *subtitlecomposer-0.5.2 (25 Feb 2009)
 
   25 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 742a1c7870f..53d8cab587f 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,5 +1,6 @@
-AUX subtitlecomposer-0.5.2-phonon-linkage.patch 351 RMD160 f19607ec839dd3db4ccf014f79cf30ddf9d35ba4 SHA1 01114e21ab90755415e9a31f3a17b2408e39a39a SHA256 a576a64f8129ef4b743712b5c56a98dc75214ea767271f40db060f7d67dbc5af
-DIST subtitlecomposer-0.5.2.tar.bz2 582533 RMD160 c1c6e35b8edec95871a02ec92938ff5005a7ebe7 SHA1 2c47226c0460c7b7a06e8fb0ea33c25033955e1a SHA256 38dec0b41733dcd364b4e7aa9d2e1c30f6521dce2ee702adbf4152f8c2b1a777
-EBUILD subtitlecomposer-0.5.2.ebuild 746 RMD160 2d40d05a53c3159e8e00cef648f2a4c05f7a21ae SHA1 0a2de2ad27bb3bc38f9f8decff5bf63cf53c54df SHA256 b75fc8a5033a3cc62081a5015c2b457e0afd99fed13589edf165841f242630f3
-MISC ChangeLog 377 RMD160 d4b66d8750a44872568b5e6bedb53e225f16a7f9 SHA1 d4b00b5ccb19503c5e8d2c21e51003d62232919f SHA256 3d311b8a3d1c26140289e1d7a815203cf82ad48973348739116b2bb76aa4cb1f
+AUX subtitlecomposer-linkage-patch.patch 388 RMD160 389c87876662077c611663734f64c21422bba748 SHA1 121be84dc4ddb8ca81545ce9b0c297f496e57f69 SHA256 8f642a81bbfe12ffbf25ae696be3377e595049a81afc4214d9647a3c95d7dea4
+DIST subtitlecomposer-0.5.3.tar.bz2 344295 RMD160 e90c72005c73f8c90d437a0ad6e8f4487d1638ff SHA1 8b4bcba870c79af6cba35a2af5e4d740c3238afc SHA256 87f3831b5ae09f4ffcefe586cd3b04b197784bf09652b02518b24a12fde2cad0
+EBUILD subtitlecomposer-0.5.3.ebuild 1152 RMD160 ee3b10bae615d3c6a2c84785bdb0d71f38be970b SHA1 f11df4e380e9519c20dcba778b2f1d73d6dd3da2 SHA256 0838949fadedff4e978b285596acab27d68cf547ca8202da680016e81fbba845
+EBUILD subtitlecomposer-9999.ebuild 1167 RMD160 939c30dee20a506e31785392d4637314888caf94 SHA1 3ea8f90d02c098f39bd1b44ffcba3de96a24f81d SHA256 2f43e5feb9500132b001ee05ee866c95033647ac22189ef22aee7b4fcbd97288
+MISC ChangeLog 746 RMD160 4ce2b82c1055dbebb7ef4f493b9fd818902feec4 SHA1 88537d2e00230302b3d205131ac44a9569b0d3af SHA256 60a25b3a7a54e79b39edd762491ec9367688b1efc9a50037c84a0e03a5522a7f
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.2-phonon-linkage.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.2-phonon-linkage.patch
deleted file mode 100644
index 01ab3497b39..00000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.2-phonon-linkage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru ../a/src/main/CMakeLists.txt ./src/main/CMakeLists.txt
---- ../a/src/main/CMakeLists.txt	2008-11-01 19:52:57.000000000 +0100
-+++ ./src/main/CMakeLists.txt	2009-02-25 02:54:38.000000000 +0100
-@@ -35,6 +35,7 @@
- 	${KDE4_KDEUI_LIBS}
- 	${KDE4_KHTML_LIBS}
- 	${KDE4_KFILE_LIBS}
-+	${KDE4_PHONON_LIBS}
- 	${common_LIBS}
- 	${config_LIBS}
- 	${core_LIBS}
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch b/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch
new file mode 100644
index 00000000000..0af6f6de44c
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-linkage-patch.patch
@@ -0,0 +1,12 @@
+diff -ru ./src/main/CMakeLists.txt ../new/src/main/CMakeLists.txt
+--- ./src/main/CMakeLists.txt	2009-04-17 21:09:12.000000000 +0200
++++ ../new/src/main/CMakeLists.txt	2009-06-04 01:47:35.000000000 +0200
+@@ -46,6 +46,8 @@
+ 	${KDE4_KDEUI_LIBS}
+ 	${KDE4_KHTML_LIBS}
+ 	${KDE4_KFILE_LIBS}
++	${KDE4_PHONON_LIBS}
++	${KDE4_KROSSCORE_LIBS}
+ 	${KDE4_KROSSUI_LIBS}
+ 	${common_LIBS}
+ 	${config_LIBS}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.2.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild
index 115e5e9b322..450931712f6 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.5.2.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-KDE_LINGUAS="el es pl sr"
+KDE_LINGUAS="bg cs de el es fr pl pt_BR sr"
 inherit kde4-base
 
 DESCRIPTION="Text-based subtitles editor."
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/subcomposer/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-SLOT="0"
+SLOT="4"
 IUSE="debug gstreamer xine"
 
 RDEPEND="
@@ -24,7 +24,16 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}/${P}-phonon-linkage.patch" )
+src_prepare() {
+	kde4-base_src_prepare
+
+	# linkage issue
+	epatch "${FILESDIR}/${PN}-linkage-patch.patch"
+
+	sed -e '/ADD_SUBDIRECTORY( api )/s/^/# DISABLED/' \
+		-i src/main/scripting/examples/CMakeLists.txt \
+		|| die "failed to disable installation of scripting API"
+}
 
 src_configure() {
 	mycmakeargs="${mycmakeargs}
@@ -33,3 +42,12 @@ src_configure() {
 	"
 	kde4-base_src_configure
 }
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "Some example scripts provided by ${PV} require dev-lang/ruby"
+	elog "or dev-lang/python to be installed."
+	echo
+}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
new file mode 100644
index 00000000000..086f8e561e3
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KDE_LINGUAS="bg cs de el es fr pl pt_BR sr"
+inherit kde4-base
+
+DESCRIPTION="Text-based subtitles editor."
+HOMEPAGE="http://www.sourceforge.net/projects/subcomposer/"
+ESVN_REPO_URI="https://subcomposer.svn.sourceforge.net/svnroot/subcomposer/trunk"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="4"
+IUSE="debug gstreamer xine"
+
+RDEPEND="
+	gstreamer? ( media-libs/gstreamer )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# linkage issue
+	epatch "${FILESDIR}/${PN}-linkage-patch.patch"
+
+	sed -e '/ADD_SUBDIRECTORY( api )/s/^/# DISABLED/' \
+		-i src/main/scripting/examples/CMakeLists.txt \
+		|| die "failed to disable installation of scripting API"
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with gstreamer GStreamer)
+		$(cmake-utils_use_with xine Xine)
+	"
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "Some example scripts provided by ${PV} require dev-lang/ruby"
+	elog "or dev-lang/python to be installed."
+	echo
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 8570f5cb001..f819962c658 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,8 +1,8 @@
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead."
@@ -272,7 +272,7 @@ kde-base/klinkstatus:4.3
 kde-base/kommander:4.3
 kde-base/kxsldbg:4.3
 
-# Alex Alexander (wired) <alex.alexander@gmail.com> (03 Jun 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (04 Jun 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead."
@@ -441,6 +441,7 @@ kde-base/step:live
 ~media-video/kaffeine-9999
 ~media-video/kmplayer-9999
 ~media-video/kplayer-9999
+~media-video/subtitlecomposer-9999
 ~net-ftp/kftpgrabber-9999
 ~net-im/kmess-9999
 ~net-misc/smb4k-9999
diff --git a/profiles/updates/3Q-2009 b/profiles/updates/3Q-2009
new file mode 100644
index 00000000000..e23f86bc110
--- /dev/null
+++ b/profiles/updates/3Q-2009
@@ -0,0 +1 @@
+slotmove =media-video/subtitlecomposer-0.5.2 0 4
diff --git a/sets/kde-extras-live b/sets/kde-extras-live
index 0f4ef1d7929..65166834f27 100644
--- a/sets/kde-extras-live
+++ b/sets/kde-extras-live
@@ -30,6 +30,7 @@
 ~media-video/kaffeine-9999
 ~media-video/kmplayer-9999
 ~media-video/kplayer-9999
+~media-video/subtitlecomposer-9999
 ~net-ftp/kftpgrabber-9999
 ~net-im/kmess-9999
 ~net-misc/smb4k-9999