Sync with gnome overlay ebuild. Install gconf schema, bug #374615.

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

3 files changed, 38 insertions, 12 deletions

diff --git a/media-plugins/gst-plugins-gconf/ChangeLog b/media-plugins/gst-plugins-gconf/ChangeLog
index 8f7b7a0c317f..d6d30a64f5c2 100644
--- a/media-plugins/gst-plugins-gconf/ChangeLog
+++ b/media-plugins/gst-plugins-gconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-gconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gconf/ChangeLog,v 1.107 2012/12/02 16:12:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gconf/ChangeLog,v 1.108 2012/12/02 18:49:26 eva Exp $
+
+  02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  gst-plugins-gconf-0.10.31.ebuild:
+  Sync with gnome overlay ebuild. Install gconf schema, bug #374615.
 
   02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
   -gst-plugins-gconf-0.10.23.ebuild, -gst-plugins-gconf-0.10.28.ebuild,
diff --git a/media-plugins/gst-plugins-gconf/Manifest b/media-plugins/gst-plugins-gconf/Manifest
index cac6d24fd39a..94a6a8e1c282 100644
--- a/media-plugins/gst-plugins-gconf/Manifest
+++ b/media-plugins/gst-plugins-gconf/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST gst-plugins-good-0.10.30.tar.bz2 3361361 SHA256 b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6 SHA512 2b3421700870624db956aaccb855d64a346178483f26901c78268cd4f4b0043fda6679c24a60a505713d142712f53bc999c24aad45c0fdf531cbb91799da7af2 WHIRLPOOL 2bd9a865c249abb7aa96357c91282ceb5734b8647fea2810c8be7f71e5b0fd0f13b33ba79bab53d2f2aa7d0f506594f74fa1e1072e845b07f8c951fb6a751ff3
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 SHA256 77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64 SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809 WHIRLPOOL 952f65219d9e9645c9ab89b071c56d783e2c795fadbf59176e430ba86a5fcaeb6bfc93f0978d424158550a4526145b5567acf2ff1d59e0068241821d332fd3c9
 EBUILD gst-plugins-gconf-0.10.30.ebuild 643 SHA256 7014c45e195576f456fc650ffdbb46dbe04a953cc0230eb0a5cde3bee053a7a5 SHA512 74c412ecc36ea99ebdda5d3dbb04b8052c0c8dac6b1ccc7d5b8ac391e540caa05e5f0d00e01f60debfa6f3a1c06d6ffafc29499d65165dcb5d8d64d1492ba9f6 WHIRLPOOL 647b1d4394c50db1955146cff39a4cdcaf2f09b427a841883e9aba04cf7e429c735a1d81e7363e919209a954cb5bd0d26ddb8deae934ac8c49b90b0e6bbbb439
-EBUILD gst-plugins-gconf-0.10.31.ebuild 651 SHA256 6136f458baa341a7ecf45afb8c941354e3f799115a7549a22cc40fb4b3b30e47 SHA512 490b2ffb6ca40e37f50ffb44edfa02fdc6fcfba65c24d3be0cf727b730e95956ddc78d7e05136af56e921489c52f4ca5806f7d2d86f4bca5bc9209667932109d WHIRLPOOL f161fc0d457546fa1b22d97970b2830fbe1dc16d536eb3d00d9ab9892f664506d96f30f722b303b84ff21fb71de5667b9b818266a6453bd60a4224e6610d7369
-MISC ChangeLog 14761 SHA256 a357809379a66be1a26e9caa79053171c9b342d45bae1754fa37dd14faa1494d SHA512 ec566bca254a68e3f549463f2878def1a5ca56455d3224cc35672e0fb3a5b7bb362b35580e59c1ec84dfacce668668f0278bc09117b93fe7567aa1e645f00965 WHIRLPOOL 5818e01550f23304c62b127fb048a2069b2c8a75f2438b845bb3a84c2374db5f87180fc1c5ed3642832aefdbc3c792fdab18fda0619ee53d318d6df16958f2f4
+EBUILD gst-plugins-gconf-0.10.31.ebuild 903 SHA256 f0b20929ed2fef4f04f5432b63c6ee54daf65154bd16306bd736b4a769eb40f9 SHA512 df57142bbd6050e572a63e25d60f649f6d1330d98c59d9ffe14e804bc9cc7686a0a42cf1f60a4fcb3abbab9719b5d867e2261b479db15b91d207fd5d48cda57b WHIRLPOOL 5fcef6f2b453efeb694bbaa9ed401af9065f81d29db8976e0b20a83ffa69c419f0f608491feda94949043e1fc443d2294f68653223686331458ad572fb77fdae
+MISC ChangeLog 14921 SHA256 4826fd1ec87bdc53f90c88b402797f5cd0032842bee38f50973bedebd20fa03a SHA512 f8747379920597a5bb8709164ba76cd38455cc9afdcdb74744f949339c22c6fb74b01b254e4e5d37d7d2869f5c82c34e54d4d4a3812975624d6199deb83552ab WHIRLPOOL 06c6fed003ee79c89f301aad93b8276ea1ac744fea9fb8f365062880afa4a88bd8450dce4b4b456f3c183c4793c9a18e1fd7dc5b72567a705380634d02f17e15
 MISC metadata.xml 627 SHA256 2cd8d33c1a589a5bc7612fc47c408634433601d5c3476d2f2850a0570190d05b SHA512 0e402e4ac04d24702223f30b8432e11c3332c60640f5c1c4fee885433f82b077e4e9ac4da1f0286f66ca661fdb646e548bd7a898bd7f0e2d3fc4f7cc0712e231 WHIRLPOOL bddc054cb73a2a6ae56fa941250d05732f7091001678480f1b2471da8cd33924b44388df53108bbffbe3cc9ffe4114c66692a9504fa20effbabd6f412e3333e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC7fgEACgkQ1fmVwcYIWAZ90QCfeZdZjpZ11sCYBsdyaj/GQc+i
-kLAAnjDY7Bga80PuQd5a/JDV7oHuHkNp
-=A/ju
+iEYEAREIAAYFAlC7orcACgkQ1fmVwcYIWAYiIgCgySewOE7qBi5+CF9sFCyEKHFQ
+AsUAnRTJOSYqmHYQBPFkipsXhWZ3l725
+=/fgO
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild b/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild
index fde4e51b5914..61a6eeaa715d 100644
--- a/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild
+++ b/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild
@@ -1,18 +1,40 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild,v 1.1 2012/10/23 07:56:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gconf/gst-plugins-gconf-0.10.31.ebuild,v 1.2 2012/12/02 18:49:26 eva Exp $
 
-EAPI=4
-GCONF_DEBUG=no
+EAPI="5"
 
-inherit gnome2 gst-plugins-good gst-plugins10
+inherit gnome2-utils gst-plugins-good gst-plugins10
 
 DESCRIPTION="GStreamer plugin for wrapping GConf audio/video settings"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=gnome-base/gconf-2
-	>=media-libs/gst-plugins-base-0.10.36"
+RDEPEND=">=gnome-base/gconf-2"
 DEPEND="${RDEPEND}"
 
 GST_PLUGINS_BUILD="gconf gconftool"
+
+src_configure() {
+	gst-plugins10_src_configure --disable-schemas-install
+}
+
+src_compile() {
+	gst-plugins10_src_compile
+	cd "${S}"/gconf
+	default
+}
+
+src_install() {
+	gst-plugins10_src_install
+	cd "${S}"/gconf
+	default
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+}