Version bump, bug #472498. Fixes build with ffmpeg 2, bug #479390.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 82 insertions, 10 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index cc5b0c9a3a6f..79364c275da7 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdstyler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.58 2013/03/01 16:00:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.59 2013/08/12 16:30:13 aballier Exp $
+
+*dvdstyler-2.5.1 (12 Aug 2013)
+
+  12 Aug 2013; Alexis Ballier <aballier@gentoo.org> +dvdstyler-2.5.1.ebuild:
+  Version bump, bug #472498. Fixes build with ffmpeg 2, bug #479390.
 
   01 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -dvdstyler-2.1.ebuild,
   -dvdstyler-2.3.4.ebuild:
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 9d1419ccb8dc..f9d9d027f6d5 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST DVDStyler-2.4.1.tar.bz2 5421164 SHA256 800dfa15f1deaa17cfc860efbb176bc53998c20c390d9b9fbb9e699c637be153 SHA512 4d886df3e94813365cdfa30b6b9d6163beacf2c0198ec46ce1e67c949c215ad502a3b8c0edb2d7292b3411ec5340035452f2ba6b0fe6ffb8883b077c322d1667 WHIRLPOOL a5bd5286a1b9e3cca590cdef6a50a9ef7c9ac99c33570c2878978472b0bf546a30fe6304aea9b29b1e00b598ae8716282839e3d3323c3685e9ba9535b3699d74
+DIST DVDStyler-2.5.1.tar.bz2 5721467 SHA256 02bb04a431656364fbf309cce64fbefc83aa9faffaa621e9442ca9cae9d5a7c9 SHA512 b9a36f74864ea971f618eaefa994ad66ac344fa00f62a32a1a9984dee955bafe6ee9143565587314bc6dcf2cf00b0eac3cdb20ffdd5f1fef8aff301a1cb48ea2 WHIRLPOOL 430e21bfc3f17fecccb55e155eaac68901ddc4059310cd5362a8264c18a15aaf9fce3ee0abca26fcea2f56ad015038e8061d73531d330e3120c013dc2d373081
 EBUILD dvdstyler-2.4.1.ebuild 1723 SHA256 a2748b579aa7a90612432320d21d601ed97914a0e665018371d0bf0bb34c0c47 SHA512 d2acd8b242b3328e796af7072c02b974681b265f052be8a7286741bf9b52824aa9e8ddd7edd63c38c1a452ebd1442c7e68cf9fcd5173cd5c327de463d6644264 WHIRLPOOL 95e410a65d88481c681040e1e2bc1dc8364199cc5e3038615f546ebc72567e1575dd4f1fdabbfbe04c2bc859072d80ded203daaa67b493ee6f6038814d0cb31e
-MISC ChangeLog 10671 SHA256 3c3a11f06364a5dedf18e7628bb0836c478f5aaebd852ea65fe27bb88cfbb361 SHA512 365dfe83cddea4ab36236931f5a4149965e756adba22259b4fc9a5a73df125bb886804d48e22f5649a2bc0eb27b1e006a10b4dfcd489dbd40f63d8d1bb785a74 WHIRLPOOL 0ea60ba877efeb39ab7e840403ff11a870ce4838a85305cb7366368f70dd5496ce82eb2b7159e490754cdbfec4ac128e99443fece5b0050fba323bd8c813244a
+EBUILD dvdstyler-2.5.1.ebuild 1722 SHA256 c550e883ad03179e183fc8d2bdeb635827e2a9a2e18434888149bcbd8462fec6 SHA512 970bdb8ed77b5be42bbeceff8d31614e81416f5ae738341fc4bbed40ed1fe4bd5bb5f5969dcd9de33c157127c83b98ae24755cbdae4fdedafed4bf88ed5a1985 WHIRLPOOL ac0032a1e7308d99ec97ce2865a79a8d6f2fcd73dd204f24e6aa1612e7cea527c186da283910aac3ec451aba4ad244a705eb0294def8390287cc28a278fea906
+MISC ChangeLog 10849 SHA256 06529059c0db58e622a040629bd568e97b817878cd76f1f49cd40a6cb36cf33f SHA512 d76a641336be6a706c43c5512e46c49304c0e6945d4a9a0711f5b98ebab673a494fc8c08e639c321a356240e0a249075debfaac53f9a62b8e1db21b880284c03 WHIRLPOOL 5c315223722a28167fb8fc211d8300f755d8c4448c1a7f2240e99d54d5b1c0a22b32e5b371e632810290e0dac83a42d2d5af7b71a275ff299572cfcbee590692
 MISC metadata.xml 309 SHA256 8480726b006dfde2d5584be2e89e605cce0b35f30dd1d266d33bb79ed0bc169c SHA512 db1617ecd6ad768e7a1bd00b57184402364e55d0b904c85202856fe4651835fda12ebdc5e96d0b6de8f4d550154c1f8251c80a65167011afca6646ec5ac119f1 WHIRLPOOL 85c51d66ec6a04f09432243d04bd0c7b550c85ad410d1cd3a6202d8f115c6cd6e3a0694e014be140b4ffb5c52a5a36d7d78ecd6705f105687bb2af5b99222da1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRMNBYAAoJEEdUh39IaPFN+xEH/As233+A8Kf/RXXjxoF/r06r
-/b5rjlgW2KkwcrRFFmHAmSMdORLKH3c7Px544PfKmbKcW1oCSCR+yXO5tFlEYYlq
-kXGV7dpw3jYqWKwt1DohnbF9lbD2lZ//zsFYBVpJp1tCHd4BGUrNsd5OuC+ev/GR
-AOG9F9mVEItza+cRIa+bRZQFSr4QwqgKv2Z5Rsj5U5IQWmJ9fytILcIk1ftGJr8x
-yeatQX8XCqRKkK1Z2d7kABnYJKlC5nQojTpmWPsNRV/c9sgrAiXITq0O7LnX5OL7
-nDAHKdyiPxO79HEpuJZZD8eSnEVWaOI6IxdsIwHTdKtgekZuY3DyfKLaOHkYcsk=
-=oASL
+iEYEAREIAAYFAlIJDZcACgkQvFcC4BYPU0rArQCeJ89Z857FaSlZLeHctl9feuWz
+CuIAn1Zg6oyfIwKguye2C1dcenubd5xT
+=EHEz
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-2.5.1.ebuild b/media-video/dvdstyler/dvdstyler-2.5.1.ebuild
new file mode 100644
index 000000000000..0c690f57423b
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-2.5.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.5.1.ebuild,v 1.1 2013/08/12 16:30:13 aballier Exp $
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=2.8
+
+inherit wxwidgets
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug deprecated +udev"
+
+COMMON_DEPEND=">=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif
+	>=media-libs/wxsvg-1.1.14
+	>=media-video/dvdauthor-0.7
+	>=media-video/xine-ui-0.99.1
+	virtual/cdrtools
+	>=virtual/ffmpeg-0.10[encode]
+	virtual/jpeg
+	>=x11-libs/wxGTK-2.8.7:2.8[gstreamer,X]
+	deprecated? ( >=gnome-base/libgnomeui-2 )
+	udev? ( virtual/udev )"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.2"
+DEPEND="${COMMON_DEPEND}
+	virtual/yacc
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# libgnomeui-2 is very old, disable for now until someone complains
+	use deprecated || sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure
+
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die #367863
+
+	sed -i \
+		-e '/Icon/s:.png::' \
+		-e '/^Encoding/d' \
+		-e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	econf \
+	 	--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}