Apply team policy for configure and update gtk+ dependency per libgd requirements.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 31 insertions, 41 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 9f156e2a7602..3ca70727f5a7 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.361 2013/06/02 20:44:56 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.362 2013/06/30 21:36:24 eva Exp $
+
+  30 Jun 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-3.8.2.ebuild:
+  Apply team policy for configure and update gtk+ dependency per libgd
+  requirements.
 
   02 Jun 2013; Jonathan Callen <abcd@gentoo.org> totem-3.6.3-r1.ebuild,
   totem-3.8.0.ebuild, totem-3.8.2.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index dcc3b98b7135..056b8d8b580d 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -11,23 +11,13 @@ DIST totem-3.8.2.tar.xz 3153052 SHA256 eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba
 EBUILD totem-2.32.0-r2.ebuild 6083 SHA256 602096eca2fbb7fa7d09215044ac96361f5b378b8646e8daba33ea0190bab160 SHA512 93fb7e90e73d796fc50a4de32248b417485b4d3f7fbad6cb337b5e9cbff01552c31df59ed6fe8af1b57bccd226217de32d55447c3db950606ba5d4891b86823f WHIRLPOOL 6cbf5edefe1a4dec0709d3ef169269a881dfef31a9774594467816730fa796bd5472c3b11b98c004e51347810d6e65ca2904799dde94bb311327cf778f7cb0af
 EBUILD totem-3.6.3-r1.ebuild 4475 SHA256 e3d2c43fd6722bab81aeb098cf896c7372694463b227630224f1214fbfda3dcd SHA512 3ea621cf395bcf52db6cb519be26c2786459c9c46b2afbd8aca69814e401f5e73ac75cadfd66b15047e22dbcd0b4fcbdb49f8ed0e924c254e82a2467b7e20728 WHIRLPOOL 28e2fdfcca69c0082cc7d4ca8cc179590f88b48e7505681c474a0015386f66e3e169f4aca670465b861dc762f09a0a2c06e74f3acab49bf0c44dbfd2b2168c07
 EBUILD totem-3.8.0.ebuild 4237 SHA256 435f6780e7f725e3997f75f5c4b96b1b5d9e478741f546ab95012d7f1b0d00e2 SHA512 ac324a8ec52e84f7365b0aa7517bfe526617246d8700bea03bca66302326b299ecc67fea02c117e8a7ea28aba111989f2c10b45c7bb22cb90558cc86bac96eac WHIRLPOOL b1efd7e667cf08f9c3f917a57172c8f2a7700a586dee8a6cc0aa862e66d4b8d36a04fa1bf2f4e61549ce65e8e833aba91374b13f17903a31abff74bcc91733d0
-EBUILD totem-3.8.2.ebuild 4240 SHA256 28ba6a28464429ecce28619d7cb43a2e4d79bd0b2c874dc4ebac08c468d9ded2 SHA512 8436a8875d4562479c6a4ba139268ef667642b4daa070df83375a19b83c2144593ea1c09c9d5d31981a98a7b2d62d2830df6e85a36a83aedc41331cb6eb24454 WHIRLPOOL b1d63b497741aec1253815522a07cd5c65e60d52ee84b844b5d403a6559c2bca55bc367fbd644ce3acca42b5910e06a581222bf1b18dde3c6b10b5bef167f5f7
-MISC ChangeLog 53928 SHA256 9f5a6f9815c0cc93984735d94ca33ccd55d89d46ead600e1c66bb6a2ea65402f SHA512 42aa9957dd946d6c70ec9956ed6736df1e56e603d9be6a7f4264df8a2f746aefc7915c373c9a2a05b5fc81f31fbbabe57de0cc1105d5d9e91d6d866d9beceeba WHIRLPOOL e1f10bed9773ed35aee9af21a7908cf39de0a6d62e0a55d2c1959ca71788748fd5f8d01168f8f71ca051169fc6a48053a8a54c2b4aa9639d12263b3c6020b483
+EBUILD totem-3.8.2.ebuild 4207 SHA256 d3dc23d3de858c18d981a8c5a517ef1e59025ea10ce66184d1be68ba4fbc9e4e SHA512 8d4c2d95cde3e60e64761ef8819c9a824eb4541c35493ebc2caec252d60b9f8b71df0cb67ce2c5e3634ebcfb4687e28013038f85a8e0fd88e5393a10f14bd80b WHIRLPOOL cf869cd254585aa7d2af14b6ad1bc7094d7d61330089d4e0a337b5d8e7c85f15e8848fa1b4a04b9192462104ebff04a9e87e9c10da5e8b29190968c2d17f50f3
+MISC ChangeLog 54089 SHA256 7b0fc7b1b045576691c099a10077793d3791939f11bac4a5e6a00146397e8e19 SHA512 68e1476872add06487062f952aff0e65449d190e6a09d3a1659ee1d47ce2aabd739892b9f3e1d23c60389c5a087b7868d36085168c0ecd2d1216d4809e1ff267 WHIRLPOOL 93e34c816451aea8dfdcd44a8a7af381739f2f3486dcc1832b5af6c5129f12c729527d9b2a3d8ec7e3f552c5f229084cdc20a5a8cb0ff6cf76065fce2fb0ecfa
 MISC metadata.xml 1542 SHA256 f20cc9630af8b7ba34b66ae995e734417ab8f4b1142eaf8458a6c385a6f85c1e SHA512 92ae20c93f396d8d1cbee93dbf48ee4bffcb67041ad9af0a4505eb7a0a8b181794da8dafdd575f7113f0d53ec39ccd5612223dc379ed8a25b0545a89b6e4c7fb WHIRLPOOL f64c55c6728a63e82624d895bc4127c7eb34e2d230d4f43007a5cbcc324aabb0184318185c3acf54322a454bb22d65e8392436f7f40c036a2369d8695e0e419d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRq67NAAoJELHSF2kinlg4tOAQAJD+P/54Eaua6Nd3ieY02Kzj
-EGFwYZDlYGskLwH1ozUWBR46pTIEtotS0R3yo2JoDVke01TYQ9A/Wz+QhyWIlDCH
-3DMgFItHrQ0Rn6uOeON03GnxV1XvRdzZCJ5ezuvH0UKtjRS3Y9VfEtkklaBsCKyL
-kV/wv4CWjb8cKodl80WcGh5AjmZ72ecP6w+awIxDy+DVjzdlW5FDsXxzTZjUcGbK
-5Xc08CUTjuvaMC0TYnaqkougXTE/2mgJAIJh5p2qXNHwf4QlkIEJ/JRyeRqpfj7Q
-+o7ZHnoE2+XtvuNdSwLSPFeYhWsrKal1iCq4RRKLePVrgzMMPj2ZBFzuYlavAToY
-hmH6vCmwBy6JcGsEMfR80CF//a5m8Gi0YiM5PbjWcioT5EDnKVDRnEYjC6TIkJE1
-yr5kwFdmcKbBStuDZtNEUDCW42OmN1AI4PRcxmVjDZWcRBZn3LYhmdmXmu4yysQg
-ZC0UPMJe1XH5+yJHKJS8+JOioCxwKuAEqwMT0nZIpuUUbZAGAR5oVHdJjoTnQMCy
-gm1NlDE7KJZMYf0FxfieyeRcvsk32lfiVY22hP6qCYXyACxPZQ1W7crOvmblHM0Q
-TaZz01LpiFah3CQ/hI5TCAS3vxA9d8UK3oSgtQWpGrHvMl4QXSaiULK6cez0r6vm
-JGI+hAGB2xTvmUzaK4XZ
-=CwYw
+iEYEAREIAAYFAlHQpNkACgkQ1fmVwcYIWAZdGgCgsC9JQwEZeYoDnT8t5BYe7LBT
+MXYAn2lc/3YShvW8rFWF/TwO3HEuqu+z
+=q+qw
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-3.8.2.ebuild b/media-video/totem/totem-3.8.2.ebuild
index f4920c7a4856..f0b4606e1a78 100644
--- a/media-video/totem/totem-3.8.2.ebuild
+++ b/media-video/totem/totem-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.8.2.ebuild,v 1.2 2013/06/02 20:44:56 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.8.2.ebuild,v 1.3 2013/06/30 21:36:24 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/glib-2.33:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.5.2:3[introspection?]
+	>=x11-libs/gtk+-3.7.10:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
 	>=dev-libs/libpeas-1.1.0[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
@@ -107,26 +107,6 @@ src_prepare() {
 src_configure() {
 	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
 
-	#--with-smclient=auto needed to correctly link to libICE and libSM
-	G2CONF="${G2CONF}
-		--disable-run-in-source-tree
-		--disable-static
-		--with-smclient=auto
-		--enable-easy-codec-installation
-		--enable-vala
-		$(use_enable flash vegas-plugin)
-		$(use_enable introspection)
-		$(use_enable nautilus)
-		$(use_enable nsplugin browser-plugins)
-		$(use_enable python)
-		VALAC=$(type -P true)
-		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
-	# XXX: always set to true otherwise tests fails due to pylint not
-	# respecting EPYTHON (wait for python-r1)
-	# pylint is checked unconditionally, but is only used for make check
-	G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
 	# Disabled: sample-python, sample-vala
 	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
 	plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
@@ -138,7 +118,23 @@ src_configure() {
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
 	use zeitgeist && plugins+=",zeitgeist-dp"
 
-	G2CONF="${G2CONF} --with-plugins=${plugins}"
-
-	gnome2_src_configure
+	#--with-smclient=auto needed to correctly link to libICE and libSM
+	# XXX: always set to true otherwise tests fails due to pylint not
+	# respecting EPYTHON (wait for python-r1)
+	# pylint is checked unconditionally, but is only used for make check
+	gnome2_src_configure \
+		PYLINT=$(type -P true)
+		--disable-run-in-source-tree \
+		--disable-static \
+		--with-smclient=auto \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable flash vegas-plugin) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugins) \
+		$(use_enable python) \
+		VALAC=$(type -P true) \
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-plugins=${plugins}
 }