proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

8 files changed, 713 insertions, 0 deletions

diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
new file mode 100644
index 000000000000..5c946be1876d
--- /dev/null
+++ b/www-plugins/lightspark/Manifest
@@ -0,0 +1,3 @@
+DIST lightspark-0.7.1.tar.gz 920218 SHA256 a6f9ef13ddf3ebd700d4daaeeb4e9497889c18697aeca1ddcb30ac8cdc20e931 SHA512 a8c10782f144cf4b9a39d32ca4c78f441957550f790161671fa52fec686672f22ab977b41c55b5e33d1e65eaa28e78bf48e729ce01f51b56ef24d2d09e62eeae WHIRLPOOL 0842b113070cc679d8e960e558bf4d7562f6796f60b923fc4fe41f3e20f4cb86da0340d8f27543d86c2cf6aefaf1232990c9ef51bcdcb765dc89befee16823cc
+DIST lightspark-0.7.2.tar.gz 955952 SHA256 70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b SHA512 90442d92b54bef18c20952aefd4dcd5cab446213cf9c186b340c9c8e0dd3ef28d034e888ca26f5b9ffe93d0cfd6e1a3c696fbd6f561aa21ff909d463abd27d29 WHIRLPOOL 9465424e2d8b46adb5aadc54239b6d58105703c519f5073ffbc3eb7a03dacca68cf64d57864de3c0aefd6d7cd4c3a88b0deb8417917980a8b60fa49397dc0631
+DIST lightspark-0.7.2_p20150318.tar.gz 1039961 SHA256 92e4fa23e9760ebc73efd269a373c7e566eb1550ccf1c7cc7cff58b0d53d048a SHA512 2deb55a9ab7f00d0469b8fd5b053f43155d63c12f4b40bd40d6aa802501b5c7d4d3fe5d442f6ddb67eb1f592d48ccd1490b92e738359e78c162a39eb1605f9a5 WHIRLPOOL 72b471f193ffeba8e2078cad35917eac2d5c8d399cc18a177c1da0a88f85506025f28c86cb22a4dac6dd92feb0a32bc202c60cfe8ca334407f1d1fa6ba2f305f
diff --git a/www-plugins/lightspark/files/lightspark-0.7.2-ffmpeg20.patch b/www-plugins/lightspark/files/lightspark-0.7.2-ffmpeg20.patch
new file mode 100644
index 000000000000..c0a1f5f3610c
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.7.2-ffmpeg20.patch
@@ -0,0 +1,155 @@
+From fff7e63650c1569908bf80f11a123e051e993f31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle@blau-weissoedingen.de>
+Date: Fri, 16 Aug 2013 20:30:28 +0200
+Subject: [PATCH] fix compilation with ffmpeg 2.0 avcodec_decode_audio4 seems
+ not to deliver data in AV_SAMPLE_FMT_S16 format, so we have to use
+ libavresample for resampling
+
+---
+ CMakeLists.txt           |  2 +-
+ conf/FindFFMpeg.cmake    |  6 ++++-
+ src/backends/decoder.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++------
+ src/backends/decoder.h   |  8 ++++++
+ 4 files changed, 70 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33dbb85..d3a964b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -286,7 +286,7 @@ IF(AUDIO_BACKEND)
+ ENDIF(AUDIO_BACKEND)
+ 
+ IF(ENABLE_LIBAVCODEC)
+-	pkg_check_modules(FFMPEG libavcodec libavutil libavformat)
++	pkg_check_modules(FFMPEG libavcodec libavutil libavformat libavresample)
+ 	IF(NOT(FFMPEG_FOUND))
+ 		INCLUDE(FindFFMpeg REQUIRED)
+ 	ENDIF(NOT(FFMPEG_FOUND))
+diff --git a/conf/FindFFMpeg.cmake b/conf/FindFFMpeg.cmake
+index 2b4dd98..8246c15 100644
+--- a/conf/FindFFMpeg.cmake
++++ b/conf/FindFFMpeg.cmake
+@@ -23,7 +23,11 @@ FIND_LIBRARY(FFMPEG_AVFORMAT_LIBRARY NAMES
+     avformat
+ )
+ 
+-SET(FFMPEG_LIBRARY ${FFMPEG_AVCODEC_LIBRARY} ${FFMPEG_AVUTIL_LIBRARY} ${FFMPEG_AVFORMAT_LIBRARY})
++FIND_LIBRARY(FFMPEG_AVRESAMPLE_LIBRARY NAMES
++    avresample
++)
++
++SET(FFMPEG_LIBRARY ${FFMPEG_AVCODEC_LIBRARY} ${FFMPEG_AVUTIL_LIBRARY} ${FFMPEG_AVFORMAT_LIBRARY} ${FFMPEG_AVRESAMPLE_LIBRARY})
+ MARK_AS_ADVANCED(FFMPEG_LIBRARY)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if 
+diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp
+index 22eac2e..4b3148c 100755
+--- a/src/backends/decoder.cpp
++++ b/src/backends/decoder.cpp
+@@ -295,6 +295,8 @@ bool FFMpegVideoDecoder::decodePacket(AVPacket* pkt, uint32_t time)
+ #else
+ 	int ret=avcodec_decode_video(codecContext, frameIn, &frameOk, pkt->data, pkt->size);
+ #endif
++	if (ret < 0)
++		return false;
+ 
+ 	assert_and_throw(ret==(int)pkt->size);
+ 	if(frameOk)
+@@ -612,10 +614,33 @@ uint32_t FFMpegAudioDecoder::decodeData(uint8_t* data, int32_t datalen, uint32_t
+ 		ret=-1;
+ 	else
+ 	{
+-		//This is suboptimal but equivalent to what libavcodec
+-		//does for the compatibility version of avcodec_decode_audio3
+-		memcpy(curTail.samples, frameIn->extended_data[0], frameIn->linesize[0]);
+-		maxLen=frameIn->linesize[0];
++		if (frameIn->format != AV_SAMPLE_FMT_S16)
++		{
++			AVAudioResampleContext * avr = avresample_alloc_context();
++			av_opt_set_int(avr, "in_channel_layout",  frameIn->channel_layout, 0);
++			av_opt_set_int(avr, "out_channel_layout", frameIn->channel_layout,  0);
++			av_opt_set_int(avr, "in_sample_rate",     frameIn->sample_rate,     0);
++			av_opt_set_int(avr, "out_sample_rate",    frameIn->sample_rate,     0);
++			av_opt_set_int(avr, "in_sample_fmt",      frameIn->format,   0);
++			av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_S16,    0);
++			avresample_open(avr);
++			
++			uint8_t *output;
++			int out_linesize;
++			int out_samples = avresample_available(avr) + av_rescale_rnd(avresample_get_delay(avr) + frameIn->linesize[0], frameIn->sample_rate, frameIn->sample_rate, AV_ROUND_UP);
++			av_samples_alloc(&output, &out_linesize, frameIn->nb_samples, out_samples, AV_SAMPLE_FMT_S16, 0);
++			maxLen = avresample_convert(avr, &output, out_linesize, out_samples, frameIn->extended_data, frameIn->linesize[0], frameIn->nb_samples)*4;
++			memcpy(curTail.samples, output, maxLen);
++			av_freep(&output);
++			avresample_free(&avr);
++		}
++		else 
++		{
++			//This is suboptimal but equivalent to what libavcodec
++			//does for the compatibility version of avcodec_decode_audio3
++			memcpy(curTail.samples, frameIn->extended_data[0], frameIn->linesize[0]);
++			maxLen=frameIn->linesize[0];
++		}
+ 	}
+ #else
+ 	int32_t ret=avcodec_decode_audio3(codecContext, curTail.samples, &maxLen, &pkt);
+@@ -660,10 +685,33 @@ uint32_t FFMpegAudioDecoder::decodePacket(AVPacket* pkt, uint32_t time)
+ 		ret=-1;
+ 	else
+ 	{
+-		//This is suboptimal but equivalent to what libavcodec
+-		//does for the compatibility version of avcodec_decode_audio3
+-		memcpy(curTail.samples, frameIn->extended_data[0], frameIn->linesize[0]);
+-		maxLen=frameIn->linesize[0];
++		if (frameIn->format != AV_SAMPLE_FMT_S16)
++		{
++			AVAudioResampleContext * avr = avresample_alloc_context();
++			av_opt_set_int(avr, "in_channel_layout",  frameIn->channel_layout, 0);
++			av_opt_set_int(avr, "out_channel_layout", frameIn->channel_layout,  0);
++			av_opt_set_int(avr, "in_sample_rate",     frameIn->sample_rate,     0);
++			av_opt_set_int(avr, "out_sample_rate",    frameIn->sample_rate,     0);
++			av_opt_set_int(avr, "in_sample_fmt",      frameIn->format,   0);
++			av_opt_set_int(avr, "out_sample_fmt",     AV_SAMPLE_FMT_S16,    0);
++			avresample_open(avr);
++			
++			uint8_t *output;
++			int out_linesize;
++			int out_samples = avresample_available(avr) + av_rescale_rnd(avresample_get_delay(avr) + frameIn->linesize[0], frameIn->sample_rate, frameIn->sample_rate, AV_ROUND_UP);
++			av_samples_alloc(&output, &out_linesize, frameIn->nb_samples, out_samples, AV_SAMPLE_FMT_S16, 0);
++			maxLen = avresample_convert(avr, &output, out_linesize, out_samples, frameIn->extended_data, frameIn->linesize[0], frameIn->nb_samples)*4;
++			memcpy(curTail.samples, output, maxLen);
++			av_freep(&output);
++			avresample_free(&avr);
++		}
++		else 
++		{
++			//This is suboptimal but equivalent to what libavcodec
++			//does for the compatibility version of avcodec_decode_audio3
++			memcpy(curTail.samples, frameIn->extended_data[0], frameIn->linesize[0]);
++			maxLen=frameIn->linesize[0];
++		}
+ 	}
+ #elif HAVE_AVCODEC_DECODE_AUDIO3
+ 	int ret=avcodec_decode_audio3(codecContext, curTail.samples, &maxLen, pkt);
+diff --git a/src/backends/decoder.h b/src/backends/decoder.h
+index 93950ad..28bd232 100644
+--- a/src/backends/decoder.h
++++ b/src/backends/decoder.h
+@@ -28,6 +28,14 @@
+ {
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
++#include <libavresample/avresample.h>
++#include <libavutil/opt.h>
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++#ifndef CodecID
++#define CodecID AVCodecID
++#endif
+ #define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
+ }
+ #else
+-- 
+1.8.4
+
diff --git a/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch b/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch
new file mode 100644
index 000000000000..2e452331ce38
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch
@@ -0,0 +1,103 @@
+diff -up lightspark-0.7.2/conf/FindLLVM.cmake.llvm33 lightspark-0.7.2/conf/FindLLVM.cmake
+--- lightspark-0.7.2/conf/FindLLVM.cmake.llvm33	2013-03-16 12:19:18.000000000 +0100
++++ lightspark-0.7.2/conf/FindLLVM.cmake	2013-05-11 11:57:36.455450049 +0200
+@@ -168,11 +168,16 @@ else (LLVM_INCLUDE_DIR)
+ 
+   set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
+   check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H)
++  check_include_file_cxx("llvm/IR/DataLayout.h" HAVE_IR_DATALAYOUT_H)
+   unset(CMAKE_REQUIRED_INCLUDES)
+   MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H})
++  MESSAGE(STATUS "HAVE_IR_DATALAYOUT_H: " ${HAVE_IR_DATALAYOUT_H})
+   IF(HAVE_DATALAYOUT_H)
+     ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H)
+   ENDIF(HAVE_DATALAYOUT_H)
++  IF(HAVE_IR_DATALAYOUT_H)
++    ADD_DEFINITIONS(-DHAVE_IR_DATALAYOUT_H)
++  ENDIF(HAVE_IR_DATALAYOUT_H)
+   
+   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags  OUTPUT_VARIABLE LLVM_COMPILE_FLAGS )
+   MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS})
+diff -up lightspark-0.7.2/src/scripting/abc.cpp.llvm33 lightspark-0.7.2/src/scripting/abc.cpp
+--- lightspark-0.7.2/src/scripting/abc.cpp.llvm33	2013-03-16 12:19:18.000000000 +0100
++++ lightspark-0.7.2/src/scripting/abc.cpp	2013-05-11 11:57:36.451450048 +0200
+@@ -23,12 +23,19 @@
+ 
+ #include "compat.h"
+ 
+-#include <llvm/Module.h>
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+ #include <llvm/ExecutionEngine/JIT.h>
+ #include <llvm/PassManager.h>
+-#include <llvm/LLVMContext.h>
+-#ifdef HAVE_DATALAYOUT_H
++#ifdef HAVE_IR_DATALAYOUT_H
++#  include <llvm/IR/Module.h>
++#  include <llvm/IR/LLVMContext.h>
++#else
++#  include <llvm/Module.h>
++#  include <llvm/LLVMContext.h>
++#endif
++#ifdef HAVE_IR_DATALAYOUT_H
++#  include <llvm/IR/DataLayout.h>
++#elif defined HAVE_DATALAYOUT_H
+ #  include <llvm/DataLayout.h>
+ #else
+ #  include <llvm/Target/TargetData.h>
+@@ -1489,7 +1496,7 @@ void ABCVm::Run(ABCVm* th)
+ 		assert_and_throw(th->ex);
+ 
+ 		th->FPM=new llvm::FunctionPassManager(th->module);
+-#ifdef HAVE_DATALAYOUT_H
++#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H
+ 		th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout()));
+ #else
+ 		th->FPM->add(new llvm::TargetData(*th->ex->getTargetData()));
+diff -up lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33 lightspark-0.7.2/src/scripting/abc_codesynt.cpp
+--- lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33	2013-03-16 12:19:18.000000000 +0100
++++ lightspark-0.7.2/src/scripting/abc_codesynt.cpp	2013-05-11 11:59:23.066458300 +0200
+@@ -25,18 +25,29 @@
+ #endif
+ 
+ #include "compat.h"
+-#include <llvm/Module.h>
+-#include <llvm/DerivedTypes.h>
+ #include <llvm/ExecutionEngine/ExecutionEngine.h>
+ #include <llvm/PassManager.h>
+-#include <llvm/Constants.h>
+-#ifdef HAVE_IRBUILDER_H
++#ifdef HAVE_IR_DATALAYOUT_H
++#  include <llvm/IR/Constants.h>
++#  include <llvm/IR/DerivedTypes.h>
++#  include <llvm/IR/Module.h>
++#  include <llvm/IR/LLVMContext.h>
++#else
++#  include <llvm/Constants.h>
++#  include <llvm/DerivedTypes.h>
++#  include <llvm/Module.h>
++#  include <llvm/LLVMContext.h>
++#endif
++#ifdef HAVE_IR_DATALAYOUT_H
++#  include <llvm/IR/IRBuilder.h>
++#elif defined HAVE_IRBUILDER_H
+ #  include <llvm/IRBuilder.h>
+ #else
+ #  include <llvm/Support/IRBuilder.h>
+ #endif
+-#include <llvm/LLVMContext.h>
+-#ifdef HAVE_DATALAYOUT_H
++#ifdef HAVE_IR_DATALAYOUT_H
++#  include <llvm/IR/DataLayout.h>
++#elif defined HAVE_DATALAYOUT_H
+ #  include <llvm/DataLayout.h>
+ #else
+ #  include <llvm/Target/TargetData.h>
+@@ -279,7 +290,7 @@ void ABCVm::registerFunctions()
+ 	llvm::FunctionType* FT=NULL;
+ 
+ 	//Create types
+-#ifdef HAVE_DATALAYOUT_H
++#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H
+ 	ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context());
+ #else
+ 	ptr_type=ex->getTargetData()->getIntPtrType(llvm_context());
diff --git a/www-plugins/lightspark/lightspark-0.7.1.ebuild b/www-plugins/lightspark/lightspark-0.7.1.ebuild
new file mode 100644
index 000000000000..5c9fe64f209e
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-libs/libpng
+	media-libs/libsdl
+	>=sys-devel/gcc-4.6.0[cxx]
+	>=sys-devel/llvm-3
+	<sys-devel/llvm-3.3
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	curl? (
+		net-misc/curl
+	)
+	ffmpeg? (
+		virtual/ffmpeg
+	)
+	!gles? (
+		>=media-libs/glew-1.5.3
+		virtual/opengl
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	rtmp? (
+		media-video/rtmpdump
+	)
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+			eerror "You need at least sys-devel/gcc-4.6.0"
+			die "You need at least sys-devel/gcc-4.6.0"
+		fi
+	fi
+}
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
+
+	local mycmakeargs=(
+		$(cmake-utils_use curl ENABLE_CURL)
+		$(cmake-utils_use gles ENABLE_GLES2)
+		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+	# default to sdl audio if pulseaudio plugin is not built, bug #406197
+	if use sdl && ! use pulseaudio; then
+		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+	if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}
diff --git a/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild b/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..84dedd7858c3
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-libs/libpng
+	media-libs/libsdl
+	>=sys-devel/gcc-4.6.0[cxx]
+	(
+		<sys-devel/llvm-3.4
+		>=sys-devel/llvm-3
+	)
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	curl? (
+		net-misc/curl
+	)
+	ffmpeg? (
+		virtual/ffmpeg
+	)
+	!gles? (
+		>=media-libs/glew-1.5.3
+		virtual/opengl
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	rtmp? (
+		media-video/rtmpdump
+	)
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+PATCHES=(
+	"${FILESDIR}/${P}-llvm33.patch"
+	"${FILESDIR}/${P}-ffmpeg20.patch"
+)
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+			eerror "You need at least sys-devel/gcc-4.6.0"
+			die "You need at least sys-devel/gcc-4.6.0"
+		fi
+	fi
+}
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
+
+	local mycmakeargs=(
+		$(cmake-utils_use curl ENABLE_CURL)
+		$(cmake-utils_use gles ENABLE_GLES2)
+		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+	# default to sdl audio if pulseaudio plugin is not built, bug #406197
+	if use sdl && ! use pulseaudio; then
+		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+}
diff --git a/www-plugins/lightspark/lightspark-0.7.2.ebuild b/www-plugins/lightspark/lightspark-0.7.2.ebuild
new file mode 100644
index 000000000000..5c9fe64f209e
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-libs/libpng
+	media-libs/libsdl
+	>=sys-devel/gcc-4.6.0[cxx]
+	>=sys-devel/llvm-3
+	<sys-devel/llvm-3.3
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	curl? (
+		net-misc/curl
+	)
+	ffmpeg? (
+		virtual/ffmpeg
+	)
+	!gles? (
+		>=media-libs/glew-1.5.3
+		virtual/opengl
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	rtmp? (
+		media-video/rtmpdump
+	)
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+			eerror "You need at least sys-devel/gcc-4.6.0"
+			die "You need at least sys-devel/gcc-4.6.0"
+		fi
+	fi
+}
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
+
+	local mycmakeargs=(
+		$(cmake-utils_use curl ENABLE_CURL)
+		$(cmake-utils_use gles ENABLE_GLES2)
+		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+	# default to sdl audio if pulseaudio plugin is not built, bug #406197
+	if use sdl && ! use pulseaudio; then
+		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+	if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}
diff --git a/www-plugins/lightspark/lightspark-0.7.2_p20150318.ebuild b/www-plugins/lightspark/lightspark-0.7.2_p20150318.ebuild
new file mode 100644
index 000000000000..063226e5f094
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.2_p20150318.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-libs/libpng
+	media-libs/libsdl
+	>=sys-devel/gcc-4.6.0[cxx]
+	>=sys-devel/llvm-3.4
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	curl? (
+		net-misc/curl
+	)
+	ffmpeg? (
+		virtual/ffmpeg
+	)
+	!gles? (
+		>=media-libs/glew-1.5.3
+		virtual/opengl
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	rtmp? (
+		media-video/rtmpdump
+	)
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+			eerror "You need at least sys-devel/gcc-4.6.0"
+			die "You need at least sys-devel/gcc-4.6.0"
+		fi
+	fi
+}
+
+src_unpack() {
+	default
+	# rename snapshot directory
+	mv "${WORKDIR}"/${PN}-* "${WORKDIR}"/${P} || die
+}
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
+
+	local mycmakeargs=(
+		$(cmake-utils_use curl ENABLE_CURL)
+		$(cmake-utils_use gles ENABLE_GLES2)
+		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+	# default to sdl audio if pulseaudio plugin is not built, bug #406197
+	if use sdl && ! use pulseaudio; then
+		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+	if use nsplugin && has_version www-plugins/gnash[nsplugin]; then
+		elog "Having two plugins installed for the same MIME type may confuse"
+		elog "Mozilla based browsers. It is recommended to disable the nsplugin"
+		elog "USE flag for either gnash or lightspark. For details, see"
+		elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848"
+	fi
+}
diff --git a/www-plugins/lightspark/metadata.xml b/www-plugins/lightspark/metadata.xml
new file mode 100644
index 000000000000..c2b52fa628fd
--- /dev/null
+++ b/www-plugins/lightspark/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>chithanh@gentoo.org</email>
+		<name>Chí-Thanh Christopher Nguyễn</name>
+	</maintainer>
+	<use>
+		<flag name="gles">Replace default OpenGL renderer with GLESv2</flag>
+		<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">lightspark</remote-id>
+	</upstream>
+</pkgmetadata>