bump to 2.0.0, in line with vlc-2.0.0, and update live ebuild

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 76 insertions, 8 deletions

diff --git a/media-plugins/npapi-vlc/ChangeLog b/media-plugins/npapi-vlc/ChangeLog
index 5051e3e0a7d8..69e35b4b8d44 100644
--- a/media-plugins/npapi-vlc/ChangeLog
+++ b/media-plugins/npapi-vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/npapi-vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/ChangeLog,v 1.4 2012/01/07 15:06:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/ChangeLog,v 1.5 2012/02/23 10:18:58 aballier Exp $
+
+*npapi-vlc-2.0.0 (23 Feb 2012)
+
+  23 Feb 2012; Alexis Ballier <aballier@gentoo.org> +npapi-vlc-2.0.0.ebuild,
+  npapi-vlc-9999.ebuild:
+  bump to 2.0.0, in line with vlc-2.0.0, and update live ebuild
 
   07 Jan 2012; Alexis Ballier <aballier@gentoo.org> npapi-vlc-9999.ebuild:
   add gtk useflag and make deps match reality
diff --git a/media-plugins/npapi-vlc/Manifest b/media-plugins/npapi-vlc/Manifest
index eb6c4a61820c..270175e51dfd 100644
--- a/media-plugins/npapi-vlc/Manifest
+++ b/media-plugins/npapi-vlc/Manifest
@@ -1,13 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD npapi-vlc-9999.ebuild 1142 RMD160 01a11f3f4152a5897633b4f5462ece84824a83c6 SHA1 1f3f064754ab2f875b6d7f25db0de20a3dbe4ef2 SHA256 40f0afb0185e314ec2e08186ef08baabbf5566e17145a0f9cd4ed6360e6b16c9
-MISC ChangeLog 772 RMD160 ac08b119b99e8e94174cbfba9653a8637124661a SHA1 02bcfdc968fc9746f5bede629eee9586e2bb2d63 SHA256 57e253e08b82a73c7cd1801949c70db0ceb4999c7a007fc2534145fb212954ba
+DIST npapi-vlc-2.0.0.tar.xz 359508 RMD160 9653fdde5fe50792f52969e106d6ce7dc279463d SHA1 a7a19f91134fd17c45080743b90251f38026252a SHA256 d41f69b995daf30fb81b2106ca7ad58fde6f4b1c94a2f7b266636c2d949ca6ae
+EBUILD npapi-vlc-2.0.0.ebuild 1258 RMD160 acfb71142875c16fab470741bf568c51b6e36f7d SHA1 c9533781306e1b1eb01c4e28c2a141b7e93da6e4 SHA256 103dc305d9368a30f8837afa3ae932b2d531864905affe254a696decc224bd4a
+EBUILD npapi-vlc-9999.ebuild 1257 RMD160 2a409b70e4d5ea44c955c3c695dde10e354a19af SHA1 6ecdec50aac236e248347be270126ccec4d6f743 SHA256 9c5e92cfb6374315637a55ec43a552ecf24d4907f248ce7952f6280e9e43651e
+MISC ChangeLog 971 RMD160 614ad7cd93cac81daa91bfd8883cd36d811d9c5b SHA1 b4eb9c3c9fbcee91ae8102f6fbd7702c88bbc1f7 SHA256 a259e90a3c466acd63049e724354e549ce7fe3ec2fa08fc56157ccbec14bb720
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8IX10ACgkQvFcC4BYPU0o/ygCfQxzsSOdREXJG7wZSl8QD+xCK
-7+QAoIRop67LQfyvcbnFXnVtpLY15D7c
-=izJU
+iEYEARECAAYFAk9GEpgACgkQvFcC4BYPU0pTkwCcDvPK9FzlV7WZ2zkuBc+XU/sr
+bEYAnRpPUgnYG6xGB8YW5ImCaa8unU4F
+=FHBP
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
new file mode 100644
index 000000000000..9b334f2d70d5
--- /dev/null
+++ b/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/npapi-vlc-2.0.0.ebuild,v 1.1 2012/02/23 10:18:58 aballier Exp $
+
+EAPI=3
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=git-2
+	EGIT_BOOTSTRAP=""
+	EGIT_REPO_URI="git://git.videolan.org/${PN}.git"
+fi
+
+inherit autotools multilib ${SCM}
+
+DESCRIPTION="Mozilla plugin based on VLC"
+HOMEPAGE="http://www.videolan.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64"
+	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
+	DEPEND="app-arch/xz-utils"
+else
+	KEYWORDS=""
+	SRC_URI=""
+fi
+IUSE="gtk"
+
+RDEPEND=">=media-video/vlc-1.1
+	>=net-misc/npapi-sdk-0.27
+	x11-libs/libX11
+	!gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE )
+	gtk? ( x11-libs/gtk+:2 )
+	!<media-video/vlc-1.2[nsplugin]"
+DEPEND="${RDEPEND}
+	${DEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with gtk)
+}
+
+src_install() {
+	emake DESTDIR="${D}" npvlcdir="/usr/$(get_libdir)/nsbrowser/plugins" install || die
+	find "${D}" -name '*.la' -delete
+	dodoc NEWS AUTHORS ChangeLog || die
+}
diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
index dff6e43343d0..c51a41ffaa80 100644
--- a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
+++ b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild,v 1.4 2012/01/07 15:06:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild,v 1.5 2012/02/23 10:18:58 aballier Exp $
 
 EAPI=3
 
@@ -15,15 +15,17 @@ inherit autotools multilib ${SCM}
 
 DESCRIPTION="Mozilla plugin based on VLC"
 HOMEPAGE="http://www.videolan.org/"
-SRC_URI=""
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 
 if [ "${PV%9999}" = "${PV}" ] ; then
 	KEYWORDS="~amd64"
+	SRC_URI="http://download.videolan.org/pub/videolan/vlc/${PV}/${P}.tar.xz"
+	DEPEND="app-arch/xz-utils"
 else
 	KEYWORDS=""
+	SRC_URI=""
 fi
 IUSE="gtk"
 
@@ -34,6 +36,7 @@ RDEPEND=">=media-video/vlc-1.1
 	gtk? ( x11-libs/gtk+:2 )
 	!<media-video/vlc-1.2[nsplugin]"
 DEPEND="${RDEPEND}
+	${DEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {