Version bump to 3.1.0. Fix up dependencies as the package now requires wxGTK-3.x, icu and boost; fixes bug #493494, proxied commit for Nikoli.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 89 insertions, 14 deletions

diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog
index b24d7272aef4..cec76123c924 100644
--- a/media-video/aegisub/ChangeLog
+++ b/media-video/aegisub/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/aegisub
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.11 2013/10/13 16:41:10 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.12 2014/01/07 17:48:27 tomwij Exp $
+
+*aegisub-3.1.0 (07 Jan 2014)
+
+  07 Jan 2014; Tom Wijsman <TomWij@gentoo.org> +aegisub-3.1.0.ebuild,
+  aegisub-9999.ebuild:
+  Version bump to 3.1.0. Fix up dependencies as the package now requires
+  wxGTK-3.x, icu and boost; fixes bug #493494, proxied commit for Nikoli.
 
   13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> aegisub-3.0.4.ebuild,
   aegisub-9999.ebuild, metadata.xml:
diff --git a/media-video/aegisub/aegisub-3.1.0.ebuild b/media-video/aegisub/aegisub-3.1.0.ebuild
new file mode 100644
index 000000000000..33a2cd1adbf0
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.1.0.ebuild,v 1.1 2014/01/07 17:48:27 tomwij Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+WX_GTK_VER="3.0"
+inherit autotools-utils wxwidgets
+
+DESCRIPTION="Advanced SSA/ASS subtitle editor"
+HOMEPAGE="http://www.aegisub.org/"
+SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug +ffmpeg fftw openal oss portaudio pulseaudio spell"
+
+REQUIRED_USE="
+	|| ( alsa openal oss portaudio pulseaudio )
+"
+
+RDEPEND="
+	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
+	virtual/opengl
+	virtual/glu
+	>=media-libs/libass-0.10.0[fontconfig]
+	virtual/libiconv
+	>=dev-lang/lua-5.1.1
+	>=dev-libs/boost-1.52.0:=[icu]
+	>=dev-libs/icu-4.8.1.1:=
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2.3.5:2
+
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	portaudio? ( =media-libs/portaudio-19* )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
+	openal? ( media-libs/openal )
+
+	spell? ( >=app-text/hunspell-1.2.2 )
+	ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
+	fftw? ( >=sci-libs/fftw-3.3 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+	>=sys-devel/gettext-0.18
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with alsa)
+		$(use_with oss)
+		$(use_with portaudio)
+		$(use_with pulseaudio libpulse)
+		$(use_with openal)
+		$(use_with ffmpeg ffms2)
+		$(use_with fftw fftw3)
+		$(use_with spell hunspell)
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index f619d13feeb8..5cdaea7257ab 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-9999.ebuild,v 1.2 2013/10/13 16:41:10 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-9999.ebuild,v 1.3 2014/01/07 17:48:27 tomwij Exp $
 
 EAPI="5"
 
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="2.9"
+WX_GTK_VER="3.0"
 inherit autotools-utils wxwidgets git-2
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
-EGIT_REPO_URI="git://github.com/Aegisub/Aegisub.git"
+EGIT_REPO_URI="https://github.com/Aegisub/Aegisub.git"
 
-LICENSE="GPL-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug +ffmpeg fftw lua openal oss portaudio pulseaudio spell"
+IUSE="alsa debug +ffmpeg fftw openal oss portaudio pulseaudio spell"
 
 REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
 "
 
 RDEPEND="
-	>=x11-libs/wxGTK-2.9.3:${WX_GTK_VER}[X,opengl,debug?]
+	>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
 	virtual/opengl
 	virtual/glu
 	>=media-libs/libass-0.10.0[fontconfig]
 	virtual/libiconv
+	>=dev-lang/lua-5.1.1
+	>=dev-libs/boost-1.52.0:=[icu]
+	>=dev-libs/icu-4.8.1.1:=
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2.3.5:2
 
@@ -36,8 +39,6 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
 	openal? ( media-libs/openal )
 
-	lua? ( >=dev-lang/lua-5.1.1 )
-
 	spell? ( >=app-text/hunspell-1.2.2 )
 	ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
 	fftw? ( >=sci-libs/fftw-3.3 )
@@ -49,8 +50,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-EGIT_SOURCEDIR="${WORKDIR}/${P}"
-S="${WORKDIR}/${P}/${PN}"
+EGIT_SOURCEDIR="${S}"
+S=${S}/${PN}
 
 src_configure() {
 	local myeconfargs=(
@@ -59,7 +60,6 @@ src_configure() {
 		$(use_with portaudio)
 		$(use_with pulseaudio libpulse)
 		$(use_with openal)
-		$(use_with lua)
 		$(use_with ffmpeg ffms2)
 		$(use_with fftw fftw3)
 		$(use_with spell hunspell)