From 62779775d495f354c12667cabbad1b3ee67aff2b Mon Sep 17 00:00:00 2001
From: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Date: Tue, 16 Aug 2011 12:56:26 +0000
Subject: Add tslib dependency that was previously automagic. warn user against
 multiple boost versions, bug #366407.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---
 www-plugins/gnash/ChangeLog          |  7 ++++++-
 www-plugins/gnash/Manifest           | 14 ++------------
 www-plugins/gnash/gnash-0.8.9.ebuild | 11 ++++++++++-
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'www-plugins')

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 50cf34a7df9a..7ea3d8a34637 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.65 2011/07/19 17:31:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.66 2011/08/16 12:56:26 chithanh Exp $
+
+  16 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.9.ebuild:
+  Add tslib dependency that was previously automagic. warn user against
+  multiple boost versions, bug #366407.
 
   19 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #266794
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 2f2565308431..dd29ec68127d 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
 AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
 AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd55986a4 SHA1 955b1e17ddad3f2cca3cadb73e84c52714f57f3c SHA256 ea3a2324c061828142f715c9e40dbf21007e5230b1f81f8dbea7a8313bcc86bd
@@ -24,13 +21,6 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
-EBUILD gnash-0.8.9.ebuild 8457 RMD160 a9cd3a8c4343e9f71b4c08e97519fab96dea87fc SHA1 835ad137600039c6e7646d7381aa0c4949583016 SHA256 3bf845e1b0cec8c343f65c33e7b0b160dd354d150cf5edd0c96f9c35ca603203
-MISC ChangeLog 24738 RMD160 3ce37ca772ce7009c008b80c1600dd8cb4e27791 SHA1 da2329c90116d630c7f3a01da7031ef25934e510 SHA256 d8f49d6b6e952ddd26711884b1961ee3b0d599a9ae0b1c63789d8b127a89a1d9
+EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
+MISC ChangeLog 24945 RMD160 67790cfebfdb5a00609c91cab16a965e4003e1ec SHA1 76ab62cd1c458cd22b5f6da6d420d598acbc7563 SHA256 0e3380a7ec9fe7995043ac755f8ccac91476d4b0af6e5a53c5f9e49e11e117aa
 MISC metadata.xml 897 RMD160 63976de68b72c309450af24881bc527a569dd696 SHA1 9195faecf9e4e29d893295049def35b8a232438c SHA256 7db7e55805bd35835d9aed9bab24696933894ba4ee887d1b13b648749070cc4c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4lv4EACgkQCaWpQKGI+9RXnQCcDL8kxTvNkdWr5pRES10p3UV6
-iWYAn0J4bsd+JlzwbhCATQAgfc9Ddg2D
-=1AVz
------END PGP SIGNATURE-----
diff --git a/www-plugins/gnash/gnash-0.8.9.ebuild b/www-plugins/gnash/gnash-0.8.9.ebuild
index 117c9394095a..790fe496d332 100644
--- a/www-plugins/gnash/gnash-0.8.9.ebuild
+++ b/www-plugins/gnash/gnash-0.8.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.7 2011/07/02 21:09:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9.ebuild,v 1.8 2011/08/16 12:56:26 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -45,6 +45,9 @@ RDEPEND=">=dev-libs/boost-1.41.0
 		>=app-text/docbook2X-0.8.8
 		app-text/docbook-sgml-utils
 	)
+	fbcon? (
+		x11-libs/tslib
+	)
 	ffmpeg? (
 		virtual/ffmpeg[vaapi?]
 	)
@@ -88,6 +91,12 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_setup() {
+	if has_version ">=dev-libs/boost-1.46" && has_version "<dev-libs/boost-1.46"; then
+		ewarn "If you have multiple versions of boost installed, gnash may attempt to"
+		ewarn "compile against the older version and link against newer version, which can"
+		ewarn "cause the build to fail. Unmerge of the old version of boost is recommended."
+	fi
+
 	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."
-- 
cgit v1.2.3-65-gdbad