gentoo resync : 16.01.2018

3 files changed, 4 insertions, 78 deletions

diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 14c6ff7bc96d..79b916adfe72 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,7 +1,5 @@
-DIST DVDStyler-2.9.6.tar.bz2 8373340 BLAKE2B eb2be82ffa95433de516b5d5bba4b804f9be97869aad1e43576382bd6aac7da9324656aa241999f21c48408d0ea5d1313885c26518fcadf85a7f24fee7453caf SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea
-DIST DVDStyler-3.0.2.tar.bz2 8818276 BLAKE2B 302bc42c2fcb562ab11fe56c405f46e4023ace0e90329c51eb198b732cd21fc33edc394b85dc20f777d53a71580c9f935a60c579eb4faf861e23f5af8af97aa4 SHA512 2ae54a3679bea0a6ea6b98c6bd26af13b9e2cb938dd58cf263e2ca2999d5ad48b58598d6f6a4a230e1ca1988cf6095c5ce17c1c2d8c103e28238ddedc5ead006
 DIST DVDStyler-3.0.3.tar.bz2 8850630 BLAKE2B 1fac6687bad0c80728894f1a19ef823d3ba4ea5b648e8e9b6e1b4c98c5d12a353a1bda0499d612ab508ccae16e773c04af6781e189fb09e9799001074d6f7b66 SHA512 b5e5a93d127bc45b844cadce036b2d70ede5b3ea9d5fd026a93d6a6813684873db41ca0d4cd15680e63a63f2ba4314f65c2a0c08e44d0b4bbcce703874c2c3ed
-EBUILD dvdstyler-2.9.6-r1.ebuild 1741 BLAKE2B 69a908b895b5820885c8324ba14b719e1b12a7b690bc8f43a33995204e02566ba845ba6194ca6bfd46c7d3657d6f1a8e92d3aa72398f7b4ab978b33f5acd0cd7 SHA512 ab1d8e6644179f68f27e8f4f39eec702d400816597411b03aebc4874e9b960695a6bddaf1488a67837d8f7bd2418fc8c9ec91354a57c837505236b2a5f8ee003
-EBUILD dvdstyler-3.0.2.ebuild 1741 BLAKE2B 31e77c6ce4a604b8d722ee9f952965a97b375eb87aac41ccdbbc1b201a8885e2ab0fe304973b2979ac64bb8b5f3dc8588e77a027b5a7af5fe23059a325abb80f SHA512 a21936420a612da0be5d238fb1631a54e35b5d1692f84ace793128b8041dc31b7263d248701b4aea5ab50519332ed02a17561e4a5d697c9d2b30f7e85af7da15
+DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
 EBUILD dvdstyler-3.0.3.ebuild 1742 BLAKE2B 3d177cfe322bddbd8fee6fd7a385ddb9eb045c3339769d8cdbd2db28e51c4b17b153a7b7c6674eaa7f1c418b3188fb8b5336771ec19192832a4ebe8dc71fe117 SHA512 ad0abd52ec284e6889cd63b87f663a6330da4b1505d4ef2136c70b9eca973bd2f337b298bbf9261c4e4d8da2ddc44bc478db2404b126dbec2af7b08fa2aac2f7
+EBUILD dvdstyler-3.0.4.ebuild 1742 BLAKE2B 878fdd6969693746aa3c0d36315cb20904c81a132f08bd2959cca856f51b569842d92c875e28a7e748b13afbc83c3383aa68512a7d52772d3afef0a12854b5b4 SHA512 14aaeba45b316e7bbafdc7e54991421b53cd3200e3b01279e7d532fabe118a54ea2bc5fe34f5ffe8409af62ee25b5c1ef3d0c27fcd10a37f9611eeae1d34f3a3
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.2.ebuild b/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
deleted file mode 100644
index c705685063c2..000000000000
--- a/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-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 libav +udev"
-
-COMMON_DEPEND="
-	>=app-cdr/dvd+rw-tools-7.1
-	media-libs/libexif:=
-	>=media-libs/wxsvg-1.5.9:=
-	>=media-video/dvdauthor-0.7.1
-	>=media-video/xine-ui-0.99.7
-	virtual/cdrtools
-	libav? ( >=media-video/libav-9:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
-	virtual/jpeg:0
-	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
-	sys-apps/dbus
-	udev? ( >=virtual/libudev-215:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-cdr/dvdisaster-0.72.4
-	media-video/mjpegtools
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/zip
-	app-text/xmlto
-	sys-devel/gettext
-	virtual/yacc
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	# disable obsolete GNOME 2.x libraries wrt #508854
-	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
-	# rmdir: failed to remove `tempfoobar': Directory not empty
-	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
-	# fix underlinking wrt #367863
-	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
-	# silence desktop-file-validate QA check
-	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*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index fbfdb6e87c35..668ddd64d8d3 100644
--- a/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ IUSE="debug libav +udev"
 COMMON_DEPEND="
 	>=app-cdr/dvd+rw-tools-7.1
 	media-libs/libexif:=
-	>=media-libs/wxsvg-1.5.5:=
+	>=media-libs/wxsvg-1.5.11:=
 	>=media-video/dvdauthor-0.7.1
 	>=media-video/xine-ui-0.99.7
 	virtual/cdrtools