From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 18 Nov 2011 15:28:16 +0000 (+0000)
Subject: Fix for last commit, committed wrong ebuild
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=133c44e8dc9a44863641b9441b33b35e86d11aa5;p=gentoo.git

Fix for last commit, committed wrong ebuild

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

diff --git a/media-libs/gmtk/Manifest b/media-libs/gmtk/Manifest
index a75144b5801b..d3fbd62a2d24 100644
--- a/media-libs/gmtk/Manifest
+++ b/media-libs/gmtk/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST gmtk-1.0.5b1.tar.gz 389501 RMD160 04f1fa37175339fa8f4f5357771e606a4d3390d6 SHA1 f3968d678724a0e0c0af811aec971d83839fe3b4 SHA256 a03862bd36f196670ccce7813c250838aac86524b3fc495866792b4587ff8571
-EBUILD gmtk-1.0.5_beta1.ebuild 1299 RMD160 4ce119cd2ce264ddd2930309dc3f2d6063b9ff15 SHA1 e33af0af53132ee82fd0595eafc05cda57d142b3 SHA256 68045732d04132cb474c5f4b1800cb9043a1479f07251573f1ab8dd01f1acd64
+EBUILD gmtk-1.0.5_beta1.ebuild 1259 RMD160 215ea842135636ae8605560942777d2b4eab3108 SHA1 0b0d98698bcd28b0909a3715d056e6b9532aac21 SHA256 c85668986327dbb6d66abcfc3b77a082d49b64c8936e3dd71bef7f778dd194ea
 MISC ChangeLog 338 RMD160 b5d73b8a4a580b747f6063006dadaca89417b3e2 SHA1 2a97f1031efccb80522562ca7f13cf8ed6f60ef0 SHA256 e4bab3656bca8bafe5b5a9d8c663aaef6d6243808128a59b18fd9b4b071b8df5
-MISC metadata.xml 378 RMD160 ea8e71203e0c282f7d2c2c387e92d176bc7006c1 SHA1 71503e416f4240d661b0d9d76d92374c031ec40f SHA256 27a4f4f57d709ead0cd670b8f8d05cfc2d8f3df4f8a063cc9af844b53853d6d7
+MISC metadata.xml 327 RMD160 75e9402355adfb572cd450dbae701f08c8a6c053 SHA1 45028c27ee27aafc174a0afc4241b30b6e26285a SHA256 2723362c5df56964fb37f6914bef8467cd7534e1bfc2893929437f74d18979b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOxmxlAAoJEEdUh39IaPFN+G0IAKJbPpjSpPVynHQwLzRcYA/y
-7dofsE61W7p8CWedaSqAwEVgLn2KgiJPkLplzE/m87glEc8y+nElW5wOroP5Obgo
-ujcNwS6eu5xS1OTFUPdMCWFsyZQJlxgg6KnFxrJGLKJoBDJVuPg/mdbadXFixTW8
-rt6worYn2bqiTNqFWZUtZ2u/qydndk5K/qoqQjAwOkwmvtCzG7fWD8xt6NqPcPXm
-ZNQf1s7lRot/3kkyMQC0pNR2Fh+HTTl0fuKbFoAZFci+l/PK41u8n99a2gTm730m
-SXdkHEeOW+NlZEQyMo4kWjSpQm9R8BLBKP7yyHvT/dXc6d6uZV+sQ6hD9LxCqwg=
-=iKPr
+iQEcBAEBAgAGBQJOxnkyAAoJEEdUh39IaPFN+jgH/3ncC9JvMp2XyaI/65KCTPC4
+mC8n6u+68v6RtmkJsVYMXXiQCvgSpxWiepmRjQ3XrsDFKy3rHhHcNMtWdE16b/QJ
+F0fxiCjHce69lUz2YH4uRRdh96I9mbQL4jne2Ye6/luMRYa17ORWrmQg5ewtvoXY
+p0d309cCl27ijf9x6HINna/reXvyxFJJaMwsS7NZ/NDEels2uQBpr9/WboIukb6k
+cBM3ABwyS4SGcwgWdAxvalbUzOMXtIGiHS8NCWv2Z/ps2hJJJH/NziIvUvb0bklG
+YlEpEKObn7cmjrj8c23hcfuq6kNtaS4EwEWTKDE3L/D18p9Z0M3otQAPIqcGUxg=
+=XYgO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gmtk/gmtk-1.0.5_beta1.ebuild b/media-libs/gmtk/gmtk-1.0.5_beta1.ebuild
index 0a28b81f6d1a..dd4f110c037e 100644
--- a/media-libs/gmtk/gmtk-1.0.5_beta1.ebuild
+++ b/media-libs/gmtk/gmtk-1.0.5_beta1.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/media-libs/gmtk/gmtk-1.0.5_beta1.ebuild,v 1.1 2011/11/18 14:33:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gmtk/gmtk-1.0.5_beta1.ebuild,v 1.2 2011/11/18 15:28:16 ssuominen Exp $
 
 EAPI=4
 inherit flag-o-matic toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa dconf +keystore pulseaudio"
+IUSE="alsa +dconf pulseaudio"
 
 COMMON_DEPEND=">=dev-libs/glib-2.26
 	x11-libs/gtk+:3
@@ -28,8 +28,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-REQUIRED_USE="|| ( dconf keystore )"
-
 DOCS=( ChangeLog )
 
 S=${WORKDIR}/${MY_P}
@@ -42,7 +40,7 @@ src_configure() {
 		--enable-gtk3 \
 		$(use_enable dconf gsettings) \
 		--disable-gconf \
-		$(use_enable keystore) \
+		$(use_enable !dconf keystore) \
 		--with-gio \
 		$(use_with alsa) \
 		$(use_with pulseaudio)
diff --git a/media-libs/gmtk/metadata.xml b/media-libs/gmtk/metadata.xml
index c857e49c070a..5e8e19936618 100644
--- a/media-libs/gmtk/metadata.xml
+++ b/media-libs/gmtk/metadata.xml
@@ -6,7 +6,6 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='dconf'>Use dconf backend for settings</flag>
-    <flag name='keystore'>Use keystore backend for settings</flag>
+    <flag name='dconf'>Enable support for <pkg>gnome-base/dconf</pkg></flag>
   </use>
 </pkgmetadata>