We don't really need vala for building from the source tarball

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

3 files changed, 42 insertions, 27 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 05995f7a366d..d79ef5161c24 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.344 2012/09/16 02:55:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.345 2012/09/21 04:33:56 nirbheek Exp $
+
+  21 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> totem-3.4.3.ebuild:
+  We don't really need vala for building from the source tarball
 
   16 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> totem-3.2.2.ebuild,
   totem-3.4.2.ebuild, totem-3.4.3.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 869eb380fa61..e23274d06f92 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -11,17 +11,23 @@ DIST totem-3.4.3.tar.xz 3163404 SHA256 fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c
 EBUILD totem-2.32.0-r2.ebuild 5825 SHA256 7a1ff47ebc7e9304f9ac695983e8e2bead2f664889655ab0b48b120d8b9cfe67 SHA512 97fcac3b0c0cab52cfd82d8f6917f9fb3632821050ea9199a035523f3901e364ed38ef262bd1af5dfcbef1ce4514599fb27bea7e489ebde027776ae7342245fb WHIRLPOOL fe0a4af418eb118b753f24de23df6726536163455936523cb6483735dcdcd6b053564efcb86a6711115468bf7a7fc9ce394ae36ef75907a425e4af3eb4a70d89
 EBUILD totem-3.2.2.ebuild 5469 SHA256 8eff94a239ca2d00bcc88aa235cc641f29ece86825af1bf9857066aff94d7e7a SHA512 d6ab93a31705ef4df2697daa4d647ca60480052a4d7beaab195a9ee6a4231fce55275cd012970d5261640b4cccd744f493758b5d722d601fb8bbd46dcf0a1135 WHIRLPOOL aa97934da6f064f853c872444ef59a3ecde9db393bc4c197991f6d57de1c4b2f986ef576892b87e088d071d6eb406a4ea7820d531e1517a4181cecf6c472020a
 EBUILD totem-3.4.2.ebuild 5347 SHA256 60ea28763061d19a268e40747a8537e9f1d3dac06bf539867aa99c0bdbe2e730 SHA512 362e77bd93f9c08bbbdedd9e7621c49bf0681c10b9228a75f724da0c30eb180be1e3af1f810b2f5d0a24ceba7348e672a82e752ccbeb74226581dc8da4b6a509 WHIRLPOOL 7e311e1215cb07d345e6d448dcd4b4068489724aaa5fcf5f1106566a36ab080f5a4f1e2f6fc84c841c5403d97e7c83427713d76834d88fa427f969ccdd94b47c
-EBUILD totem-3.4.3.ebuild 5347 SHA256 3d6945d0b463e74d4c4e9885d195f5df80251b2145e2389153fb36f1cbe4e565 SHA512 d841fdea82326754b42ae28baadbc9f87fc8a3ba02af38e0763e680a69589210ee5855834c9b7fa761dd2dcd244cb897530a37ac98098289ec19339a61570075 WHIRLPOOL 8f7c2f5b1a40dbbf18690628e6021cff0d200819f43f33537e52477d28345087091cf7bea55ff5a3670ecc7421a4ca9d9da14f14adc3f0dd221d4056e73d037b
-MISC ChangeLog 51550 SHA256 574202a08b35900c05edff62a85e969565a9e1d01188fb0345ac8fc6f9c5e313 SHA512 3de14e984c24f759fbec30a23efe278598f6b0f0fdc3ba279c68a0552cd9bac0905f5cfc08a1c88ff4166837a41b7b79371c60f29f18c9e92255210f90770641 WHIRLPOOL 1058cf3bd8a941a22f2587d8b22afae1ee9ba69bcdc3c7cf04502b902a1970ce75d6f9c747646544f4a4ac70b1b4fd5412ad7e199cd0df29411f8c2709429df4
+EBUILD totem-3.4.3.ebuild 5508 SHA256 88ee4136adb9347f4d1a6668b08dfa51099be82593df6455aa0d7a42da4f7c00 SHA512 32d9c9ff0008119466a57ece7aa2ae6b384f22593e95a47cfffd7fd9c78b8ed208263a3f398a6a876b423d2baa2df262aa610d1e4c84f3aa06b0be9f1c66f397 WHIRLPOOL 92d0a76c93642c0a103d5f0b8112dc961c827a1ab306fefd8deb4d7a933dc15d9f4d9a7155ff55424176671c0dae9d0e18b5aeb981e5acd062f19403b4039f18
+MISC ChangeLog 51689 SHA256 b7339225d294681a377a1bac7b53791760aa683e349f84cfd1ecf02e8b7f7cfb SHA512 30efed7d509dec36188ed43b70ec9696905f39a36319e55df1c44b468b2eca5739d01458a5abae0790cb295a83c0f753e41df4a552c9b786d11e41560ff40246 WHIRLPOOL 09f89a5e380c2de658e08bf32fbf5dbec0c7899031b4fc3eb0bca50e4ac1d7d20fe39fe63ac912f38cfdb176aece81ae4ff517e64027e75dfb139c70fadff341
 MISC metadata.xml 1800 SHA256 d5478ecc6ef045dcdaeab363be952807d8f2a6eab87abc7ca11c26063b8a6a4d SHA512 271ba51e94e1ece5ad03f9cb2285dca669a485a10ec26d237b6ba4abaae5c8032aa3f78e9c58738ec63362837520a99f8d1828de90b1c02cfe5e374f61da81d9 WHIRLPOOL e6ba605362d064fdc68035842220faa01eea8e5912cbd720b73527a9c6d6538125bbe62591dccf24649822a02a3aed33372095cd625acba86217787c63cbb169
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQVT+4AAoJEJ0WA1zPCt1hBtIH/RgiLj0pFU6HHbAr+GQpJL85
-rpb4nQWAo7n8TgL5uD0M9KbuyqLwMMnIsBKUnvoQcFQX3uee/SyiL+vGbKJIBkUw
-mdLE3RipLGRLM2ZcU+ypy1Iv/JeHGn1DMxFppBLlSzWSXzKOrP+v2XnHHBLttpKI
-hmAbzhEgb4ztloHFd34j8pRwS/wpL6l9KoOot4Gx245WcPhV1C+EeQN5aLYtkTrA
-KMyx8bZNpmMwYzcy+m9nFkFfOkNn3xxmCPX2Far7ipE4ZwOlNA9pjKHfkwNdOwVn
-IVPZ/0w6BbLPqMzdcZqwnPC1lrRwSUnadyWfxk0LmoDfswCnXp7SvPxBZJiuNnA=
-=hoLv
+iQIcBAEBCAAGBQJQW+5DAAoJEO/kOhxWD91kOSYQAJf5UiiHKziqzDID3ZJd7e9/
+rpOYFDaIykr5H+MAPvrXAEI1GiclwC8UB2pefPgOc8uOQe06A08SQ1tSerHivN6D
+Im7hjHjUouAJWvfueNW3i97/N6tqG2KXlpRkZ57/O+ZCBkDY2GmOlZWoeCyX/MQ0
+Q265I7ySflEiMejMQ/Z6rKxBY18SdW+Cafrn44FP0q6JCSGTHl9N/N5yAZXMru4M
+SyNpZg11QN7Qj2wew2wih1uBD4J+3Q6Md3IkCrK+Vnej5Bbw8SsbkiLEAsda7CAA
+7iQ4Q3Rq+v2XruENCw62RD6S9OWQYWIYo/cBnKwlGmCSw4GfGTiZZZo/hZ/oxejX
+EC7mKh1ud0zEMVaee+vVU6HHyXibZisrtuovYQp2d5hhAtSWuOFrjAfnVomNv8Uh
+HrrBozcoVnXH76oXKo8nJxBumRfym/Jm84fEwJOdNLYa1BgOGLAhFXSXVGjeeS0n
+8Y7MMtNEKsEvIZmx73PumSFYlsNko7xVdMNdsTfgMnlJS7wvNTvnh9eWKxCNGJxc
+3AkEZUGzJ8svopIEJwd5QBQFKhRd0TUFDxuI3ircFSW/wsABaLWPgUNwNpOXtq+u
+Jus9yBawnVv/lSPaysn4zrFSaIA9tOe7tkeEeJIu93mue6W7SS4y2GNDROR6CmIl
++90OZHj5rlPIEgykcGnp
+=Q/gV
 -----END PGP SIGNATURE-----
diff --git a/media-video/totem/totem-3.4.3.ebuild b/media-video/totem/totem-3.4.3.ebuild
index 5983ea056cac..c3d088fe67f1 100644
--- a/media-video/totem/totem-3.4.3.ebuild
+++ b/media-video/totem/totem-3.4.3.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-video/totem/totem-3.4.3.ebuild,v 1.4 2012/09/16 02:55:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.3.ebuild,v 1.5 2012/09/21 04:33:56 nirbheek Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -9,6 +9,7 @@ WANT_AUTOMAKE="1.11"
 PYTHON_DEPEND="python? 2:2.5"
 PYTHON_USE_WITH="threads"
 PYTHON_USE_WITH_OPT="python"
+VALA_MIN_API_VERSION="0.14"
 
 inherit gnome2 multilib python
 
@@ -17,7 +18,8 @@ HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test
+vala zeitgeist zeroconf"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 # TODO:
@@ -90,8 +92,9 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? ( python? ( dev-python/pylint ) )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )"
+	test? ( python? ( dev-python/pylint ) )"
+# Only needed when regenerating C sources from Vala files
+#	vala? ( $(vala_depend) )"
 # docbook-xml-dtd is needed for user doc
 
 # see bug #359379
@@ -118,8 +121,10 @@ pkg_setup() {
 		$(use_enable nsplugin browser-plugins)
 		$(use_enable python)
 		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
+		VALAC=$(type -P true)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+		# Only needed when regenerating C sources from Vala files
+		#VALAC=$(type -P valac-$(vala_best_api_version))
 
 	if ! use test; then
 		# pylint is checked unconditionally, but is only used for make check
@@ -127,18 +132,18 @@ pkg_setup() {
 	fi
 	#--with-smclient=auto needed to correctly link to libICE and libSM
 
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
+	# Disabled: sample-python, sample-vala
 	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
-	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
-	plugins="${plugins},screenshot,sidebar-test,skipto"
-	use grilo && plugins="${plugins},grilo"
-	use iplayer && plugins="${plugins},iplayer"
-	use lirc && plugins="${plugins},lirc"
-	use nautilus && plugins="${plugins},save-file"
-	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins="${plugins},rotation"
-	use zeitgeist && plugins="${plugins},zeitgeist-dp"
-	use zeroconf && plugins="${plugins},publish"
+	plugins+=",media-player-keys,ontop,properties,screensaver"
+	plugins+=",screenshot,sidebar-test,skipto"
+	use grilo && plugins+=",grilo"
+	use iplayer && plugins+=",iplayer"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use vala && plugins+=",rotation"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+	use zeroconf && plugins+=",publish"
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
 
@@ -156,7 +161,8 @@ src_prepare() {
 	#fi
 
 	use python && python_clean_py-compile_files
-
+	# Only needed when regenerating C sources from Vala files
+	#use vala && vala_src_prepare
 	gnome2_src_prepare
 }