[gentoo-commits] proj/mozilla:master commit in: media-video/vlc/files/, dev-java/icedtea-web/files/, dev-java/icedtea-web/, ...

[Jory Pratt]

commit:     d8e8622db2566c67114f5fa37cfa6893c7a6d64d
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 14:47:10 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 14:47:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d8e8622d

add npapi-sdk which has support for icedtea-web,vlc from mgorny's
overlay

---
 dev-java/icedtea-web/Manifest                      |   16 +
 ...ng-NPAPI-SDK-headers-instead-of-whole-xul.patch |   38 ++
 dev-java/icedtea-web/icedtea-web-1.1.1.ebuild      |  147 ++++++++
 dev-java/icedtea-web/metadata.xml                  |   19 +
 media-video/vlc/Manifest                           |   17 +
 .../0001-Support-building-against-NPAPI-SDK.patch  |   39 ++
 media-video/vlc/metadata.xml                       |   81 +++++
 media-video/vlc/vlc-1.1.11.ebuild                  |  381 ++++++++++++++++++++
 net-misc/npapi-sdk/Manifest                        |   14 +
 net-misc/npapi-sdk/metadata.xml                    |    9 +
 net-misc/npapi-sdk/npapi-sdk-9999.ebuild           |   33 ++
 11 files changed, 794 insertions(+), 0 deletions(-)

diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
new file mode 100644
index 0000000..922279b
--- /dev/null
+++ b/dev-java/icedtea-web/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7
+DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
+EBUILD icedtea-web-1.1.1.ebuild 4135 RMD160 c46e54bb74408834370f820a99dc2e71a6e40c55 SHA1 f5b58d296b2a8b06a0d313466396dfc27f1ca68d SHA256 f7e914de1d7d3ab99f9a7b53b726162fdce056b280507980e1f79a14bc64c861
+MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQEIAAYFAk5kj2YACgkQfXuS5UK5QB0PeQP9F8ZYxcPrc6emsos1xFMuKk1y
+9zQTy5LNgx0hN1jUTNbHhD6Udvuincy+ysb0D81NqdhBY5kvJtbZxFh8EIiH3vqD
+C/ndtk3rYIkJQfvLlh9J04GiZfhG1IAoL79FHaunARXVETiYB38SJkvh3R2LPJAz
+y1nl0phlAcCMJKZffWA=
+=5v6N
+-----END PGP SIGNATURE-----

diff --git a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
new file mode 100644
index 0000000..5e85961
--- /dev/null
+++ b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
@@ -0,0 +1,38 @@
+From 7544a3364642a820737ba8d943e8deb2e39b6aa6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Mon, 5 Sep 2011 00:26:38 +0200
+Subject: [PATCH] Support using NPAPI-SDK headers instead of whole xulrunner.
+
+The first NPAPI-SDK header package with npapi-sdk.pc comes with libxul 2.0
+headers, thus hardcoded that version into it. But the code should be modified
+to use NPAPI versioning rather than Mozilla one. Or just drop compat with
+ancient versions.
+---
+ acinclude.m4 |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 3c3803b..58482f1 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -346,8 +346,15 @@ if test "x${enable_plugin}" = "xyes" ; then
+   AC_SUBST(GTK_CFLAGS)
+   AC_SUBST(GTK_LIBS)
+ 
+-  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+-    
++  PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
++    AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
++      # XXX: use NPAPI versions instead
++      xulrunner_cv_collapsed_version=20000000
++    ])
++  ], [
++    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
++  ])
++
+   AC_SUBST(MOZILLA_CFLAGS)
+   AC_SUBST(MOZILLA_LIBS)
+ fi
+-- 
+1.7.6.1
+

diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
new file mode 100644
index 0000000..968ba5f
--- /dev/null
+++ b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.1 2011/07/22 09:08:37 caster Exp $
+# Build written by Andrew John Hughes (ahughes@××××××.com)
+
+EAPI="2"
+
+inherit autotools base eutils java-pkg-2 java-vm-2
+
+LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
+SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="build doc +nsplugin"
+
+RDEPEND="dev-java/icedtea:${SLOT}"
+DEPEND="${RDEPEND}
+	nsplugin? (
+		|| ( net-misc/npapi-sdk
+			>=net-libs/xulrunner-1.9.1 ) )"
+
+# a bit of hack so the VM switching is triggered without causing dependency troubles
+JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
+JAVA_PKG_WANT_SOURCE="1.6"
+JAVA_PKG_WANT_TARGET="1.6"
+
+pkg_setup() {
+	# quite a hack since java-config does not provide a way for a package
+	# to limit supported VM's for building and their preferred order
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
+	elif has_version dev-java/icedtea:${SLOT}; then
+		JAVA_PKG_FORCE_VM="icedtea${SLOT}"
+	else
+		JAVA_PKG_FORCE_VM=""
+		# don't die just yet if merging a binpkg - bug #258423
+		DIE_IF_NOT_BINPKG=true
+	fi
+
+	# if the previous failed, don't even run java eclasses pkg_setup
+	# as it might also die when no VM is present
+	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
+		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
+		java-vm-2_pkg_setup
+		java-pkg-2_pkg_setup
+	fi
+}
+
+unset_vars() {
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+}
+
+src_unpack() {
+	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
+		die "Unable to find a supported VM for building"
+	fi
+
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
+	)
+
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local vmhome=$(java-config -O)
+
+	if use build; then
+		icedteadir="${ICEDTEA_BIN_DIR}"
+		installdir="/opt/icedtea${SLOT}-web-bin"
+	else
+		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	fi
+
+	unset_vars
+
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
+		VMHANDLE="icedtea${SLOT}"
+	else
+		die "Unexpected install location of IcedTea${SLOT}"
+	fi
+
+	einfo "Installing IcedTea-Web in ${installdir}"
+	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
+	if [ ! -e ${vmhome} ] ; then
+		eerror "Could not find JDK install directory ${vmhome}."
+		die
+	fi
+
+	# we need to override all *dir variables that econf sets
+	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
+	# the suffix the man page will end up compressed with, anyway
+	econf \
+		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
+		--with-jdk-home=${icedteadir} \
+		$(use_enable doc docs) \
+		$(use_enable nsplugin plugin) \
+		|| die "configure failed"
+}
+
+src_compile() {
+	# we need this to override the src_compile from java-pkg-2
+	default
+}
+
+src_install() {
+	# parallel make problem bug #372235
+	emake -j1 DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS README NEWS || die
+
+	if use nsplugin; then
+		local arch=${ARCH};
+		use x86 && arch=i386;
+		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
+	fi
+
+	for binary in javaws itweb-settings; do
+		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
+		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
+	done
+}
+
+pkg_postinst() {
+	java-vm_check-nsplugin
+	java_mozilla_clean_
+
+	if use nsplugin; then
+		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
+		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
+	fi
+}
+
+pkg_prerm() {
+	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	:;
+}

diff --git a/dev-java/icedtea-web/metadata.xml b/dev-java/icedtea-web/metadata.xml
new file mode 100644
index 0000000..08e1286
--- /dev/null
+++ b/dev-java/icedtea-web/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>gnu_andrew@××××××××××.org</email>
+  <name>Andrew John Hughes</name>
+  <description>Proxy Maintainer</description>
+</maintainer>
+<maintainer>
+  <email>caster@g.o</email>
+  <name>Vlastimil Babka</name>
+  <description>Commiter (CC me)</description>
+</maintainer>
+<longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription>
+<use>
+  <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+</use>
+</pkgmetadata>

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
new file mode 100644
index 0000000..58239fe
--- /dev/null
+++ b/media-video/vlc/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0001-Support-building-against-NPAPI-SDK.patch 1459 RMD160 7213594ec7d33ed1061a5f4dc0c96091bc4a78c9 SHA1 fe3e7d1f220b8bfbbcdc5ba47965cde73908f7cb SHA256 915cbfc4a555a67c372e1ee336e123bd64db7f07ea11f594e631bf097b251ae7
+DIST vlc-1.1.11.tar.bz2 26319862 RMD160 fa8a32a8e81a5f707b3cace6fa9808d5d7cb9fe6 SHA1 068e75bdbfe6e595a4db14ad49e05688c8b1d5ad SHA256 682560be08b82bedfaf30d8a611d80093c5883c1de72fcbcf05715b8e9f4e1cb
+DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
+EBUILD vlc-1.1.11.ebuild 12481 RMD160 8eeefb9158407ea63ed1ee701e92117c97ab58f3 SHA1 0745c270209f97b3a3e45ae7c300bfc4bab2eb5b SHA256 3b1cd2dc06056c86164782cb5c0bf20ed68b4f78ae80c7246f3998e39a017d2c
+MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQEIAAYFAk5kj1cACgkQfXuS5UK5QB07ngQAldMObOjoqde2JoOx6YYCvH5M
+a+kfjbE2kHiYRDRxUSRGtcTHjf/Pa5X6a0pRPfW8bkrqf+14XkZb73eXXp2eOCDU
+n2tPJp5fQZ6KMziwaFHpNYp+WLlxZMlhzgEIVg1wAZzcQy9z04nRiGgfy6xa6laQ
+AdWtKPY5hTytksUL7Gg=
+=RVrP
+-----END PGP SIGNATURE-----

diff --git a/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
new file mode 100644
index 0000000..1146565
--- /dev/null
+++ b/media-video/vlc/files/0001-Support-building-against-NPAPI-SDK.patch
@@ -0,0 +1,39 @@
+From 8d7943b1b19870b1aaa5d3058d79273661bbc25a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
+Date: Mon, 5 Sep 2011 10:43:39 +0200
+Subject: [PATCH] Support building against NPAPI-SDK.
+
+---
+ configure.ac |   13 ++++++++++---
+ 1 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86a7eac..de86fca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4555,12 +4555,19 @@ then
+       found=1
+     else
+       if test -n "$PKG_CONFIG"; then
+-        for i in "${with_mozilla_pkg}" libxul {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin; do
++        for i in "${with_mozilla_pkg}" npapi-sdk {seamonkey,iceape,xulrunner,firefox,iceweasel,mozilla}-plugin libxul; do
+           if test -n "$i"
+           then
+             echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD
+-            AC_MSG_CHECKING([for $i >= 1.9.2])
+-            if $PKG_CONFIG --exists --print-errors "$i >= 1.9.2" 2>&AS_MESSAGE_LOG_FD
++            
++            AS_IF([test $i = npapi-sdk], [
++              moz_ver=0.27
++            ], [
++              moz_ver=1.9.2
++            ])
++            
++            AC_MSG_CHECKING([for $i >= $moz_ver])
++            if $PKG_CONFIG --exists --print-errors "$i >= $moz_ver" 2>&AS_MESSAGE_LOG_FD
+             then
+               echo "Using $i pkg-config package." >&AS_MESSAGE_LOG_FD
+               echo "Using $i package." >&AS_MESSAGE_FD
+-- 
+1.7.6.1
+

diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
new file mode 100644
index 0000000..d076a80
--- /dev/null
+++ b/media-video/vlc/metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>aballier@g.o</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <use>
+    <flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
+	<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
+	<flag name="avcodec">Enables libavcodec support for video/audio	encoding/decoding. libavcodec is part of FFmpeg.</flag>
+	<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
+	<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
+    <flag name="dc1394">Enables IIDC cameras support.</flag>
+    <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
+	<flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
+	<flag name="directx">Enable Win32 DirectX support.</flag>
+	<flag name="dshow">Enables Win32 DirectShow support.</flag>
+	<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
+	<flag name="egl">Enables EGL video output module.</flag>
+	<flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
+    <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
+    <flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
+    <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+    <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
+    <flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
+    <flag name="httpd">Enables a web based interface for vlc.</flag>
+    <flag name="id3tag">Enables id3tag metadata reader plugin.</flag>
+	<flag name="ios-vout">Enables iPhone OS video output.</flag>
+    <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
+    <flag name="libass">Enables subtitles support using libass.</flag>
+    <flag name="libproxy">Enables support for proxy settings in the HTTP access module.</flag>
+    <flag name="libv4l">Enables Libv4l Video4Linux support.</flag>
+    <flag name="libv4l2">Enables Libv4l2 Video4Linux2 support (for conversion
+		from various video formats to standard ones, needed to use v4l2 devices
+		with strange formats).</flag>
+	<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins.</flag>
+    <flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
+	<flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
+    <flag name="live">Enables live555 streaming media support (client support for rtsp).</flag>
+	<flag name="macosx">Enables Mac OS X gui support.</flag>
+	<flag name="macosx-audio">Enables Mac OS X audio module.</flag>
+	<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
+	<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
+	<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
+	<flag name="macosx-qtcapture">Enables Mac OS X qtcapture (iSight) module.</flag>
+	<flag name="macosx-vout">Enables Mac OS X video output module.</flag>
+	<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
+	<flag name="media-library">Build the (sqlite based) media library.</flag>
+	<flag name="neon">Enables NEON optimizations for arm processors.</flag>
+	<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
+    <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
+	<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
+    <flag name="projectm">Enables the projectM visualization plugin.</flag>
+    <flag name="pvr">Enables PVR cards access module.</flag>
+    <flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend. It is now the most up-to-date graphical interface available.</flag>
+    <flag name="remoteosd">Enables RemoteOSD plugin (VNC client as video filter).</flag>
+    <flag name="rtsp">Enables real audio and RTSP modules.</flag>
+    <flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
+    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+	<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
+    <flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
+    <flag name="shine">Enables shine fixed point mp3 encoder.</flag>
+    <flag name="shout">Enables libshout output.</flag>
+    <flag name="skins">Enables support for the skins2 interface.</flag>
+    <flag name="stream">Enables sout module for audio/video data streaming/transcoding/etc..</flag>
+	<flag name="switcher">Enables MPEG2 video switcher stream output module.</flag>
+	<flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
+    <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
+    <flag name="upnp">Enables support for Intel UPnP stack.</flag>
+	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
+    <flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
+    <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
+	<flag name="waveout">Enable win32 waveOut plugin.</flag>
+	<flag name="wingdi">Enable Win32 GDI module.</flag>
+    <flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
+    <flag name="X">Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.</flag>
+    <flag name="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
+  </use>
+</pkgmetadata>

diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild
new file mode 100644
index 0000000..7abcaca
--- /dev/null
+++ b/media-video/vlc/vlc-1.1.11.ebuild
@@ -0,0 +1,381 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.5 2011/08/27 17:38:21 armin76 Exp $
+
+EAPI="3"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git
+	EGIT_BOOTSTRAP="bootstrap"
+	EGIT_BRANCH=master
+	EGIT_PROJECT=${P}
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+VLC_SNAPSHOT_TIME="0013"
+
+PATCHLEVEL="99"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
+	SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
+	MY_P="${P/_alpha*/}-git"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+else
+	KEYWORDS=""
+fi
+IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
+	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
+	+gcrypt ggi gme gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
+	libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
+	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
+	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
+	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
+	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
+	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
+
+RDEPEND="
+		sys-libs/zlib
+		>=media-libs/libdvbpsi-0.1.6
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		aalib? ( media-libs/aalib x11-libs/libX11 )
+		aac? ( >=media-libs/faad2-2.6.1 )
+		alsa? ( >=media-libs/alsa-lib-1.0.23 )
+		avahi? ( >=net-dns/avahi-0.6[dbus] )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		dbus? ( >=sys-apps/dbus-1.0.2 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
+		dirac? ( >=media-video/dirac-0.10.0 )
+		directfb? ( dev-libs/DirectFB sys-libs/zlib )
+		dts? ( media-libs/libdca )
+		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
+		elibc_glibc? ( >=sys-libs/glibc-2.8 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
+		fluidsynth? ( media-sound/fluidsynth )
+		fontconfig? ( media-libs/fontconfig )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
+		ggi? ( media-libs/libggi )
+		gme? ( media-libs/game-music-emu )
+		gnome? ( gnome-base/gnome-vfs )
+		gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 )
+		id3tag? ( media-libs/libid3tag sys-libs/zlib )
+		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		kate? ( >=media-libs/libkate-0.1.1 )
+		libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
+		libnotify? ( x11-libs/libnotify )
+		libproxy? ( net-libs/libproxy )
+		libtiger? ( media-libs/libtiger )
+		lirc? ( app-misc/lirc )
+		live? ( >=media-plugins/live-2008.07.06 )
+		lua? ( >=dev-lang/lua-5.1 )
+		matroska? (	>=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
+		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+		mp3? ( media-libs/libmad )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		mtp? ( >=media-libs/libmtp-1.0.0 )
+		musepack? ( >=media-sound/musepack-tools-444 )
+		ncurses? ( sys-libs/ncurses )
+		nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2 )
+			x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
+		ogg? ( media-libs/libogg )
+		opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
+		png? ( media-libs/libpng sys-libs/zlib )
+		projectm? ( media-libs/libprojectm )
+		pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
+			( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
+		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
+		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
+		samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
+		sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11
+			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
+		shout? ( media-libs/libshout )
+		skins? (
+				x11-libs/qt-gui:4 x11-libs/qt-core:4
+				x11-libs/libXext x11-libs/libX11
+				media-libs/freetype media-fonts/dejavu
+			   )
+		speex? ( media-libs/speex )
+		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+		svga? ( media-libs/svgalib )
+		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
+		theora? ( >=media-libs/libtheora-1.0_beta3 )
+		truetype? ( media-libs/freetype media-fonts/dejavu )
+		twolame? ( media-sound/twolame )
+		udev? ( >=sys-fs/udev-142 )
+		upnp? ( net-libs/libupnp )
+		v4l2? ( libv4l2? ( media-libs/libv4l ) )
+		v4l? ( libv4l? ( media-libs/libv4l ) )
+		vaapi? ( x11-libs/libva virtual/ffmpeg )
+		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
+		vorbis? ( media-libs/libvorbis )
+		win32codecs? ( media-libs/win32codecs )
+		X? ( x11-libs/libX11 )
+		x264? ( >=media-libs/x264-0.0.20090923 )
+		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
+		xml? ( dev-libs/libxml2 )
+		xosd? ( x11-libs/xosd )
+		zvbi? ( >=media-libs/zvbi-0.2.25 )
+		"
+
+DEPEND="${RDEPEND}
+	!!<=media-video/vlc-1.0.99999
+	alsa? ( >=media-sound/alsa-headers-1.0.23 )
+	dvb? ( sys-kernel/linux-headers )
+	kde? ( >=kde-base/kdelibs-4 )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	xcb? ( x11-proto/xproto )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# Displays a warning if the first use flag is set but the second is not
+vlc_use_needs() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
+}
+
+# Notify the user that some useflag have been forced on
+vlc_use_force() {
+	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
+}
+
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
+vlc_use_enable_force() {
+	use $1 && echo "--enable-$2"
+}
+
+pkg_setup() {
+	# Useflags we need to forcefuly enable
+	vlc_use_force remoteosd gcrypt
+	vlc_use_force gnutls gcrypt
+	vlc_use_force skins truetype
+	vlc_use_force skins qt4
+	vlc_use_force vlm stream
+	vlc_use_force vaapi ffmpeg
+	vlc_use_force nsplugin xcb
+	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
+	vlc_use_force sdl X
+	vlc_use_force aalib X
+
+	# Useflags that will be automagically discarded if deps are not met
+	vlc_use_needs bidi truetype
+	vlc_use_needs cddb cdda
+	vlc_use_needs fontconfig truetype
+	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libv4l v4l
+	vlc_use_needs libtiger kate
+	vlc_use_needs xv xcb
+
+	if use qt4 || use skins ; then
+		qt4_pkg_setup
+	else
+		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
+		ewarn "graphical interface. Maybe that is not what you want..."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_unpack
+	fi
+}
+
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git_src_prepare
+	fi
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}"/0001-Support-building-against-NPAPI-SDK.patch
+	eautoreconf
+}
+
+src_configure() {
+
+	# It would fail if -fforce-addr is used due to too few registers...
+	use x86 && filter-flags -fforce-addr
+
+	econf \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable aac faad) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		--disable-asademux \
+		$(use_enable atmo) \
+		$(use_enable avahi bonjour) \
+		$(use_enable bidi fribidi) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable dbus) $(use_enable dbus dbus-control) \
+		$(use_enable dirac) \
+		$(use_enable directfb) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvb) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable ggi) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable httpd) \
+		$(use_enable id3tag) \
+		$(use_enable ieee1394 dv) \
+		$(use_enable jack) \
+		$(use_enable kate) \
+		$(use_with kde kde-solid) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable libnotify notify) \
+		$(use_enable libproxy) \
+		--disable-libtar \
+		$(use_enable libtiger tiger) \
+		$(use_enable libv4l) \
+		$(use_enable libv4l2) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable matroska mkv) \
+		$(use_enable mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(use_enable nsplugin mozilla) --with-mozilla-pkg=libxul \
+		$(use_enable ogg) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable oss) \
+		$(use_enable png) \
+		--disable-portaudio \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr) \
+		$(use_enable qt4) \
+		$(use_enable remoteosd) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smb) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable shine) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable sqlite) \
+		$(use_enable sse) \
+		$(use_enable stream sout) \
+		$(use_enable svg) \
+		$(use_enable svga svgalib) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l) \
+		$(use_enable v4l2) \
+		$(use_enable vcdx) \
+		$(use_enable vaapi libva) \
+		$(use_enable vlm) \
+		$(use_enable vorbis) \
+		$(use_enable win32codecs loader) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xosd) \
+		$(use_enable xv xvideo) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-optimizations \
+		--enable-fast-install \
+		$(vlc_use_enable_force vlm sout) \
+		$(vlc_use_enable_force skins qt4) \
+		$(vlc_use_enable_force skins freetype) \
+		$(vlc_use_enable_force remoteosd libgcrypt) \
+		$(vlc_use_enable_force gnutls libgcrypt) \
+		$(vlc_use_enable_force vaapi avcodec) \
+		$(vlc_use_enable_force nsplugin xcb) \
+		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
+		$(use sdl && echo '--with-x') \
+		$(use aalib && echo '--with-x')
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-vcd.txt
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	use skins || rm -rf "${D}/usr/share/vlc/skins2"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}

diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
new file mode 100644
index 0000000..d59e9a1
--- /dev/null
+++ b/net-misc/npapi-sdk/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD npapi-sdk-9999.ebuild 620 RMD160 3ee22df2547dc41589fad679ac11c347a676f9d7 SHA1 e439e13f6e1983aa1a530858d3fd5462879aabb9 SHA256 65fefa794de9023de96ce4d070185169bc989f10e9f088a4f87f67179027a4c2
+MISC metadata.xml 255 RMD160 b5f39d5799b7c36dbd279e5433753376c082afa8 SHA1 a4698c0973522834fc27ba7dc0757453338268af SHA256 fbdf23d280480a82b5640acbe75500ca6067b5f565223f62fbd525bda216b972
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iJwEAQEIAAYFAk5dGDMACgkQfXuS5UK5QB1B1AP/WX+vrsHwpRQfIguQ+WcilqbN
+Lfm+0cshg9JsPHdmb7QaosLQQiyR+Czcpb+LPuO01ixD5IrEko5077eZaOTB7zvq
+EqKWkjWivT+7raNA9Ix092SoW1uUUhmACtCIVuOI4dNXRzKcvzkrVCTTrWf3hgiA
+VWFFAoIVWvwBa3I26NY=
+=aHQ6
+-----END PGP SIGNATURE-----

diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
new file mode 100644
index 0000000..af81389
--- /dev/null
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>mgorny@g.o</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
new file mode 100644
index 0000000..01d95ad
--- /dev/null
+++ b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit autotools-utils
+
+#if LIVE
+EGIT_REPO_URI="git://github.com/mgorny/${PN}.git
+	http://github.com/mgorny/${PN}.git"
+inherit autotools git-2
+#endif
+
+DESCRIPTION="NPAPI headers bundle"
+HOMEPAGE="https://github.com/mgorny/npapi-sdk/"
+SRC_URI="http://cloud.github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!net-libs/xulrunner"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
+#endif