[patch] Patch to fix dependencies

colord-polkit.patch (text/plain), 10.72 KB, created by Michal Hrusecky (RETIRED) on 2012-12-21 07:59:14 UTC

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v
retrieving revision 1.42
diff -u -B -r1.42 ChangeLog
--- ChangeLog	20 Dec 2012 05:29:30 -0000	1.42
+++ ChangeLog	21 Dec 2012 06:31:41 -0000
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.42 2012/12/20 05:29:30 tetromino Exp $
 
+  21 Dec 2012; Michal Hrusecky <[e-mail]> colord-0.1.21.ebuild,
+  colord-0.1.23.ebuild, colord-0.1.26.ebuild:
+  Making policykit dependency optional
+
 *colord-0.1.26 (20 Dec 2012)
 
   20 Dec 2012; Alexandre Rostovtsev <[e-mail]>
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/Manifest,v
retrieving revision 1.43
diff -u -B -r1.43 Manifest
--- Manifest	20 Dec 2012 05:29:35 -0000	1.43
+++ Manifest	21 Dec 2012 06:31:41 -0000
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX colord-0.1.11-fix-automagic-vala.patch 1121 SHA256 b5e431ce7b27de4b5f2664b601f95486dc8ec0c207d1d04d8e98894b0bdd4a04 SHA512 862fce2b30be58c0d7c97e3e91ca1aedbe2159dd89b0bf7e895974b97e07dcc78daf1fd1382c67dbc9aae3a54b85e5893bd452a8d0767cdaadeef3b3e51d6009 WHIRLPOOL eeebcd49b5648bccc9d38638f88c896c362d744a522e8c5025ac95e0fc0b6c45ec4fcf2b16c7a485bf56da6e5da2988159c9f8e04cc6f368803c2d78c05872d8
 AUX colord-0.1.15-fix-automagic-libgusb.patch 1334 SHA256 6fcfd6cdf9edba49c364625fbac0339458d8f0ff8fda489827dad176e01e1a93 SHA512 cd476b8d428a4eb2c1814c1636cc6691196000864ef67dd5bd103e5668e832abbe76930ce49e0e13a4c7b440b70cf8a8421ff3cb3ccafe9d9304742a9b9b5c2a WHIRLPOOL 6bd641fc3098a8702f3a2a0438339957f31323f61575a273ce559793e43e208161e5026ff5ee0621e22f008c72661e7109a0bbe61df4fe5e7961aa1f50a5840a
 AUX colord-0.1.26-fix-automagic-systemd.patch 1615 SHA256 dc1d206b3908b3c3a3b7e45c5fcf49ac82093ef0d1d2d9e62321d5e85a7662ba SHA512 636cd8de6c84f59fb31d82479acc63a99fa1e61dddd61dccb8029ecd64ab492472b319fbdb33cd2b30bbbd7d6f4a1efca03e5746e8974b63d94add21282b5c80 WHIRLPOOL 85f6483cde491ccbd23944f18947c73100751c074b37132bf008c0a1e65367bf83ecd2059a7332e69ad38284d67408c549fcaa1b7905a750b3a081119dc16bef
 DIST colord-0.1.21.tar.xz 553424 SHA256 360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30 SHA512 442ef53b73466da34c3a2ad455ae4e401d6640a8093febdbb28adcda5908fcf5a043653b44f9357d02945230e3bee3f75f3e9e4d622b85adc8ebf4f5c8735537 WHIRLPOOL 91860610b7117c1a5f984f4bf778033438905a16a2f93c699be3774b6acd21c5947eb475ce83570cddde2bd5795d4e5427e8a10bc97c6438f67d7b68586800b1
 DIST colord-0.1.23.tar.xz 547392 SHA256 e0e9da36e28b3f977ce32accdc5cbac415ac2575031377c63b1e7bd2af32d789 SHA512 31018c0f42b8f0ab112163a621cfa02cabea27ded70ef9e15470241430f9bb017c56c4ab3992a1ba238db59f0a80f49d62f096c66af9866894a0bf3f35861ffb WHIRLPOOL f5600323527b891e8392e9c52d781144282e5fdc7f2b8a9fd4b99c1556b76f19d74175e3f7c7b9e42214a6548c3a8224fa40e84cd38b20b628c985e58fc42cc6
 DIST colord-0.1.26.tar.xz 638008 SHA256 6e581413813b96ab3efb4549f3a1260a1522f472aa0ee7f3dda9146bece2d7d3 SHA512 cfa26311ded52ebd52583434a5cf02656e26783c4160741ee85766b343975adf088e1e7717f3f81e402c6396a824554e0e214ba1bfaafdc907a350b0f9e72c8f WHIRLPOOL f5f32305671bab6f63ef5b7a754c07fd3b35de18d258473c89ce83acd4cac69ba73fcf3870de8b067c445b9d5fade59631f6e9c892e2044472e2dcc2b1c511ea
-EBUILD colord-0.1.21.ebuild 2671 SHA256 e936a58fec540b64adafa9e3260fcd0a9945766bafd376b57ed0cd381dab54de SHA512 40bec93e532fe8683b981fdc1ef7f5e9aa737d28524c26148b0497ddd1064c65832efe64681f64b5ac12eafd583c1870954482b6b32b0d59ab0c83442494115b WHIRLPOOL 3542740af415580cc727a54d137644a6e226d6f6a93ccc160d4b2b64c6fa0139a65eb5ea2ef3e1c3d6514ecd828d1a8f0e24a0ff33c1380ca5aaee1e78c4efb8
-EBUILD colord-0.1.23.ebuild 2884 SHA256 8a6f2463ad750773c517181479b2088855f51b495c0f51b74115a1e00af01324 SHA512 dd590d3bafc0c8b1465d56a3f4b158f6d67db10cd01b74e3c2b912d960fe637b19a7d376318d8893824719d80d1a4ea0c2f608e302fa14f72831a64d34208907 WHIRLPOOL 1daccd9e6e0f18a365ad514004b52358679552f8f00fb2ede5efeacfb419d512d2da79635f5fc7abe73530afb68033248a0b8266f59cee1cee4a83e0bd5cb45f
-EBUILD colord-0.1.26.ebuild 2675 SHA256 c184209d5a536faac2475da7c086d526de6e4ba7cb443277cf1f1d8725ec39b3 SHA512 1d938a886e6c69044b0d8a649d063c29f6d8027a57d9309c54d69eb667dd52f42e3bbfd127bd55e11a998bd77c8e2ca3ab5964ccbf732610ba637a56d8c70870 WHIRLPOOL c476dae38dabf191eb7449c7b6380a38350ed2bcb01305cae1bdc7c457e8fa60741c8f2b7aca190bf34c785628708d0ce549da6a59461e6d7b308f0b71829600
-MISC ChangeLog 8088 SHA256 9b558f0b1ec34b63c3939af1c598e442f4f71c8e87ef4a1b05bd5c8d3a0e3722 SHA512 1f85da777471747b2f02c59d2e3fe98c6852a49b83abf780e0a4df254c3b59fdee8cd0403a80794ec70a66424849d2b44062c346ed63a7369b5ff0cca133b4b2 WHIRLPOOL 2c48fbe1dda59f6182f09564fc0f7bf45ef747dee7bd93653b17911b9ef67e139d4b2fbfe56451963abaaab60d70e5d2e2e327443a300eb81ab7a92f68fa6f91
+EBUILD colord-0.1.21.ebuild 2713 SHA256 d9d6cfe21d6f0410167cc451343255a5e1a0d95b9139c6319199d94a3b0f24d0 SHA512 80e55ff8c7f00a3ba004fa8897ce8de44e07eed7d41c90a3667e74263cfb81b3b6b9037ba9ff5fb1d125b869891a10b7871bd1a22ca01b2f42d8ed4fad9a402c WHIRLPOOL ea64b11d0d1170e13f6ea01d0af10533a97e68f84cfac9c4e1171d024a1cc8a1c1f42f3a1d002e017e93c63b9b91dfde32cb707e5deeba261a75ec53883ddc47
+EBUILD colord-0.1.23.ebuild 2925 SHA256 3db76772a9690d7fca9c1af3be42b442da38d0ca4fe1f3da8c7d5aa4287ca415 SHA512 f363233e6294925bbe0fa10cd59380b4a91b30ff30a14f9f039494a44da27be5e17ec6e96bb8bac68b5174a4893a8bc4b98665c56f4cd06e25d3107b24fae500 WHIRLPOOL 8d5a48de36f42b2bdc60d1b208311216ca863a4bda008240a67f4e2f3e4e914b1da7f5285ac87a6b76e228f4911ee0dbc7ad4f67ad59227c0663e9f1a2029970
+EBUILD colord-0.1.26.ebuild 2716 SHA256 4f41ad5f98bad055e358792393f921fd33856cdd26f7f534d2ca2de0ac1dbdc4 SHA512 58679cfa5b4d2ff58e10cbfa5d5cdf7a9257bcb63e8426010fe2a6809a00c4249fa0cbaa516d5cc53093d0c63d7b32b5a1d1dab90705de44161402e8c6f56b92 WHIRLPOOL 3eb46113d5c074380b95089d93c2b130f7f89bebd9d179d66f55a7b594b275f00340cb49e2d36c5315fa158a25e055e46952062ae2285fe04fba52a7702a5258
+MISC ChangeLog 8246 SHA256 e8aea4ea018e0f38a53d29e7bc71f97e8dec223e25a198209e08339946bf68d3 SHA512 a4f55686bf8eb0cc2ec418266f8368768972aae64ad3266bce957d2b43daa0fdcb1aecc58b797a8a22014b64facbfbb0d1b68873989402a53b03f09106da0e92 WHIRLPOOL 9b5b75325e17075febb831319abb9a4f65d62a4533c30cac187eec8eb7404d17a6b4fc64a252fb2135293b9fdc4267757f51080577f7eeb6bf438737ddce2767
 MISC metadata.xml 353 SHA256 d7e364dcc2705b74624c797af272d796eae7cdc1d864a9f33add7c418f5444a9 SHA512 b4708d6b2d83f86b1b46f9efaccec4eb0d70f4e7b6b90be9504461e0255bdee26853c7d052d8f15c863e739710c5b1257083fa9b619d877cfc0858abec759fa7 WHIRLPOOL 66075ea5e3899fa40043c83bf7c42faec941cedc6dd599cf216f565b3b575721d06e2f7851db602522c8d1bcfd2904ebe2709958ef3da2b50b19a12de1d0126d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQ0qI7AAoJEJ0WA1zPCt1h5q0H/jr2WvlvfpS1N+jot7sb5PWG
-XzlZ2m3gBhGCeJQo7v7spMpgt7Z8tv5+y0FnG2ZOReVFzV9bHW4isoeGTQGYPoJv
-5N7hQ3L/1slzoa9EqSKGY5EP50ZVOZ12JNoH6iYGJo5W/JFfF742YPz2RnK/ShZV
-plgOG6sTYQ9jCOZzqpgHd1tjwg6F8B/i2QsOD3V+CvzTPFYUXCOxEv5gmnfUKoZn
-MqGldE5e/AyaNvVLSgKvCfjAbLZU43Xl33gD/AjwqMGsdVkIF1RY1TaS84vaoMmi
-oe2E5dRqoJm+vwEEhX/li2vy05p66RipDS79KIpbirdKKJ0wzqcXRQ8AJDGLko0=
-=wYZn
------END PGP SIGNATURE-----
Index: colord-0.1.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.21.ebuild,v
retrieving revision 1.10
diff -u -B -r1.10 colord-0.1.21.ebuild
--- colord-0.1.21.ebuild	20 Dec 2012 05:29:30 -0000	1.10
+++ colord-0.1.21.ebuild	21 Dec 2012 06:31:41 -0000
@@ -13,13 +13,13 @@
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="doc examples gtk +gusb +introspection scanner +udev vala"
+IUSE="doc examples gtk +gusb +introspection +policykit scanner +udev vala"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28.0:2
 	>=media-libs/lcms-2.2:2
-	>=sys-auth/polkit-0.103
+	+policykit? ( >=sys-auth/polkit-0.103 )
 	gtk? (
 		x11-libs/gdk-pixbuf:2[introspection?]
 		x11-libs/gtk+:3[introspection?] )
@@ -64,10 +64,10 @@
 	econf \
 		--disable-examples \
 		--disable-static \
-		--enable-polkit \
 		--disable-volume-search \
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_enable policykit polkit) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable gtk) \
 		$(use_enable gusb) \
Index: colord-0.1.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.23.ebuild,v
retrieving revision 1.4
diff -u -B -r1.4 colord-0.1.23.ebuild
--- colord-0.1.23.ebuild	20 Dec 2012 05:29:30 -0000	1.4
+++ colord-0.1.23.ebuild	21 Dec 2012 06:31:41 -0000
@@ -15,14 +15,14 @@
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples +gusb +introspection scanner +udev vala"
+IUSE="doc examples +gusb +introspection +policykit scanner +udev vala"
 REQUIRED_USE="vala? ( introspection )"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28.0:2
 	>=media-libs/lcms-2.2:2
-	>=sys-auth/polkit-0.103
+	policykit? ( >=sys-auth/polkit-0.103 )
 	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	scanner? ( media-gfx/sane-backends )
@@ -66,10 +66,10 @@
 	econf \
 		--disable-examples \
 		--disable-static \
-		--enable-polkit \
 		--disable-volume-search \
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_enable policykit polkit) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable gusb) \
 		$(use_enable gusb reverse) \
Index: colord-0.1.26.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.26.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 colord-0.1.26.ebuild
--- colord-0.1.26.ebuild	20 Dec 2012 05:29:30 -0000	1.1
+++ colord-0.1.26.ebuild	21 Dec 2012 06:31:41 -0000
@@ -15,14 +15,14 @@
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = libcolord soname version
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples +gusb +introspection systemd +udev vala"
+IUSE="doc examples +gusb +introspection +policykit systemd +udev vala"
 REQUIRED_USE="vala? ( introspection )"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3=
 	>=dev-libs/glib-2.28.0:2
 	>=media-libs/lcms-2.2:2=
-	>=sys-auth/polkit-0.103
+	policykit? ( >=sys-auth/polkit-0.103 )
 	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	systemd? ( >=sys-apps/systemd-44 )
@@ -59,10 +59,10 @@
 	econf \
 		--disable-examples \
 		--disable-static \
-		--enable-polkit \
 		--disable-volume-search \
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_enable policykit polkit) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable gusb) \
 		$(use_enable gusb reverse) \