Bump to 3.1.3, update live ebuild, clean old, enable fftw by default in 3.1.3, bug #511896. Thanks to Nikoli.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

6 files changed, 75 insertions, 152 deletions

diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog
index 52bf6b45ff5a..4bc9d3190d4a 100644
--- a/media-video/aegisub/ChangeLog
+++ b/media-video/aegisub/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/aegisub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.15 2014/06/09 19:21:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.16 2014/06/10 20:19:39 maksbotan Exp $
+
+*aegisub-3.1.3 (10 Jun 2014)
+
+  10 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org> +aegisub-3.1.3.ebuild,
+  -aegisub-3.0.3.ebuild, -aegisub-3.0.4.ebuild, -aegisub-3.1.0.ebuild,
+  aegisub-3.1.2.ebuild, aegisub-9999.ebuild:
+  Bump to 3.1.3, update live ebuild, clean old, enable fftw by default in 3.1.3,
+  bug #511896. Thanks to Nikoli.
 
   09 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org> aegisub-3.1.2.ebuild:
   Update icon cache and desktop database, bug #508116. Respect LINGUAS, bug
diff --git a/media-video/aegisub/aegisub-3.0.3.ebuild b/media-video/aegisub/aegisub-3.0.3.ebuild
deleted file mode 100644
index 4531ef1cbf69..000000000000
--- a/media-video/aegisub/aegisub-3.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.0.3.ebuild,v 1.1 2013/07/05 15:09:00 qnikst Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="2.9"
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg fftw lua 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?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.10.0[fontconfig]
-	virtual/libiconv
-	>=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 )
-
-	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 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-	>=sys-devel/gettext-0.18
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}/${PN}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with alsa)
-		$(use_with oss)
-		$(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)
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
deleted file mode 100644
index 61f9a32741a2..000000000000
--- a/media-video/aegisub/aegisub-3.0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.0.4.ebuild,v 1.2 2013/10/13 16:41:10 tomwij Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-WX_GTK_VER="2.9"
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug +ffmpeg fftw lua 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?]
-	virtual/opengl
-	virtual/glu
-	>=media-libs/libass-0.10.0[fontconfig]
-	virtual/libiconv
-	>=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 )
-
-	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 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-	>=sys-devel/gettext-0.18
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}/${PN}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with alsa)
-		$(use_with oss)
-		$(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)
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-video/aegisub/aegisub-3.1.2.ebuild b/media-video/aegisub/aegisub-3.1.2.ebuild
index f147d4c8f07b..ded0e6e676f1 100644
--- a/media-video/aegisub/aegisub-3.1.2.ebuild
+++ b/media-video/aegisub/aegisub-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2014/06/09 19:21:47 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.1.2.ebuild,v 1.4 2014/06/10 20:19:39 maksbotan Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ 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"
+IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
 
 REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
diff --git a/media-video/aegisub/aegisub-3.1.0.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild
index 33a2cd1adbf0..32513b6c6147 100644
--- a/media-video/aegisub/aegisub-3.1.0.ebuild
+++ b/media-video/aegisub/aegisub-3.1.3.ebuild
@@ -1,13 +1,14 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.1.3.ebuild,v 1.1 2014/06/10 20:19:39 maksbotan Exp $
 
 EAPI="5"
 
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 WX_GTK_VER="3.0"
-inherit autotools-utils wxwidgets
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
+inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
@@ -16,7 +17,7 @@ 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"
+IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
 
 REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
@@ -28,8 +29,7 @@ RDEPEND="
 	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/boost-1.53.0:=[icu,nls,threads]
 	>=dev-libs/icu-4.8.1.1:=
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2.3.5:2
@@ -50,9 +50,21 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-S=${WORKDIR}/${P}/${PN}
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:${1}\.po::" po/Makefile || die
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	autotools-utils_src_prepare
+}
 
 src_configure() {
+	# testing openal does not work in sandbox, bug #508184
+	use openal && export agi_cv_with_openal="yes"
 	local myeconfargs=(
 		$(use_with alsa)
 		$(use_with oss)
@@ -66,3 +78,17 @@ src_configure() {
 	)
 	autotools-utils_src_configure
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 6639cbc3bf35..66241d23b206 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -1,13 +1,14 @@
 # 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.4 2014/02/04 16:52:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-9999.ebuild,v 1.5 2014/06/10 20:19:39 maksbotan Exp $
 
 EAPI="5"
 
 AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 WX_GTK_VER="3.0"
-inherit autotools-utils wxwidgets git-2
+PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
+inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils git-2
 
 DESCRIPTION="Advanced SSA/ASS subtitle editor"
 HOMEPAGE="http://www.aegisub.org/"
@@ -16,7 +17,7 @@ EGIT_REPO_URI="https://github.com/Aegisub/Aegisub.git"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug +ffmpeg fftw openal oss portaudio pulseaudio spell"
+IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
 
 REQUIRED_USE="
 	|| ( alsa openal oss portaudio pulseaudio )
@@ -28,8 +29,7 @@ RDEPEND="
 	virtual/glu
 	>=media-libs/libass-0.10.0[fontconfig]
 	virtual/libiconv
-	>=dev-lang/lua-5.1.1
-	>=dev-libs/boost-1.52.0:=[icu,nls]
+	>=dev-libs/boost-1.53.0:=[icu,nls,threads]
 	>=dev-libs/icu-4.8.1.1:=
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2.3.5:2
@@ -50,10 +50,21 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-EGIT_SOURCEDIR="${S}"
-S=${S}/${PN}
+src_prepare() {
+	my_rm_loc() {
+		sed -i -e "s:${1}\.po::" po/Makefile || die
+		rm "po/${1}.po" || die
+	}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	autotools-utils_src_prepare
+}
 
 src_configure() {
+	# testing openal does not work in sandbox, bug #508184
+	use openal && export agi_cv_with_openal="yes"
 	local myeconfargs=(
 		$(use_with alsa)
 		$(use_with oss)
@@ -67,3 +78,17 @@ src_configure() {
 	)
 	autotools-utils_src_configure
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}