Added files for schema/protocol instead of cat'ting them in the ebuild.

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

5 files changed, 85 insertions, 33 deletions

diff --git a/app-emulation/spice/ChangeLog b/app-emulation/spice/ChangeLog
index d54b36f98bfc..839b04ba07de 100644
--- a/app-emulation/spice/ChangeLog
+++ b/app-emulation/spice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/spice
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.5 2010/12/29 09:30:52 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/ChangeLog,v 1.6 2011/01/05 15:03:39 dev-zero Exp $
+
+  05 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> spice-0.7.1.ebuild,
+  +files/spice.protocol, +files/spice.schemas:
+  Added files for schema/protocol instead of cat'ting them in the ebuild.
 
 *spice-0.7.1 (29 Dec 2010)
 
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index 16e75f849a2a..31867bc17faa 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -1,9 +1,11 @@
 AUX 0001-Added-initial-connection-url-handling-using-the-urip.patch 5924 RMD160 7a1b8ecec21f3be3941bd302881f7a7b0d95971e SHA1 0c5e10679378428ec0b2ed33c76d943cf6b61488 SHA256 440b64fbdad24484fabee2ac39aba555ef954989e53e21bdd41b2c024d0bf212
+AUX spice.protocol 160 RMD160 3754a8705f03ad265d231d3be59cc71dd91742d5 SHA1 1ca7f4c470f9fbd0c805d7e0067aa040da3f67f7 SHA256 30c8b0b08f131e2250898a326dc76dc35ef85e7281fca64343e299b722e90807
+AUX spice.schemas 1306 RMD160 9bcd05134f3c558d3a101f8f340c7f951c9b41b8 SHA1 a3ac7ac6b98d19ddd52c76daf664f0b96ab673b4 SHA256 e2845b417a0e28c0fb4f580b0ba9a100da0188397c7e68fa5dc223c938979a74
 DIST spice-0.5.3.tar.bz2 1187585 RMD160 e4cd8750c548188a76c2ef77e71b61fb0004567b SHA1 17d2a4a1547d69be9c9992e7058898dd0a53d646 SHA256 a1bdb2d731c5dbbf2582e1a88de4042b1199911172c8f178d912c375178306f2
 DIST spice-0.6.3.tar.bz2 1212086 RMD160 6574495568af8e78a374eec88288162def08b52d SHA1 bf4fc209404072cc9a35bb5f920c91ce04b96b74 SHA256 1e43ab34d39ba54c9ee30e788caeae56ead968090dd7b2a59b4af72df45e3310
 DIST spice-0.7.1.tar.bz2 1194659 RMD160 78dba1b4b0f5ccb173bd9024816975c011ce4c1f SHA1 e1167461472f201aec89b166c43e0dc3290eae8d SHA256 ee396c46cb1933f967fd03b67ac150b3d5f0caeb29dd179d81542b5f3fe85fb5
 EBUILD spice-0.5.3.ebuild 1106 RMD160 a15a186d5ede086243b1c13a835419fc65146e0d SHA1 716a1ab3ec49d6334678455d7d484f3bec74be04 SHA256 8a95095cc20ecb17ae461f4c1e9e98f961d8f71fc9136a89d00e41f30cf5dbc8
 EBUILD spice-0.6.3.ebuild 1100 RMD160 df8bd9e16653448da8bcf6785717836bbf70b3ea SHA1 e951714fd4e5dd0fc2a0e4e8f8e3556631d3072a SHA256 89c2a74d49dfcf8494eee92dda5760e7ff3a02d6958ff3e477063f65a48d9c6b
-EBUILD spice-0.7.1.ebuild 2123 RMD160 a7afb3b1b37cc5b3a09f2c95a43ed4a4c7b55307 SHA1 5ba485e660bb9a06a9ef4d61e84ed0e2489f2b48 SHA256 be2cada6f69d41495d6ec021c1fe34710c163877e462a35fd82364c45559b355
-MISC ChangeLog 1125 RMD160 3787d066d8579d8c4bc077e3aa2b1ae4fc524cfb SHA1 571b3541304f9a9555da41d806095d58a1986180 SHA256 c4ed3db04f8487030884c0135376f8527784b47122bea1bbae6afbcc889c7cd1
+EBUILD spice-0.7.1.ebuild 1773 RMD160 ce19e177acad01da4b369b091db8c00f98fc7b34 SHA1 970e6b63523382f24d69a494629a979a725b6e60 SHA256 74121dcbbc32ea7ec4da313779f2f85010ce38b1dc38a964826883001cef0e5b
+MISC ChangeLog 1320 RMD160 6abb0dcd3ec08b65b9f6946ae50ae73bac7fb1cb SHA1 f56084919ef9ce92f8aec93eef2f33a3c64d0fb9 SHA256 7883102a2939c436e0af1cb1b01f36d8380389ffa7f0c7e4ab831a9ffe978f8d
 MISC metadata.xml 591 RMD160 48a1a51f8ab4050e84f580fb7f8828fbb94338ef SHA1 a2ca907b208b449bbd2366668942c1a3e4965453 SHA256 5b25bdfca5600ec80f91d11db75a2d1c9635d305d574e5ca2992124858ca4b60
diff --git a/app-emulation/spice/files/spice.protocol b/app-emulation/spice/files/spice.protocol
new file mode 100644
index 000000000000..13a2817fd554
--- /dev/null
+++ b/app-emulation/spice/files/spice.protocol
@@ -0,0 +1,12 @@
+[Protocol]
+exec=/usr/bin/spicec --uri "%u"
+protocol=spice
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
+
diff --git a/app-emulation/spice/files/spice.schemas b/app-emulation/spice/files/spice.schemas
new file mode 100644
index 000000000000..f3ba2f5e5f87
--- /dev/null
+++ b/app-emulation/spice/files/spice.schemas
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+<schemalist>
+<schema>
+     <key>/schemas/desktop/gnome/url-handlers/spice/enabled</key>
+     <applyto>/desktop/gnome/url-handlers/spice/enabled</applyto>
+     <owner>spice</owner>
+     <type>bool</type>
+     <default>true</default>
+     <locale name="C">
+       <short>How to handle spice URLs</short>
+       <long>Set to true to have a program specified in command handle spice URLs</long>
+     </locale>
+</schema>
+
+   <schema>
+     <key>/schemas/desktop/gnome/url-handlers/spice/command</key>
+     <applyto>/desktop/gnome/url-handlers/spice/command</applyto>
+     <owner>spice</owner>
+     <type>string</type>
+     <default>/usr/bin/spicec --uri "%s"</default>
+     <locale name="C">
+       <short>URL handler for spice URIs</short>
+       <long>URL handler for spice URIs</long>
+     </locale>
+    </schema>
+
+   <schema>
+     <key>/schemas/desktop/gnome/url-handlers/spice/need-terminal</key>
+     <applyto>/desktop/gnome/url-handlers/spice/need-terminal</applyto>
+     <owner>spice</owner>
+     <type>bool</type>
+     <default>false</default>
+     <locale name="C">
+       <short>Run program in terminal</short>
+       <long>True if the program to handle this URL should be run in a terminal</long>
+     </locale>
+    </schema>
+</schemalist>
+</gconfschemafile>
+
diff --git a/app-emulation/spice/spice-0.7.1.ebuild b/app-emulation/spice/spice-0.7.1.ebuild
index 0eddf89f708e..1d2dad05b387 100644
--- a/app-emulation/spice/spice-0.7.1.ebuild
+++ b/app-emulation/spice/spice-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.7.1.ebuild,v 1.2 2011/01/05 13:14:18 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.7.1.ebuild,v 1.3 2011/01/05 15:03:39 dev-zero Exp $
 
 EAPI=3
 
-inherit autotools eutils
+inherit autotools eutils gnome2-utils
 
 DESCRIPTION="SPICE server and client."
 HOMEPAGE="http://spice-space.org/"
@@ -13,7 +13,7 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+gui kde static-libs uri"
+IUSE="gnome +gui kde static-libs uri"
 
 RDEPEND=">=app-emulation/spice-protocol-0.7.0
 	>=x11-libs/pixman-0.17.7
@@ -28,7 +28,8 @@ RDEPEND=">=app-emulation/spice-protocol-0.7.0
 	virtual/jpeg
 	sys-libs/zlib
 	gui? ( =dev-games/cegui-0.6* )
-	uri? ( dev-libs/uriparser )"
+	uri? ( dev-libs/uriparser
+		gnome? ( gnome-base/gconf ) )"
 DEPEND="dev-util/pkgconfig
 	${RDEPEND}"
 
@@ -54,33 +55,25 @@ src_install() {
 	dodoc NEWS TODO
 	use static-libs || rm "${D}"/usr/lib*/*.la
 
-	if use uri && use kde ; then
-		dodir /usr/share/kde4/services
-		cat > "${D}/usr/share/kde4/services/spice.protocol" << EOF
-[Protocol]
-exec=/usr/bin/spicec --uri "%u"
-protocol=spice
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-EOF
-	fi
-}
-
-pkg_postinst() {
 	if use uri ; then
-		elog "You enabled uri-handler support in spice. Therefore you"
-		elog "might want your browser / deskop environment to handle"
-		elog "spice uri's using spicec. To enable this, run:"
-		elog "  gconftool-2 -s /desktop/gnome/url-handlers/spice/command '/usr/bin/spicec --uri "%s"' --type String"
-		elog "  gconftool-2 -s /desktop/gnome/url-handlers/spice/enabled --type Boolean true"
+		if use gnome ; then
+			insinto /etc/gconf/schemas
+			doins ${FILESDIR}/spice.schemas
+		fi
 		if use kde ; then
-			elog "For KDE the protocol could be registered automatically."
+			insinto /usr/share/kde4/services
+			doins "${FILESDIR}/spice.protocol"
 		fi
 	fi
 }
+
+pkg_preinst() {
+	use uri && use gnome && gnome2_gconf_savelist
+}
+pkg_postinst() {
+	use uri && use gnome && gnome2_gconf_install
+}
+
+pkg_prerm() {
+	use uri && use gnome && gnome2_gconf_uninstall
+}