New snapshot, bug #536256.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

3 files changed, 313 insertions, 2 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index d3b9997af597..d2a934b2d62b 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.103 2015/03/21 21:55:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.104 2015/03/26 14:59:41 chithanh Exp $
+
+*gnash-0.8.10_p20150316 (26 Mar 2015)
+
+  26 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +gnash-0.8.10_p20150316.ebuild:
+  New snapshot, bug #536256.
 
   21 Mar 2015; Manuel Rüger <mrueg@gentoo.org>
   -gnash-0.8.10_p20120903-r1.ebuild, -gnash-0.8.10_p20120903.ebuild,
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 8814658d0474..a8272e969813 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnash-0.8.10-amf-include.patch 1245 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6 SHA512 46c2b9d4a57a1180626760ebcdbcbdc10c01fba4e01d8c45378ad26da3bf1181daaa54a2c88419452b6e691467c1ccb77374d8e926776b5f1b93ee2baa875986 WHIRLPOOL a6bc2db921b0e4cca443a0fe2b309d6e83409b93749241eeff600ae41977bcb07a8e16add81aabbf458e4a034eb8a5ed40198d7085152a2eabbd6ab742c62e89
 AUX gnash-0.8.10-boost-1.50.patch 1138 SHA256 d52ee4016c9bd764ad0eb416de7ea5fe97e543f2e04e84461d5a04f5cce52e5a SHA512 f9dcfe2dfa5f6135418e7f0b96ef0b81d9b350c62adc07935308dcb60e3c9b1df2784ee5d3b8bfee7ec0c75185a621314e3de540da27bc4af92b17b9ce87349e WHIRLPOOL b6933f8bdcad6a6fdfd1d17f3925604d2e48f60ee8ce93b45a7ae96751fa604fed6e2d369ce6fbd72975fedf1204c2d63c26ab9998f10374130468c74d75ea80
 AUX gnash-0.8.10-gettext-macro.patch 6296 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125 SHA512 6b1c06166b545a7cb430801db90d413dce78c2ad46239abc664ebcc24930acef4057380e7e0358b13ec8f41f48e0d277ce528e10b39dfba71ca302d0509f5b04 WHIRLPOOL 91dead0e4b9bb0a36a46b25b51b7ccdc55d5979ca837ae87485726743fde4597a4b8d5dbdebff7375de0d91cb9d7b50445672564968abccb994ebaf2232ad32e
@@ -10,6 +13,27 @@ AUX gnash-0.8.9-external-dejagnu.patch 700 SHA256 b838af0304d41165557dff2538031e
 AUX gnash-0.8.9-kde4-libdir.patch 498 SHA256 43a74367b0f7452bed23577ddda2bde692b6ce4d2bd1d56e480c4d37380af80d SHA512 df1a6faf5b3cae8a519b590ee3e26009b5a194a01f5dacc5b1862751118d1172f0babf85f7641d6b8e898d5013b6c11002c593df589c57312d842930ab964341 WHIRLPOOL 57ed37224e2c02de8ca648dc1ac172905384a254c537787d1d393e5f0b441654f74c1bd1efacf2178146ddcbfcbf11b453fc9aa4579c177168b659f69e20225f
 AUX gnash-0.8.9-klash.patch 471 SHA256 779f4be4eb25f654010b380fea4d6b092310d1f850acb040a203a7b8caf02bb8 SHA512 4a57310522ac2323eee26bb027432b12606d91add6d528b31afd69e172c73aa9f80bafc7c0a84fed4214773f901b65ddea4a7de67865f82a2984ac1dfe274c4d WHIRLPOOL a27cec3d6e62d86a42452cffad3ac376bd5a04de53818371bffa45c71c5f70e23962c0ab79293048e9358e46124352de191a5e82125069bffd8e8dbb20438696
 DIST gnash-0.8.10_p20131019.tar.xz 3868156 SHA256 93e5c82c9f5e326b8ddba3cb4c4178fb9428e92987b3b8e6ef59b201ef37782a SHA512 79b4e86275b6b11774212315ea3b4a6192177d297d4ebe93c39d69734dbaa4c893845dc606e724e03f6409f0695794ade0f2544e30cf2d291a42d0cf3d674dcc WHIRLPOOL fb9a9b9f00c10af75c595147ce3d9bdf18f5cfde907fa69c9d0e28a278ff4fa835eba4d1e19ea72ac65e6e0f769da30f5790c652e2df723c36db6e3ef4436851
+DIST gnash-0.8.10_p20150316.tar.xz 4031684 SHA256 0c380f7b6756ad8a4d5ca152933f9a51278e00d51b3677812c69d65a166e3a6c SHA512 3f166de91a2f9f538ef76d21f7e9c2c240a776855cfe00c4e39fd6c0b6718f450ffecac61f38a6e534c6eb3f5b747c1d800f5bc7712ece3dcf14be1ee50384d0 WHIRLPOOL 6dd3886b9bcca56fbf63442f25d7af9184188702a167d3962f97fcf0496a99898033ee52843f9bc53b73236b96e4995b882de9685898820cf0f6b27dccb881c9
 EBUILD gnash-0.8.10_p20131019.ebuild 7601 SHA256 f837950dd594b9c32ab12eb667767e6c22cee6b533899903fa3051497e67694e SHA512 41a85c00a5ad97a4004c9d7e8a647c1c1d6a69df8aa4643c6cb0dbd889f3858815d8f88764b913aea6c7fad958466c52872d731da6b1ba01833bed0d5f700199 WHIRLPOOL a62d69d2b27240613dfa645f2590e0ac8bcd93edcaa46693d769ffe3cccd3d42b8541b888687cffcefab81347d228236494bbe5e81810b6df706cf02bca1f68c
-MISC ChangeLog 32349 SHA256 44e2eb6131ddadfc94cacf0f5890f9bc879c66b9c1d6c642d67ce8876abd43ab SHA512 d195d3b9669154216ea75293f61fb98005f5e0d5edbf8f53028828730851e200f023bbd318f016b89b848434707cc934037d26dfd11b4664f0f446f36e91296c WHIRLPOOL f8fda34bbb8ccff79ef0bce3a9bdd389c16117c360df71431a478960fae40592b505003bab4a66b336002eefbe7c627d68642097e75281317d9024b91d49c7ca
+EBUILD gnash-0.8.10_p20150316.ebuild 7508 SHA256 d5b16bee672340a2b2114a9f962b6b1afa192e4c24a5563e088b725e09bae42a SHA512 7e9655576e59b450aaecd6c52544011013cd1693258a140fa674ff6af7d9767bd906e3f821a6d95fa47f7f755cc2f33072050022c09ac82be7977264dcb5aa51 WHIRLPOOL 59e8b26e1137b6c5f08751ee6b8bbbdeb9fb56437213307b15b185717c7b011cff2ea68e458d66169591c88553a4810b91826e4f324e17e71b262f40488c9ce9
+MISC ChangeLog 32524 SHA256 7f331d5f1e768d72b9544fd53c430f71e5ed4ee55f6da95b4fd852b88aef6a1e SHA512 888a21c998d83d23062c86f613618cfbcbad3f197fc1be51018518b8e69abf44b90a614ec215f8b8e8ad442c9b04a35ca818b5bd0c4e5fc7f0908886c8500954 WHIRLPOOL f356f687109d75a9b81cdbcbae9c0f5e176587c22aeed6db83f68d33c804ff5943e03d1ba14b9399a40af93d4f694d652498b25f55fa3642e60a713f0fbafcde
 MISC metadata.xml 1201 SHA256 32cb6f4ba1c04d234794340f1e27436e78491ff784ac4946c3a731d5c651c838 SHA512 97b38f936c135bbd792df7471467369aa8ab196cc3b6b46e0e4f460a12a8ab41ce978f12118ac208d3ea549186bd0ab148cedaf46c072c56a546275af652bea1 WHIRLPOOL 12c83a6ab3f7baa5e1360c2812dbfbef84761d5401fa4ed36cf341834106f693c9ab62b250f56b1b23191457dc646753969a1a9efff3b43b2bac6a18327556d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVFB8UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR7bcP/jXoZrzkrsitgmISfFydXpLR
+xmowZtm7YLCebfVQ9nRrDFLlyoTWm+1hkUCrR+PiXKTRMzsNkUYLmAxdjwItGzX/
+xLCi+OKvl7q64KZT4+9LZHc0q2t4UAU4YB+S9+9+2oCYnOeAm1YHafPzChb8Bib9
+0P3FIivVJj2PmcEnKjTbAM8EHsS2bnsdCzqMci8/A14oCzJcfF1PWjMIKUu1rJm9
+32HC6ShShDXhERs3qHcHD9KyZf3EOhl4klDL2QQz3QVERmUXMO71BeBWRcOjErQj
+IaYYIXX0sjie9s6i1v67b5S+LnuZDT2BvVkq/GaVp0RbU+rLOvRkgoJKQLNGnKWh
+a0frLOGGTwQf/vShUvqfwRdpXmJPGEAynYbnt0dze1npqmAGNShnP8rWzdBJsLcy
++S3sdLRvrdXGxtLAjXtwSt4jH+8S9CpO85Ag1K8Wmic0gWissE3VGfIVXJfwtPSW
+5+TDviZtxQeYVy7uU50gk7pj62MDjrwXXgUsjLtnwk/fWoOhRT/6Zw54i5gnqaTv
+gTrVet/ZnJIQhMTT8w0aC331jzkr6dVoOH3fnG3BzTzdqcKo0DVL/QiTAkQA7DQV
+yADBOkALvrzkTRhFU3AstRnmmHmryKzmP8gVUm13TJuXe4M32/FOpWngmiEr3wYU
+8PCixqH3cSem+JBp5f5t
+=U04q
+-----END PGP SIGNATURE-----
diff --git a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
new file mode 100644
index 000000000000..87dd5148f9ae
--- /dev/null
+++ b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild,v 1.1 2015/03/26 14:59:41 chithanh Exp $
+
+EAPI=5
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="optional"
+AT_M4DIR="cygnal"
+# won't build with python-3, bug #392969
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils kde4-base multilib nsplugins python-any-r1 flag-o-matic
+
+DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
+HOMEPAGE="http://www.gnu.org/software/gnash/"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.savannah.gnu.org/gnash.git"
+	inherit git-2
+else
+# Release tarball is b0rked, upstream #35612
+#	SRC_URI="mirror://gnu/${PN}/${PV}/${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk harden jemalloc kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
+REQUIRED_USE="dump? ( agg ffmpeg )
+	fbcon? ( agg )
+	nsplugin? ( gtk )
+	openvg? ( egl )
+	python? ( gtk )
+	vaapi? ( agg ffmpeg )
+	|| ( agg cairo opengl openvg )
+	|| ( dump fbcon gtk kde sdl )
+	"
+
+RDEPEND=">=dev-libs/boost-1.41.0:0=
+	dev-libs/expat
+	dev-libs/libxml2
+	virtual/jpeg
+	media-libs/libpng
+	net-misc/curl
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	media-libs/giflib
+	x11-proto/xproto
+	agg? ( x11-libs/agg )
+	cairo? ( x11-libs/cairo )
+	directfb? (
+		dev-libs/DirectFB
+	)
+	doc? (
+		>=app-text/docbook2X-0.8.8
+		app-text/docbook-sgml-utils
+	)
+	egl? (
+		media-libs/mesa[egl]
+	)
+	fbcon? (
+		x11-libs/tslib
+	)
+	ffmpeg? (
+		virtual/ffmpeg[vaapi?]
+	)
+	gconf? (
+		gnome-base/gconf
+	)
+	gstreamer? (
+		media-plugins/gst-plugins-ffmpeg
+		media-plugins/gst-plugins-mad
+		media-plugins/gst-plugins-meta
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		python? ( dev-python/pygtk:2 )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	kde? ( $(add_kdebase_dep kdebase-startkde) )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		gtk? ( x11-libs/gtkglext )
+	)
+	openvg? (
+		media-libs/mesa[openvg]
+	)
+	sdl? ( media-libs/libsdl[X] )
+	sdl-sound? ( media-libs/libsdl )
+	media-libs/speex[ogg]
+	sys-libs/zlib
+	>=sys-devel/libtool-2.2
+	mysql? ( virtual/mysql )
+	lirc? ( app-misc/lirc )
+	dbus? ( sys-apps/dbus )
+	ssh?  ( >=net-libs/libssh-0.4[server] )
+	ssl? ( dev-libs/openssl )
+	vaapi? ( x11-libs/libva[opengl?] )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	gnome? ( app-text/rarian )
+	nsplugin? ( net-misc/npapi-sdk )
+	test? ( dev-util/dejagnu )"
+# Tests hang with sandbox, bug #321017
+RESTRICT="test"
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	python-any-r1_pkg_setup
+
+	if use !ffmpeg && use !gstreamer; then
+		ewarn "You are trying to build Gnash without choosing a media handler."
+		ewarn "Sound and video playback will not work."
+	fi
+}
+
+src_unpack() {
+	default
+	# rename git snapshot directory to what portage expects
+	mv ${PN}-*/ ${P} || die
+}
+
+src_prepare() {
+	# Fix paths for klash, bug #339610
+	epatch "${FILESDIR}"/${PN}-0.8.9-klash.patch
+
+	# Use external dejagnu for tests, bug #321017
+	epatch "${FILESDIR}"/${PN}-0.8.9-external-dejagnu.patch
+
+	# Fix building on ppc64, bug #342535
+	use ppc64 && append-flags -mminimal-toc
+
+	# Fix kde multilib library path, bug #391283
+	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch
+
+	# Fix libamf includes
+	epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
+
+	eautoreconf
+}
+src_configure() {
+	local device gui input media myconf myext renderers
+
+	# Set nsplugin install directory.
+	use nsplugin && myconf="${myconf} --with-npapi-plugindir=/usr/$(get_libdir)/gnash/npapi/"
+
+	# Set hardware acceleration.
+	use X && device+=",x11"
+	use directfb && device+=",directfb"
+	use egl && device+=",egl"
+	use fbcon && device+=",rawfb"
+	use vaapi && device+=",vaapi"
+	[[ "${device}x" == "x" ]] && device+=",none"
+
+	# Set rendering engine.
+	use agg && renderers+=",agg"
+	use cairo && renderers+=",cairo"
+	use opengl && renderers+=",opengl"
+	use openvg && renderers+=",openvg"
+
+	# Set kde and konqueror plugin directories.
+	if use kde; then
+		myconf="${myconf}
+			--with-plugins-install=system
+			--with-kde4-incl=${KDEDIR}/include
+			--with-kde4-configdir=${KDEDIR}/share/config
+			--with-kde4-prefix=${KDEDIR}
+			--with-kde4-lib=${KDEDIR}/$(get_libdir)
+			--with-kde-appsdatadir=${KDEDIR}/share/apps/klash
+			--with-kde4-servicesdir=${KDEDIR}/share/kde4/services
+			--with-kde4-plugindir=${KDEDIR}/$(get_libdir)/kde4"
+	fi
+
+	# Set media handler.
+	use ffmpeg || use gstreamer || media+=",none"
+	use ffmpeg && media+=",ffmpeg"
+	use gstreamer && media+=",gst"
+
+	# Set gui.
+	use dump && gui="${gui},dump"
+	use fbcon && gui="${gui},fb"
+	use gtk && gui=",gtk"
+	use kde && gui="${gui},kde4"
+	use sdl && gui="${gui},sdl"
+
+	if use sdl-sound; then
+		myconf="${myconf} --enable-sound=sdl"
+	else
+		myconf="${myconf} --enable-sound=none"
+	fi
+
+	# Set extensions
+	use mysql && myext=",mysql"
+	use gtk && myext="${myext},gtk"
+	use lirc && myext="${myext},lirc"
+	use dbus && myext="${myext},dbus"
+
+	# Strip extra comma from gui, myext, hwaccel and renderers.
+	device=$( echo $device | sed -e 's/,//' )
+	gui=$( echo $gui | sed -e 's/,//' )
+	myext=$( echo $myext | sed -e 's/,//' )
+	renderers=$( echo $renderers | sed -e 's/,//' )
+	media=$( echo $media | sed -e 's/,//' )
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-kparts3 \
+		$(use_enable cygnal) \
+		$(use_enable cygnal cgibins) \
+		$(use_enable doc docbook) \
+		$(use_enable gnome ghelp) \
+		$(use_enable harden) \
+		$(use_enable jemalloc) \
+		$(use_enable kde kparts4) \
+		$(use_enable nls) \
+		$(use_enable nsplugin npapi) \
+		$(use_enable python) \
+		$(use_enable ssh) \
+		$(use_enable ssl) \
+		$(use_enable test testsuite) \
+		$(use_with gconf) \
+		--enable-gui=${gui} \
+		--enable-device=${device} \
+		--enable-extensions=${myext} \
+		--enable-renderer=${renderers} \
+		--enable-media=${media} \
+		${myconf}
+}
+src_test() {
+	local log=testsuite-results.txt
+	cd testsuite
+	emake check || die "make check failed"
+	./anaylse-results.sh > $log || die "results analyze failed"
+	cat $log
+}
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install nsplugin in directory set by --with-npapi-plugindir.
+	if use nsplugin; then
+		emake DESTDIR="${D}" install-plugin || die "install plugins failed"
+	fi
+
+	# Install kde konqueror plugin.
+	if use kde; then
+		pushd "${S}/plugin/klash4" >& /dev/null || die
+		emake DESTDIR="${D}" install-plugin || die "install kde plugins failed"
+		popd >& /dev/null
+	fi
+	# Create a symlink in /usr/$(get_libdir)/nsbrowser/plugins to the nsplugin install directory.
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gnash/npapi/libgnashplugin.so
+
+	# Remove eglinfo, bug #463654
+	if use egl; then
+		rm -f "${D}"/usr/bin/eglinfo || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
+pkg_postinst() {
+	if use !gnome || use !gstreamer && use !ffmpeg ; then
+		ewarn ""
+		ewarn "Gnash was built without a media handler and or http handler !"
+		ewarn ""
+		ewarn "If you want Gnash to support video then you will need to"
+		ewarn "rebuild Gnash with either the ffmpeg or gstreamer and gnome use flags set."
+		ewarn ""
+	fi
+	ewarn "${PN} is still in heavy development"
+	ewarn "Please first report bugs on upstream gnashdevs and deal with them"
+	ewarn "And then report a Gentoo bug to the maintainer"
+	use kde && kde4-base_pkg_postinst
+}