From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 7 Jan 2012 15:06:00 +0000 (+0000)
Subject: add gtk useflag and make deps match reality
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9a8cac4a1cb119352f2649e28e5b0860c498d52;p=gentoo.git

add gtk useflag and make deps match reality

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

diff --git a/media-plugins/npapi-vlc/ChangeLog b/media-plugins/npapi-vlc/ChangeLog
index d06efe0690c8..5051e3e0a7d8 100644
--- a/media-plugins/npapi-vlc/ChangeLog
+++ b/media-plugins/npapi-vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-plugins/npapi-vlc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/ChangeLog,v 1.3 2011/12/26 10:28:05 aballier Exp $
+# 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 $
+
+  07 Jan 2012; Alexis Ballier <aballier@gentoo.org> npapi-vlc-9999.ebuild:
+  add gtk useflag and make deps match reality
 
   26 Dec 2011; Alexis Ballier <aballier@gentoo.org> npapi-vlc-9999.ebuild:
   depend on npapi-sdk, by Guillaume Castagnino, bug #395841
diff --git a/media-plugins/npapi-vlc/Manifest b/media-plugins/npapi-vlc/Manifest
index 0e31e7881ad9..eb6c4a61820c 100644
--- a/media-plugins/npapi-vlc/Manifest
+++ b/media-plugins/npapi-vlc/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD npapi-vlc-9999.ebuild 1040 RMD160 78c71a59e66c9cd3bef773ebafd1737b98e06025 SHA1 044fa0c6d300dc1ad2b205b5cdef24e30319d35f SHA256 672ab4abe648646ce4bfd0131a531fc5400572c9234c9f89393fb1d183aed237
-MISC ChangeLog 650 RMD160 18d147816459cc2d5a29c5733577193f3b5fa8c3 SHA1 ceb67474e977ab94b6ba60ce52691004c86db07b SHA256 aaddd3cc702e7096be066df400f91b22c44e4d5c4e724416602c2e870a9f2e04
+EBUILD npapi-vlc-9999.ebuild 1142 RMD160 01a11f3f4152a5897633b4f5462ece84824a83c6 SHA1 1f3f064754ab2f875b6d7f25db0de20a3dbe4ef2 SHA256 40f0afb0185e314ec2e08186ef08baabbf5566e17145a0f9cd4ed6360e6b16c9
+MISC ChangeLog 772 RMD160 ac08b119b99e8e94174cbfba9653a8637124661a SHA1 02bcfdc968fc9746f5bede629eee9586e2bb2d63 SHA256 57e253e08b82a73c7cd1801949c70db0ceb4999c7a007fc2534145fb212954ba
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk74TDoACgkQvFcC4BYPU0r3zQCcCk7EeON31vAFOAJO/5xABL+k
-zzkAoJorbaU1QREMlVhcFz5DBStvZ/SV
-=9q0U
+iEYEARECAAYFAk8IX10ACgkQvFcC4BYPU0o/ygCfQxzsSOdREXJG7wZSl8QD+xCK
+7+QAoIRop67LQfyvcbnFXnVtpLY15D7c
+=izJU
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild b/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild
index 5ffa5efad30f..dff6e43343d0 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-2011 Gentoo Foundation
+# 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.3 2011/12/26 10:28:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/npapi-vlc/npapi-vlc-9999.ebuild,v 1.4 2012/01/07 15:06:00 aballier Exp $
 
 EAPI=3
 
@@ -25,13 +25,13 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE=""
+IUSE="gtk"
 
 RDEPEND=">=media-video/vlc-1.1
 	>=net-misc/npapi-sdk-0.27
 	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXt
+	!gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE )
+	gtk? ( x11-libs/gtk+:2 )
 	!<media-video/vlc-1.2[nsplugin]"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -42,6 +42,11 @@ src_prepare() {
 	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