Revision bump adds patch by SN (Enlik) <slawomir.nizio@sabayon.org> which fixes build with gold linker and use xine wrt bug #418037.

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 86 insertions, 10 deletions

diff --git a/media-video/subtitlecomposer/ChangeLog b/media-video/subtitlecomposer/ChangeLog
index 6b27d7b62c0a..63f38183427c 100644
--- a/media-video/subtitlecomposer/ChangeLog
+++ b/media-video/subtitlecomposer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/subtitlecomposer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.15 2013/04/06 06:23:34 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/ChangeLog,v 1.16 2013/06/25 18:30:50 johu Exp $
+
+*subtitlecomposer-0.5.3-r2 (25 Jun 2013)
+
+  25 Jun 2013; Johannes Huber <johu@gentoo.org>
+  +files/subtitlecomposer-0.5.3-gold-xine.patch,
+  +subtitlecomposer-0.5.3-r2.ebuild:
+  Revision bump adds patch by SN (Enlik) <slawomir.nizio@sabayon.org> which
+  fixes build with gold linker and use xine wrt bug #418037.
 
   06 Apr 2013; Michael Palimaka <kensington@gentoo.org>
   -subtitlecomposer-0.5.3.ebuild:
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index c19538c2acf7..4a8f2b0ad646 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 AUX subtitlecomposer-0.5.3-gcc45.patch 317 SHA256 4ca2428c9e806134cb36f029fa7314a4d1e7c33dc3c35b3957bd9688a9945161 SHA512 9eb6ed7101455b1b1c66f371ea2c41165ec810dd71fac25c751829a10fb1bd6da0d290f6f4d9c3459eedd2c4ccbea36a9bd5c5b8ec850aff2bf26ecee358bed9 WHIRLPOOL acfb92841c897250080681181979cca34d85b9b373356a6937f2630adfad432eaaff1a60c8fa8f646f21bc0ae8395151c0c7bb3be8c9a34951ad7a603b74a4f7
+AUX subtitlecomposer-0.5.3-gold-xine.patch 179 SHA256 9848a5fd9657415b42c13ea62068e7940d3b1bdfe2f4c26db3ec93692adf0f83 SHA512 263dd1a64a930332c036c68ea9ac78c864e2621554c2d10ecb0aa58ae880f7d2d94152df268a5655c3b642bdccb01dd5a2c224e1c56ef4d4a302204f8dd51068 WHIRLPOOL dc1b7913e4762d3fbba3ed002cc0b6d4942307c654299b81c1a995d0ddd6ca58159ab86d64279ab9a16046ab614b3b605f6d120243b6e808770282cd6613ea13
 AUX subtitlecomposer-linkage-patch.patch 313 SHA256 fe5913867ee3b94ead1b3754fd94f1de73ee221392971e5956623fc9f9e7749c SHA512 9fd5039b83142a1cf0671e58ad14150dec1ebb62eaef003d77290c68e871523d0d6773dc5311958f342af9f5d0192be79c377cf0a6c7ec4d2333a578176cff2e WHIRLPOOL 1b2f49fac33f100f823ce15dba3290646466aa4083bcc9735710a61a66bbb8790423b00ee639b392e811fdfaa4ea6454f678188bcb4eb4dd1d7420c2702b4841
 DIST subtitlecomposer-0.5.3.tar.bz2 344295 SHA256 87f3831b5ae09f4ffcefe586cd3b04b197784bf09652b02518b24a12fde2cad0 SHA512 5e336ae1f6cbe84b00ee1495cd1897afc6c9dc6b2bca604a33510a022004e57c49304c0feaeff92c3569cd2681c48e305ab48c82f32eece4825b4d555c2bb52c WHIRLPOOL 486288ff0a6679740a78feaca0d991dfc08ef2f01aed200015cb13f1b602cfb5e41cbb4601be0ce2aa103c899290364cd4c50f583b006c415cd26890564da3b2
 EBUILD subtitlecomposer-0.5.3-r1.ebuild 1293 SHA256 27072c996cfc123464ed94516b8b1fedd6843c22e9c713cb7a1d7c9938cf12e1 SHA512 9b9352098a34576f58bdb034aac567385cfba8131677b28f4062f2b6f859b8004491f4570f3e17966810df6e84a37f4101dcc71e383e9cfe51755e4246c044f0 WHIRLPOOL 7be65e1d35f8cfc394e6576b8e05855dc04ddb77a42b3f84eecc6089855b37bb3833fcf29075c5dec8e714cdd2d4ede1cbe08d9ad1cfce81e5242bac6566b553
-MISC ChangeLog 2559 SHA256 b1e04066f02c40b6535fb720f0f71060cdad3c8cf56c96a77122258d178a7832 SHA512 c159b85ab459961b74106c6aeaf2ca5814a2e46c11670b358687be400587395b46be45bca29f05590ab5fab81682c44130ce648b4a6981da73a10773e9b50ff4 WHIRLPOOL 050d9835464c0b70197a07388d996c863d5ab146926e9d3d80955ac27d6edfcc7e2d302a05a591bb575bc80fbd0f883546a15349a8577cba705e716aac546f60
+EBUILD subtitlecomposer-0.5.3-r2.ebuild 1318 SHA256 687263f3c36451be084e8c50054a73e8a6a15e627f9d17d7b2ed248aeccba0a8 SHA512 a4ce10498f4b75dc5ae44345d885ab0aaa2ca33614dbe6e514ebb51ce617d6a1012b8b9d96c62eb6c8298b98212f9f0ecee27015c9ddea061ab921a9f446ea06 WHIRLPOOL 7fa6a397c7498e1eb0f706d7f9bcb848da3b01806eeab8c14223902e6ca664d02b15df97a9930e66a0fb4968733a01344a404132edca7026d3342d943aec36f2
+MISC ChangeLog 2867 SHA256 ccf33c64014155c0afaf6d36881b7934508c9397978c744336200128838213e8 SHA512 0a7837c65d6f8c500de525c75a3e5d849d5ccf129300e854624811bcae957e59b463807fcbffbd936d01787fa2c48f8fe3c939a9d460d224af653f56f9850c8a WHIRLPOOL a87331d3507400d1579ebab60cc123d8f4f36ab36826bc921bc497cff0e64dc1e685425ffcfc5caf6f5959699d3b9b776ddb093200a01f44b35255afa7db5668
 MISC metadata.xml 177 SHA256 3ed4c7c61b6305801e132f35a16465474f5853cf4a8da7ee856fbb0aeb861e1a SHA512 270b501ec3bcd1aca5d7c877119a11f784e24836f49c5a08bac5da6c76dbcd6a1e5aa1e1293f650ffb3952ca241ff702bc2cc3d697c872992cf39cb432e3a463 WHIRLPOOL 460f9cb179d4da01b0baae4fbce90abca432db195684d3267d6978b62d614f584722f326afd1642112b3f49a50a1ae3d2126c7659290b0526e1fba36fef7af13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRX79EAAoJEMbwO6tnXQ0s+mEH/1/8vlKeoB9RtBvNxx08YhnV
-NBWLTo2WZDBaHCw14A7a5RwEy3lAOPGqqBPfjy0b2eL0ewkNAnboExJnyQw24r5Q
-IPNg2FYDvABBx2TtVcIZemYKxaS8TU6LqfcIXbnakVBlIdlbWEjbidp6n3yhMuog
-3k1FA4iy6gjqyZcblhNsDOwCULMiTR2uqCKxTIku9f47aQL3z21KLH11uwSKsFMf
-GrLI0rhMdASkHrbpP9GZpuc6QW/3QJo99AFFtjyahDYo5gmCnFy+iUTxUMZVa04F
-Fl/zbypFoqPygDY+6h0+rOde4Lgt/9CZ7O/IKbZF63Be3rni9Ux+zzwWhk29jt8=
-=eu/y
+iQEcBAEBCAAGBQJRyeHiAAoJEO+t9ga+3I3aUiYIAMosMA6FD0vfl7xPRBwCHsRk
+Q1LTFfetpP/kjZ5crFNJqGH1bt957CBiD6H6czRxWX/35pBz33aWSu5izjrdpQut
+HAG/lTBytIVLiqE7u5ji3Kc/kqFvibV5f7oeRfAetX4h69O8IFOFPcKB8wGQgR+I
+pooHIqiV1pwmiMcVzmqbZWn+/ZJ+M3CEINdLlbZEAQD+4cSp3JA86fDSOse16DsP
+i4KGhjRjJEWF6DLIg5LIuMFhaXfKi19blGERzQMt9HONzGvS6cT1q8hsD9u+NksU
+ANkZHKEJlvzYPRW3RqXvVcq1LEPovhULGhaDEpAb2i1Yv7V566Vzk7EFd1UFytE=
+=mXSE
 -----END PGP SIGNATURE-----
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch
new file mode 100644
index 000000000000..1ec73e7ce54e
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.5.3-gold-xine.patch
@@ -0,0 +1,10 @@
+--- src/player/xine/CMakeLists.txt
++++ src/player/xine/CMakeLists.txt
+@@ -10,6 +10,7 @@
+ 
+ SET( players_xine_LIBS
+ 	${XINE_LIBRARY}
++	-lX11
+ 	CACHE INTERNAL EXPORTEDVARIABLE
+ )
+ 
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild
new file mode 100644
index 000000000000..e624a761fb00
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitlecomposer/subtitlecomposer-0.5.3-r2.ebuild,v 1.1 2013/06/25 18:30:50 johu Exp $
+
+EAPI=5
+
+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/"
+SRC_URI="mirror://sourceforge/subcomposer/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug gstreamer xine"
+
+RDEPEND="
+	gstreamer? ( media-libs/gstreamer:0.10 )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-linkage-patch.patch"
+	"${FILESDIR}/${P}-gcc45.patch"
+	"${FILESDIR}/${P}-gold-xine.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	sed -e '/ADD_SUBDIRECTORY( api )/s/^/# DISABLED/' \
+		-i src/main/scripting/examples/CMakeLists.txt \
+		|| die "failed to disable installation of scripting API"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with gstreamer GStreamer)
+		$(cmake-utils_use_with 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
+}