From 9804ace84608c7e831556f53b0a3b25139735dfc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 22 Nov 2014 22:28:39 +0000 Subject: [PATCH] Introduce multilib support as needed for x11-libs/gtk+:3. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- x11-misc/colord/ChangeLog | 7 +- x11-misc/colord/Manifest | 21 +++- x11-misc/colord/colord-1.2.5-r1.ebuild | 165 +++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 x11-misc/colord/colord-1.2.5-r1.ebuild diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog index b513a54aeb9e..1d4b6aa8206f 100644 --- a/x11-misc/colord/ChangeLog +++ b/x11-misc/colord/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/colord # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.87 2014/11/11 13:51:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.88 2014/11/22 22:28:37 mgorny Exp $ + +*colord-1.2.5-r1 (22 Nov 2014) + + 22 Nov 2014; Michał Górny +colord-1.2.5-r1.ebuild: + Introduce multilib support as needed for x11-libs/gtk+:3. *colord-1.2.5 (11 Nov 2014) diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index 0d88bd7d3ffc..124534252c0e 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -6,13 +6,26 @@ DIST colord-1.2.4.tar.xz 1177272 SHA256 98440deb524f71894a3542cd84c1f10e9306092a DIST colord-1.2.5.tar.xz 1181220 SHA256 0332420c7fd808bb3a028e0249fb2b5e52b9544330c767d08b01a6e03d3c5283 SHA512 61a40856fff11361c94c2798e99dde6376a7f43bc3e67f1d7b83f7aaba872e08b4e8e25cacd8b54b1ac191b7bd33b08068e70e780e41e06bcab6bba8c7651805 WHIRLPOOL be40dd210d7de04763c12b0cf4a18b152b14d983e271fd3a15b9bf6320f7a542346c1c2e656bb4293ce4133a2fff14b0448df25882cd4f7e95187f43b22e1fc5 EBUILD colord-1.2.1-r1.ebuild 3283 SHA256 a60aa2b91abc9166aa86b2ca35495e29014d5d3051ce1fb0ece6420c06bd727c SHA512 7abbcfad537aee8e65a02890f40b601854bd471ad281129555b2fa83cd7423c79c8dfc290ff762e510a16ab78bf6e20e6ace033161fbe0bc856aabaf94562a0b WHIRLPOOL 1771d403e72e6a9b6c2145dc943b0025e9b9336f2dde8794686e4a891d5af6cc2a18b830e0afa66f1d3f6e07e43492b38e839537f163069567c35f841eeed95e EBUILD colord-1.2.4.ebuild 3427 SHA256 58c93feb42d895ebcb3717e034091465caebde00c600bbd01cc609a556156523 SHA512 87ea11b0f2b421df09729dbddb0e5181163f23dac59da3f11d94d1837c1ce6d2bee4697ff653c608531f73c2a90f9996106c4f72aecdaf6f05bcc985eb812f2f WHIRLPOOL bb94a203ba1bdf87f13bb24c71f96d580c91eeb1ae7811b91e21965a3325a08384152e3dca5b01c96665fe137a5a4b0556eaec2d9f71724c67da4fb4bdb02a91 +EBUILD colord-1.2.5-r1.ebuild 4401 SHA256 00876c6c8c1157fcef11dfd922756dd7a58cc5dc69016d6427cf287c690a3d8d SHA512 81b5d6a6768fd86c28467f439497a99489cacb5a6690c006f78b4e9ea35556359274d4bb23779d23e0e7f9a06b7c2bd42ed5d881b0bff739e5a4c559d3df513b WHIRLPOOL 7a37b476df089affd7c7116cde26c010f0f29bddb3ff78c5a91ea509c7a12982af540e036a8591bda9d9849d501e080f735abd99b1c126450b961e1f6f365880 EBUILD colord-1.2.5.ebuild 3427 SHA256 13bf7ee86205507112a7afc750e05e5ebc94eeac42a5acc61cbb05fc7f53cad5 SHA512 3bd2b63d96723361eaaebb6e3a196cadb2c3efca251487407dc0541efde70b7f72c42ae115bbddd71ba9cdbe540279cd9be3e21a3b68630f477bc1cac8b30d91 WHIRLPOOL 59a677fcb2ef42398db41da143f7c14559d0b9cfa672a27c52957bb4ad0e8415a3bfa61000a4e99fb65d76505fea45bb2ecf3a63dbfbcabc9258d497790d96d7 -MISC ChangeLog 14341 SHA256 14b6036225fd96a8e3685401d4b48aa86ecfd6465f2eca282ec22f330fd97343 SHA512 43122417664e9dd868c7e0c61d882c4d61f6f6f16a1a6a884b6b49d409c007bb7ef0ff26a735cc7785c9ece5be0a62a95ca8bddb304a2a14fe3751fe0fadfb56 WHIRLPOOL 315892cd6643e8a4137910b47d07c7bb4db3824517a53a6e1096d91a1e8a4a27bee374cfa362fea4ba90597157beec0cb47ca5fe5627a1245c464d72b5c9e295 +MISC ChangeLog 14510 SHA256 df18a0e525432181e6f9170da590709f02955a741156c7712cf5ee37c9d08d0d SHA512 6e5b51e325332827ff59c99f1309ac339ff991d400c941fe391a710bb59fb7c7494fad4695a1db1ba8835576495f4c7bed189b6e9dcf59dd4a85389feb7a6851 WHIRLPOOL 9db191bd90444eb21266c3515035be85feeb00c2edb2e0e77d0ea92e3850413e504ef975c42dd92498716181aec07b9d6e2e48e48bd2a9beaf6cf4d600c7ceed MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEUEAREIAAYFAlRiFEgACgkQCaWpQKGI+9QzmwCYwQfxYNTtrx7rEu4aUsDaLRND -BQCcDPJCJGRJNWMB2ZCGJ/EVq8KIrzw= -=ugw/ +iQJ8BAEBCABmBQJUcQ4WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1FEP/3lVKs2pFsaadz/PlaR0+yG6 +TVtZjq7VDPHIf8bO0z7G772G9JhN2kbtlDw6gHepC2CuwaZ3lYRvaOGytmGRmjIp +NiDCZcJ4LPT+BaEzE8hdN2nPgylfdXhvuuQz8ZIpvTe+bsmNsh7TEPGCNx/nABKM +Mks6K4kinRJEaMk+qeOlmxpnJUI03IgMV6GaKO2eccnFgoxXbaZVuEl+k90V4k8H +8v0FusL59ShMLxNHBeaHTf2iYVNg4CcOWyrbxrz3m+jtWK9e9yRwZATxSiwzuh6S +YQmsK++Sv/2YnlXLh+0SW5+aj7c3exQ6vEB817fVjB1TuO4XPZ04n9CkQ7ieunc6 +mE77o9KZCirxTeQUXkvwK8qBmwpCqvOqdrUVKecFDadShGpCGqR7bSS+0bt7vsSf +NNPOouBhNmJ6g23nZ0EmHSQRY/yFFVD6EiYucuOk/X8v9AVu01Wzl2fP52y0vgu8 +8xfkxwpI4FPqoZya081BXi90ZeCVlaJNvjzZPSbbRi3PAgsM7OVzhd1CWNzXaqrf +l6wHUNw5+5iKoGdyPymxLx3mKswYRcUNCthP2OEY3oGNPiKi4FLl4Aw+X2Q6uVIC +XKdNWXrC7JVqmGqvSGaX8jZSsEv2sys9c40bLWKgAbR1ip/OXJDhwfRZ88gyoRxN +DM3dmRUEqs2obygAoDhi +=bvI+ -----END PGP SIGNATURE----- diff --git a/x11-misc/colord/colord-1.2.5-r1.ebuild b/x11-misc/colord/colord-1.2.5-r1.ebuild new file mode 100644 index 000000000000..dca32ca8b1ef --- /dev/null +++ b/x11-misc/colord/colord-1.2.5-r1.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.5-r1.ebuild,v 1.1 2014/11/22 22:28:37 mgorny Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" +VALA_MIN_API_VERSION="0.18" + +inherit bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd udev vala + +DESCRIPTION="System service to accurately color manage input and output devices" +HOMEPAGE="http://www.freedesktop.org/software/colord/" +SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/2" # subslot = libcolord soname version +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +# We prefer policykit enabled by default, bug #448058 +IUSE="examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala" +REQUIRED_USE=" + gusb? ( udev ) + scanner? ( udev ) + vala? ( introspection ) +" + +COMMON_DEPEND=" + dev-db/sqlite:3= + >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] + gusb? ( >=dev-libs/libgusb-0.1.1[introspection?,${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) + policykit? ( >=sys-auth/polkit-0.103 ) + scanner? ( media-gfx/sane-backends ) + systemd? ( >=sys-apps/systemd-44:0= ) + udev? ( + virtual/udev + virtual/libgudev:= + virtual/libudev:=[${MULTILIB_USEDEP}] + ) +" +RDEPEND="${COMMON_DEPEND} + !media-gfx/shared-color-profiles + !<=media-gfx/colorhug-client-0.1.13 +" +DEPEND="${COMMON_DEPEND} + dev-libs/libxslt + >=dev-util/gtk-doc-am-1.9 + >=dev-util/intltool-0.35 + >=sys-devel/gettext-0.17 + virtual/pkgconfig[${MULTILIB_USEDEP}] + extra-print-profiles? ( media-gfx/argyllcms ) + vala? ( $(vala_depend) ) +" + +# FIXME: needs pre-installed dbus service files +RESTRICT="test" + +# According to upstream comment in colord.spec.in, building the extra print +# profiles requires >=4G of memory +CHECKREQS_MEMORY="4G" + +pkg_pretend() { + use extra-print-profiles && check-reqs_pkg_pretend +} + +pkg_setup() { + use extra-print-profiles && check-reqs_pkg_setup + enewgroup colord + enewuser colord -1 -1 /var/lib/colord colord +} + +src_prepare() { + # Adapt to Gentoo paths + sed -i -e 's/spotread/argyll-spotread/' src/sensors/cd-sensor-argyll.c || die + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + # Reverse tools require gusb + # bash-completion test does not work on gentoo + local myconf=( + --disable-bash-completion + --disable-examples + --disable-static + --enable-libcolordcompat + --with-daemon-user=colord + --localstatedir="${EPREFIX}"/var + $(multilib_native_use_enable extra-print-profiles print-profiles) + $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") + $(use_enable gusb) + $(multilib_native_use_enable gusb reverse) + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_enable scanner sane) + $(multilib_native_use_enable systemd systemd-login) + $(use_enable udev) + --with-udevrulesdir="$(get_udevdir)"/rules.d + $(multilib_native_use_enable vala) + "$(systemd_with_unitdir)" + ) + + if ! multilib_is_native_abi; then + # disable some extraneous checks + myconf+=( + SQLITE_{CFLAGS,LIBS}=' ' + GUDEV_{CFLAGS,LIBS}=' ' + ) + fi + + ECONF_SOURCE=${S} \ + gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + gnome2_src_compile + else + emake -C lib/colord + emake -C lib/colorhug + emake -C lib/compat + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + default + else + emake -C lib/colord check + emake -C lib/colorhug check + emake -C lib/compat check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + gnome2_src_install + else + gnome2_src_install -C lib/colord + gnome2_src_install -C lib/colorhug + gnome2_src_install -C lib/compat + gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS + fi +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO" + einstalldocs + + newbashcomp data/colormgr colormgr + + # Ensure config and profile directories exist and /var/lib/colord/* + # is writable by colord user + keepdir /var/lib/color{,d}/icc + fowners colord:colord /var/lib/colord{,/icc} + + if use examples; then + docinto examples + dodoc examples/*.c + fi +} -- 2.26.2