From: Pacho Ramos Date: Sun, 25 Jan 2015 15:49:04 +0000 (+0000) Subject: Version bump, drop old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=91d0a0975dfb08d91cbd0f49e6c9ccced3373c6a;p=gentoo.git Version bump, drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- diff --git a/media-gfx/colorhug-client/ChangeLog b/media-gfx/colorhug-client/ChangeLog index 16016744ee7b..383d41ea7603 100644 --- a/media-gfx/colorhug-client/ChangeLog +++ b/media-gfx/colorhug-client/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/colorhug-client -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/ChangeLog,v 1.22 2014/12/19 13:39:32 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/ChangeLog,v 1.23 2015/01/25 15:49:03 pacho Exp $ + +*colorhug-client-0.2.5 (25 Jan 2015) + + 25 Jan 2015; Pacho Ramos +colorhug-client-0.2.5.ebuild, + -colorhug-client-0.2.1.ebuild, -colorhug-client-0.2.2.ebuild, + -files/colorhug-client-0.2.1-colord-1.2.patch: + Version bump, drop old 19 Dec 2014; Pacho Ramos colorhug-client-0.2.3.ebuild: amd64 stable, bug 529964 diff --git a/media-gfx/colorhug-client/Manifest b/media-gfx/colorhug-client/Manifest index c9357f874c86..691a006b4638 100644 --- a/media-gfx/colorhug-client/Manifest +++ b/media-gfx/colorhug-client/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX colorhug-client-0.2.1-colord-1.2.patch 1679 SHA256 501e50c975b4d856588cbc894e1f95c8b48243b87023ecbc3193353ba52237c5 SHA512 b599bc13498fb0e45cfdf25d858a8ed956216842e9dccdfb7e394f1db29b7f0df0d2dfd98d032e6e5757972f81ff42da32d904198fb583d50e796bf3f2d984cd WHIRLPOOL 733c9c3d155a053eae811d06c29b754657d6d49ad19337defb579f731127d54e7a3711236095276220efd1ade69b8445888af3b6a164c9181fd49a0acb84ab5c -DIST colorhug-client-0.2.1.tar.xz 729408 SHA256 2559b96f23543d2ba443e863f63efdaf37cbccc90224dc4576f7993906a2d9f7 SHA512 3419e839430272ae49c34b61fe0b8e428e156f886f3461717d5a43569e94d519faf22c9627c8c93a6fdee0e48bf138625254ea8de6f0a49237b58637e14e512d WHIRLPOOL a62e41414106abbbc431f03daa759b4d1e51f61e63e2844b92ef2bc48d71e029fbcce2a464446bab6c48310602b59c0dc06251f19310ff6d073d8afa2823237c -DIST colorhug-client-0.2.2.tar.xz 713560 SHA256 0e886d37e39bd39e49ee3f809bccd1c1751ef68cc8a2d9cf039ac4072b8ec37c SHA512 329e74767f15706f6f20a74ef191b5ea7cbdc01d59b3f5f55b77758b88c5685d56f2789140ae15c1f68a0adc12f62d1e98e0d166a0bd6afb330a62e8a4755bdf WHIRLPOOL 14cc9920fd8ad8953c6ccd37b97b4f682041d2f708be4966b401e89627610cc9178026baf94dda3cdb91e9336a9de2cc4293c636fff2033d93e5e6227c0d4333 DIST colorhug-client-0.2.3.tar.xz 715460 SHA256 79730d1fc311bcf80408b1e0ffb1f64e7cdea6b21ce4f29fc7d7be8a4fea37b6 SHA512 d94ac824ae7072de91235c042727629899f29fc6a5ba724c0c3ac5c1af51f852ccc035f25da5dc536a040542579f1ce82e5ba8bff8aea57523ab119900c620f5 WHIRLPOOL 4383a0adcdac616e9a29f9384744fb717ac61d968ab6bf152786c4ce7ac1349deb083cbe37a9e7e8b9204a9d5926ad5a3e8868e7ef6ab56c635fae3cb7fe73f1 -EBUILD colorhug-client-0.2.1.ebuild 1380 SHA256 73e5a3131e096d6776aaad8fc9a7170b357ceed62e5f74aae688129cebddbbf6 SHA512 e4356087fbf1d52b57add808ba89142f50e4ee5dcfbfd5b77d188213a2b6509d51c32f32bdd0cf20c91a8776baba0ba412f9f8fe223e357728386c2fb11d937a WHIRLPOOL 8498bf108d170e1aa3eea3314efe008a13a84da5fabb710d412f036880403235be0788f8967dbc32f5b7f6093e38444bc3751e684beac6c7e9322f01759c55df -EBUILD colorhug-client-0.2.2.ebuild 1380 SHA256 d793915f8cf329a3ef3e3ed463e6a7a4b9163107253d70fb61f8c25832e4343c SHA512 fde94c5c342e99edc70351c0f1aa0ac86604a6ecb00ace6f7fa8d20e4c90a86fc12418127e3bc398a0e9285ced1fddffecab5de1a6484a019fb46ec5cb13f9ec WHIRLPOOL bfc2e8098217165f766d5952f3284b213c176d6402c3861f22761482a2791e6cec739dcffe9c8ff9fc54e7faac94f2ea443e69cc32e2fdb75c2d6f28ca021423 +DIST colorhug-client-0.2.5.tar.xz 799552 SHA256 215d7d493c06030611584f84fc2d06d31c1124e8756c2c3725b241bb8c8f8449 SHA512 68eb99bdbe4739ac74b9cbb80b97af05874277bfa3fc0aefc98c1e8fe805e719109e2fc933430c1d5ba4a32490d331a41a75203022e4c433b1916c68b86b07ac WHIRLPOOL a8535198e6257d683ea06f828f18097f8c201c22c8a00a654eee30c83ab6a12b85f29c511421ba051ed2c078d0a8bbc568c4a5f5761f60cecfb45a2d964878f9 EBUILD colorhug-client-0.2.3.ebuild 1283 SHA256 d96ba6fe391c2a508e8d2a2104b3273a319a1f686f728235ae02ca591305b54d SHA512 992689aeabd4e6435cb1c9799cecc68528150eabd340790c16648150737041fd4012f8f23d81b7a7c69bf6dfc65ed891b2811919714c83ead01e32e5793d8466 WHIRLPOOL 04493e54e78b60d50d5b9aaffd682b5945bf74fde1ea777953b4409274d52335fd596b75448b7ea0651935bc17b44d51122e177c634e06b876378a25fb939e6f -MISC ChangeLog 3676 SHA256 5340ffea3bf158f7c7b9b5c36557dc3207ceb536499aa4f5faeebb422eb7002a SHA512 6e0e0fdd33b0f9e6369c487ffa9781b6b8d5ecd6fbdd83ade10283e5c875a8366fa02942475c7e067b5541075fe32d25c44786c833fabaf3ddf7bd52412c7f0c WHIRLPOOL b948bdb61a14c0212fe53c052fd55613a1cd41b74c4e3445ef872cb89fbdef295f27c065d79edf5e69d3236cc6bd535ff2a64587d5c7b50739b68a5fd29095d2 +EBUILD colorhug-client-0.2.5.ebuild 1300 SHA256 069bf6317b3fbbc0e8706b1e945e0c41663c1a32b1c82bb83b481c0cd24b553c SHA512 916a83aebcea37c4442024f24304c679fd738ee938b8260615427fa204e93cafbf7ad2ce282e139e348c95d266f01b97b26e3583f3c620993a4c73cc93fa3e8d WHIRLPOOL 4ccdaca602a3e668508b1278a84e2a1b73e515f3ac5b5e0e12de81856113dac8d65436d4c7d580d2889d17c3109f02b5b9d3924511de0ed2cd4f238a65b9b78c +MISC ChangeLog 3930 SHA256 d29487a0aed34371325fd37a98cea4213d2b3581395a6c7280974c76a3bddbe3 SHA512 17649a24b704a9cbb86197d0073e7dc26fc08d9bd9977297852e8842535bd5dc409560ddaa1c77578e126166af8bac9f9da9f4e0a7415022b584be3652fcfb38 WHIRLPOOL d75ba3529a3901748fd169abb74ae6c2cb43f9d45dc2cc304d1f9ad5799019fbcf599a42faf65f88bd6724ba65a65bd141d80f2434ebba55f462f05a0622b6ca MISC metadata.xml 326 SHA256 aaa2356b65ebfcef5d04214dc7ad57892a78ffffe1ca7c01ba8fbb1024e82a08 SHA512 01cd4bac8f87d1c688e5c01f85727256ba75e2b71289fe73b6803ee5d4df3f63b5fb38606530c921941cbb95ae47bd9f147b145e13f747d90e4ee622b76c2426 WHIRLPOOL 8163b013b15f42bb54c487b429173abaf845ba2c8c7a7239d451848d3e77eca27616c0b82cfd7b13759fb9225a675419a72fa27a236ff78a8db1f99800d177e8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSUKpUACgkQCaWpQKGI+9RRTQCfZJr2AovHuUrrdxHCMcnEFeIa -PZEAnRA7WW4SpdIzNmYXuppvv7u8CxQR -=CboX +iEYEAREIAAYFAlTFEHAACgkQCaWpQKGI+9RPfACeKlaF+LUwCBiMupARzx6d+DtC +WSIAn1YVv3atOE6yC8kwFJ/JRWGBbwYX +=T1UK -----END PGP SIGNATURE----- diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild deleted file mode 100644 index 821cd582af0b..000000000000 --- a/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.1.ebuild,v 1.3 2014/07/23 15:18:47 ago Exp $ - -EAPI=5 -GCONF_DEBUG="no" - -inherit bash-completion-r1 eutils gnome2 - -DESCRIPTION="Client tools for the ColorHug display colorimeter" -HOMEPAGE="http://www.hughski.com/" -SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-db/sqlite:3 - >=dev-libs/glib-2.31.10:2 - dev-libs/libgusb - media-libs/lcms:2 - media-libs/libcanberra[gtk3] - net-libs/libsoup:2.4 - x11-libs/gtk+:3 - >=x11-misc/colord-0.1.31:0= - >=x11-libs/colord-gtk-0.1.24 -" -DEPEND="${RDEPEND} - app-text/docbook-sgml-dtd:4.1 - app-text/docbook-sgml-utils - app-text/yelp-tools - >=dev-util/intltool-0.50 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" -# docbook stuff needed for man pages - -src_prepare() { - # from 0.2.2 - fixes build with colord-1.2 - epatch "${FILESDIR}/${P}-colord-1.2.patch" - gnome2_src_prepare - - # Fix completiondir, avoid eautoreconf - sed -i "s|^bashcompletiondir =.*|bashcompletiondir = $(get_bashcompdir)|" \ - data/Makefile.in || die "sed bashcompletiondir failed" -} - -src_configure() { - # introspection checked but not needed by anything - gnome2_src_configure --disable-introspection -} diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.2.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild similarity index 74% rename from media-gfx/colorhug-client/colorhug-client-0.2.2.ebuild rename to media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild index f7c82adb741f..994c1d871abe 100644 --- a/media-gfx/colorhug-client/colorhug-client-0.2.2.ebuild +++ b/media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.2.ebuild,v 1.1 2014/11/02 13:37:39 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.2.5.ebuild,v 1.1 2015/01/25 15:49:03 pacho Exp $ EAPI=5 GCONF_DEBUG="no" @@ -19,12 +19,12 @@ IUSE="" RDEPEND=" dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 - dev-libs/libgusb + >=dev-libs/libgusb-0.2.2 media-libs/lcms:2 - media-libs/libcanberra[gtk3] + >=media-libs/libcanberra-0.10[gtk3] net-libs/libsoup:2.4 >=x11-libs/gtk+-3.11.2:3 - >=x11-misc/colord-1.2.3:0= + >=x11-misc/colord-1.2.6:0= >=x11-libs/colord-gtk-0.1.24 " DEPEND="${RDEPEND} @@ -42,13 +42,13 @@ src_prepare() { sed -e '/Terminal=/ d' -i data/colorhug-docs.desktop || die gnome2_src_prepare - - # Fix completiondir, avoid eautoreconf - sed -i "s|^bashcompletiondir =.*|bashcompletiondir = $(get_bashcompdir)|" \ - data/Makefile.in || die "sed bashcompletiondir failed" } src_configure() { # introspection checked but not needed by anything gnome2_src_configure --disable-introspection } + +src_install() { + gnome2_src_install bashcompletiondir="$(get_bashcompdir)" +} diff --git a/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch b/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch deleted file mode 100644 index 66612baad81b..000000000000 --- a/media-gfx/colorhug-client/files/colorhug-client-0.2.1-colord-1.2.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/ch-ccmx.c b/src/ch-ccmx.c -index d674b16..e33e6d6 100644 ---- a/src/ch-ccmx.c -+++ b/src/ch-ccmx.c -@@ -510,9 +510,15 @@ ch_ccmx_get_device_download_kind (ChCcmxPrivate *priv) - case CH_DEVICE_MODE_FIRMWARE: - str = "colorhug"; - break; -+#if CD_CHECK_VERSION(1,2,0) -+ case CH_DEVICE_MODE_BOOTLOADER_PLUS: -+ case CH_DEVICE_MODE_FIRMWARE_PLUS: -+ str = "colorhug-plus"; -+#else - case CH_DEVICE_MODE_BOOTLOADER_SPECTRO: - case CH_DEVICE_MODE_FIRMWARE_SPECTRO: - str = "colorhug-spectro"; -+#endif - break; - default: - str = "unknown"; -diff --git a/src/ch-flash.c b/src/ch-flash.c -index 53ef123..82b2c03 100644 ---- a/src/ch-flash.c -+++ b/src/ch-flash.c -@@ -721,9 +721,15 @@ ch_flash_get_device_download_kind (ChFlashPrivate *priv) - case CH_DEVICE_MODE_FIRMWARE: - str = "colorhug"; - break; -+#if CD_CHECK_VERSION(1,2,0) -+ case CH_DEVICE_MODE_BOOTLOADER_PLUS: -+ case CH_DEVICE_MODE_FIRMWARE_PLUS: -+ str = "colorhug-plus"; -+#else - case CH_DEVICE_MODE_BOOTLOADER_SPECTRO: - case CH_DEVICE_MODE_FIRMWARE_SPECTRO: - str = "colorhug-spectro"; -+#endif - break; - default: - str = "unknown"; -diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c -index 7f5c989..f03ed5c 100644 ---- a/src/ch-spectro-util.c -+++ b/src/ch-spectro-util.c -@@ -476,7 +476,12 @@ ch_util_device_added_cb (GUsbDeviceList *list, - g_debug ("Added: %i:%i", - g_usb_device_get_vid (device), - g_usb_device_get_pid (device)); -+ -+#if CD_CHECK_VERSION(1,2,0) -+ if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_PLUS) { -+#else - if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) { -+#endif - priv->device = g_object_ref (device); - ch_util_got_device (priv); - }