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.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 100 insertions, 23 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/Manifest b/media-video/aegisub/Manifest
index 7a59c2ae22ce..abe7157be601 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -4,20 +4,22 @@ Hash: SHA256
 DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7
 DIST aegisub-3.0.3.tar.xz 4154764 SHA256 9623e1967ae774d8a34fae531dcf76f15ae060f864cf941d34ba3d64e1986efc SHA512 9404d20c6a136f6a0dbf14d7cec572e4b25af401c39adabbd59327d285247752c9573b1072d51edd9d8c2f26da0cdd8bbb5cd67d62ebb06081652bf74af041b5 WHIRLPOOL b3d43cc40b992baab68fed0be1f8a28aa89b52ab5cc4b073a5d7895d2686dcb82c4a93f5c2294327a54d60e7b5b46f18b3804263534b5cd9f1391732e9f81fa2
 DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
+DIST aegisub-3.1.0.tar.xz 4097904 SHA256 3df061456bbab6bd955d7c5b63336be47392eafa21148ff6ed5727eaa6a29987 SHA512 5042436cb89c9b4403a7a7f6839e4df91a214a0cdc88c4bac73d42d410bc0a4653593b284176a541712fee070b06f1b802ee213f3b83be186dd631e7772bc0c1 WHIRLPOOL 25e643b7399825b10d4a296b74c6d0d3c9b15c462991855ab5cea3ee9673c00be1ddbd438768294804c9241bd590b8f3ee299a3279fcdee5bbf11c1395de64fc
 EBUILD aegisub-2.1.9.ebuild 1420 SHA256 3b3a2e81ff1eff2491c2070a07249ced0b1c39e4df89f8052358a25001198636 SHA512 b8bc094c3d8b5342a02fafafa21faac625cc3509abe3dbc90f9fcd115e443ac7e9532cf0c488e60575a718d13b1cee4056c3e7570c5af6215b078ddc7491fe34 WHIRLPOOL 9cd3bc967c78fa0cb67c8a3df954d9bfab15323aafef2eee8b3b8c33560a27c0d4d8ffed9f10ecc83699990ab0ca3d98406816d5f6258dc47aef11123bc54104
 EBUILD aegisub-3.0.3.ebuild 1643 SHA256 c96512ddebebccbe0250956a839e2f41008bf27e7be90a24ddaf038f2e2242bc SHA512 097c5097f8a8d62699b526f92309a918919ab70aab724a519761d30b2146a25c94dfe241de47a65f5ac1540ca45c92f82647cd473339cfa321997eb9d4b99f34 WHIRLPOOL d7cce217dfda5f540f587b0425487a1587c71d1549c097462a6a62ca2aeef881f1f758d6f99c6e629e569a9aaeba1d3cc6314831411afdd55dffb976a0b1ced3
 EBUILD aegisub-3.0.4.ebuild 1645 SHA256 4fa6c1c2801de2f52a9b005ea5b2dab26f81c9c3119cc7465e3614b85d7a0af4 SHA512 654cb0620537ff5ff283a5f9477a23480f54e5bd353c17cc55c0355bc1d7c7bd06b0f0463ccc8366db862a4ae3f0c0799ac797436c4981dc45ebcff3eb9e86c2 WHIRLPOOL 606db55abe594412259e9dc640591a28daedcc4eb81b3b878c3fbf6f3233de3c03e9bc15e60e907055289c5b804e889e30566c93440c76e8d665f0b97c7015cc
-EBUILD aegisub-9999.ebuild 1668 SHA256 092ad3cdce687cb556a628ebc57591f4590ed758fe55968b3a099730c4a8fb27 SHA512 92d1e4cd1e848d79634ebdf5c3f9926250b8e941d6d76685b8ebd6e990817c83b9890d1fa9ce5cadf88a90444eb6e0407bbd3d08e447951d0e70724135c4da01 WHIRLPOOL b1ea3bb443cb8fc90837e057b7956bd5d2e8b54d59ad598c06ccee6d9f08b53b8e3d370693034eb7812b7019f3322af31508941d525f47f448a9a4601c15ea9b
-MISC ChangeLog 2152 SHA256 6b8bcfd13eb093b47317c3b457a2b38651d47d6698f0d1cf1c58de3487dee68c SHA512 20a9eec061b5392da471a20496360418efc37fbffc8016a8f98100a4471028be67aad288e5eac14cdbe56a19bb0cdb12eb775fc0b928de9d3a59ea60ac5c3404 WHIRLPOOL a8a4e7f1816b1a95761124ea0d71997119ca01338675733b0de2ea5b199eb26de99696448bf81746ff8f7240f0400bb25307588c8498210b1c09a6764dafccc5
+EBUILD aegisub-3.1.0.ebuild 1668 SHA256 6e5bd8be023e29a0273d4486137f019a8965846abf7c315171a0806fb5e421dc SHA512 4910b35e494a565d4ce2b9b67ec057fe9de60390ea8b51a8db3925f8720b47439e492dd37b80ab21dd6fe89100c0027bb3fdd4030b56a31c714e585b0bacd546 WHIRLPOOL 1a63332fd79e4d2b6879d9f4c45edb01d396d1c4a76907729dc84eee8c3f1835e9ecaca57b5ab476249437422ab52f60098aaf99bf6331c49aba0a84a3899cec
+EBUILD aegisub-9999.ebuild 1670 SHA256 8f1e09fe71de3db700f5cb6e0d94122b4b111286395175aaaf1191358f743cdb SHA512 60a498a9203520431794c7311406b56b366df31fd77412da4477ea6a2bb7ffd036a5c1c17233ccf2ea0ca7aea07bfd53bb0dcee973f3f59b439627144ada0edd WHIRLPOOL b5846c4024bfb111bd11af7ad9329f48d631a5fe2c71b2c74297222bfcd6b7db9759139cb48623ab46d6a427386cabe4cf396760b53d17045ee2479f6b196c04
+MISC ChangeLog 2423 SHA256 293e5185d381a28649c662770e0212d51e72519a4a13d50353658926b04ba5e5 SHA512 0db96f9e0a024349e45590813d995e3ade59368b418700d4e7c1b96aec6899a95ea372e7a5e798fd6e230e74768df51f881a39f793963c0bfde3da2b14923a40 WHIRLPOOL 61916d7336805d4f3fadf33a8d6c7e719e99c5c983edd6866af9e88bd15d20a6dd72885b3267e88b998a2215e46cbbf5b09d90ed6db7bfa82a28aa677f74da8d
 MISC metadata.xml 349 SHA256 0588fe8b44502f319e8de7916d53b7788ec564ce2dd9e98a1929cf17b8829e84 SHA512 bc6e78cadc8556804a2db10804a866c5860c3e4618c49faf6e9c36bccf24c4045bcd365e7ead0519c183fa8cabf7ea98d13d14103c01cbd9d3d426054659e07b WHIRLPOOL 6e6762daacc936b4466e78f559b5b8ad4e2a9cb959193a5b953fb25a8ce0d8bf65ab17cca6b55720a3bd67013610d88f192bb25c74abbf2e29929b620307960b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSWs0qAAoJEJWyH81tNOV9NaEH/00kH7nC3BJDNatLNKSWafxh
-RtYg+04O/lhvrB9YfG32EAb2Fkuuib3nhra/kap7aThHg39i48k3EY6hkG7XgAv9
-odHQYvk5+neXGGLkOUwLbl9200pejySz3ZY8fo8Wp3WlSOPalUEV7Wy2Ppw50Z1E
-lURYwtt8/2WeWFVIU3eqNIP36Z7O5fwqt7+BtVifgPXLOxhOVSKeo+z+zeWFcoGz
-ZHw/6zQsfjQ6KbFAG/62VS3yZXf6Nf4+U0gGrm6IQWk6ER+S3CCoTgTVllfpFXRE
-Bl4dZs/Q9YS6J41NpCe7LNFbeQKqwkmR0B0sDCmeaB+X3XR6SEXXpagQFqp0d7Y=
-=qtQ1
+iQEcBAEBCAAGBQJSzD3HAAoJEJWyH81tNOV9QIoIAIY01Mo0DypAKrwokdljqoz0
+6ZxENOtA+xY7X9z0POlqkxUCrLFwgL+MJbkywWPPBnD5SlG1NpWC4hk9x5p0Rog4
+wNi68EVmv87Op4hSf9M4LVhZ3yj6jEewRIbuwGZz5MpHig02eLw8fE+cfJFO7Rut
+lYu2OKlFvXWwSRnnoaGpSdT1zuqwgCk1vzxFt2XDX9cU6Ly6eNEqOYtQAjeNaQZt
+xzFVpq5PNbuNkGXCjkBNbKWMEfsrXjNl5winCgFq6tjhcyo6sCxo/Q/9eYCOJgaM
+eQZ28zUbkgiZypoaLJKaeX6zNFLDN/BY2911P+hgQdmYH99WPJwUCjeA0bE14F4=
+=Xxmd
 -----END PGP SIGNATURE-----
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)