diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2013-03-30 17:18:48 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-03-30 17:18:48 +0000 |
commit | 65d92c9fc829fab46c6772c1114c5d7a6e231402 (patch) | |
tree | ea729de7a4303250dd88e40a6a6b0b7da135fc59 /x11-libs/colord-gtk | |
parent | Clean up old revision. (diff) | |
download | historical-65d92c9fc829fab46c6772c1114c5d7a6e231402.tar.gz historical-65d92c9fc829fab46c6772c1114c5d7a6e231402.tar.bz2 historical-65d92c9fc829fab46c6772c1114c5d7a6e231402.zip |
Clean up old revisions.
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'x11-libs/colord-gtk')
-rw-r--r-- | x11-libs/colord-gtk/ChangeLog | 8 | ||||
-rw-r--r-- | x11-libs/colord-gtk/Manifest | 25 | ||||
-rw-r--r-- | x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild | 63 | ||||
-rw-r--r-- | x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch | 38 | ||||
-rw-r--r-- | x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch | 83 | ||||
-rw-r--r-- | x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch | 41 |
6 files changed, 12 insertions, 246 deletions
diff --git a/x11-libs/colord-gtk/ChangeLog b/x11-libs/colord-gtk/ChangeLog index 1275e40e1644..8f59bc929f52 100644 --- a/x11-libs/colord-gtk/ChangeLog +++ b/x11-libs/colord-gtk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/colord-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.20 2013/03/28 16:02:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.21 2013/03/30 17:16:01 eva Exp $ + + 30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> + -files/colord-gtk-0.1.22-automagic-vala.patch, + -files/colord-gtk-0.1.22-includes-1.patch, + -files/colord-gtk-0.1.22-includes-2.patch, -colord-gtk-0.1.23.ebuild: + Clean up old revisions. 28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> colord-gtk-0.1.23.ebuild: Stable for arm, wrt bug #458984 diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest index 17a4458c665b..f8b509be4085 100644 --- a/x11-libs/colord-gtk/Manifest +++ b/x11-libs/colord-gtk/Manifest @@ -1,29 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX colord-gtk-0.1.22-automagic-vala.patch 1345 SHA256 d827dea5a6c9d982fae876dd72f34983dde61f255c559fad706bff9343dbbb17 SHA512 d8c7e034680536ae9610053911eeb33e038c1e733ae9866a084a239383adb1383e02384f5d913701e09eee6e0ce0b2af18cf52ed1cf4a627aeef75d3c6ad6da7 WHIRLPOOL 8e696a0f0aa07b37066ab25aba2a5facab79478ebc0ed16c06162250bb945d752fc13745d169ba14a8df1aa4bbc826aba28cf4da7103aa49ae238a34ff45e7d7 -AUX colord-gtk-0.1.22-includes-1.patch 2555 SHA256 b7223ff4d50bb0e11cb3d2117a7a66c6ef2ccb88e48b08e0c697e07b4e8dd414 SHA512 ba862269496f2ca6636f8509ee3c47f65e3a337ef8b7315014febaee3643aba3bad3fed529fdf1b89701b5342c85d380cc3afdcb51e348b2c9205b699d76ce30 WHIRLPOOL 3a35444fdf535690a559b790644673eaec7796d7ef9aa2e1fe7fcb7d05aa8288bc1ebad1762debc658ad9d8d9ab81762ec4c8e54acef4eef29bf45b40bc8edcb -AUX colord-gtk-0.1.22-includes-2.patch 1289 SHA256 bf9a81ed0850b65c03197c771d346b4f94f6bcbc0086f666cf34ed6caf20be70 SHA512 7ea89cc560792eb1aa3bf7ccc583162d819d6963d32726ba54e2af2cd74d0d6e1cb5c4ffac78f863b12f26ee62fdf208b976771a1988f3014d2e620bebf5e986 WHIRLPOOL d7aab055c361ba7dc8c1ad6206a67ee2bba6424f87f734660c0d6dbead8c09ef8af02fbaa138767f08782336ffd3b0982a92b55d11e5b21968bf794a0766cf38 -DIST colord-gtk-0.1.23.tar.xz 283236 SHA256 30e658ee407531afe7b5787f31ffd20bc0a6a1c84bda153378b9a3acb2d58539 SHA512 01d7f7068b7f5d1b4215973f901c58bfbd2284c90768530c7f7a81d64d6b569c54d7c205cd6afedde2c60e86a3c56ef0a88c5b523446f70a1158e0eb2b8d6562 WHIRLPOOL 829057884ba155ef60b5c5666cf4d777b0963e526eb5aa31f1e159608c3405b41ccc7089fd4edc2d542be77dacc6edd846fb4694ce2858d9a2c4b2e46e535fee DIST colord-gtk-0.1.24.tar.xz 280724 SHA256 60d86a6f3ef68cadaebe3e8973d7e7d0026d5ba39751efad99c34b40643b063f SHA512 4e106486fbf28208da50a1fb8a1121de3896f387b1b4880ed0be1be41f071037831de57a59b7db1c69431ce59ee5bb86db624c53f872d603f79d7f0e27040d4f WHIRLPOOL f61d7e5e6a5ba97f1bda42e58f290f530799f4a4e05155cfa5d2bbabe370a2d9aafcae96178f245bf7589840fd2375a36b9fd6453129ee990ed89c10bbd139ef -EBUILD colord-gtk-0.1.23.ebuild 1656 SHA256 9fa17dd5e4e9b75f1ce7168055c863bfbb4086e1f26babaf628409cceaed9a36 SHA512 2ba83cbdd42acfcb3868bec5f7f9b1b6acaa7fbb7473bbafee3bdc6bc2b0e9bbe2259cbcc4906a76af0c94d98902dc3b6fc0a99bf50d1b8f6d117d9e18c5b556 WHIRLPOOL 93d3a8c9066d2ecc38657e8139929de350db651457b08b66ca2f1e38c89ad9c6dd4a7ecc293679f66ee41bb40d075671456c100f152402d1bf0b7dcb8f45b091 EBUILD colord-gtk-0.1.24.ebuild 1590 SHA256 72eba6d06fea25de11bdb3da248a82fca0f878ff77e1cf0dee28cf14d6601a64 SHA512 64a4142e2c27f84c300361c63f5fa8aae62122f3d896004261888ada4c24c445964bd9d1f8647d40454a42962d6e1ddfcc882834bf2e31af4472bc93e1ad38c5 WHIRLPOOL fc2f80579ee3c8aaee6340c9f05e33f2cb9df21f8385d33d64e561d882dbe5316416352aa1ca2d5cd22e9fa44d3152603c89fb535213853c063b5a21936ccedc -MISC ChangeLog 3216 SHA256 e46ee2ddb52fd44244912a54b75fbcd89714a0470f4be8f4ecc22349b49c4e2d SHA512 df95407e832f2c65485fa6cf19e8694da4086c38ff072e67a103d8abfb24df9db55019762c79ff5f46f6ceaa9bac5fb8c4ff666d91d920bcb3496417999ec610 WHIRLPOOL 37f178fc8153bf261bfced629e9ff4f522ac7439641a732c4ce458de8d319332c2d6ac32d72f9554c5d39db789b085bee197f87e9db05b9c5e93793945589cff +MISC ChangeLog 3463 SHA256 baade2161a35fe8c68b0bae48469502a3c7398d6f1504d66c8ddc840d5a1dbff SHA512 3b16ea91dde7cd3b6a60381b74ddccecd6bca3f6df6cc87d49903480d7f8055c9b11c721a97943f27e4f1c74e53129a787e0dcaff46a00407f2b89ff3fc21fd6 WHIRLPOOL ee97ae92e91e551781ffc8ef6e85b57b8902fd0927dc01e3e4ac4d01d5d1050873d7a7b48ef38d99348d161b91d5a03a26304a86b1e99f31338ad80bc11d8a53 MISC metadata.xml 244 SHA256 e0ad599c38340ac818bbe80797957b006da43e04d8c294a921d31f518dca55cd SHA512 aea5ff929579df1adbec51d6c67728a5b4f90317ba24e5a3f2933be851cb434b33ff601873603df89effc525c7078136c88534550a952de22430b937931e4f3e WHIRLPOOL 3d21ff0333c5c571a7e32732fe84c20fcc405c3a78455a5c224d6e5f6fb257044c50a63b2ec292c09c98d450cf73459b359f95734a589bc5e7378541836f946b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRVGjrAAoJELp701BxlEWf3EgP/0p7TsLGOnk1j6DzU6Q/ougY -MC9vt9SAn3OFTuCyA/giwx4izXJGR2wBR0D9JLUpBcIInV8aqoQJj7KxE+xOqm1e -CGuwHRBt65r/+j6NRuvF6Mv2Sgs4WiKRynABGVvdJlLiUvVsVwiD4kZBtPMzICzt -P2gz+NUiGSQDHXiRckdPoFQkoLd+LEwqkwqxAzDwVh1iODdZifQvbLYV19ckUaxa -ddz5+j/YkyHokADcAJW2hxUGBZT7USJPzelV752ciPoTk/7/7qK6al50EXfr0ljg -9w/Xt/o0rKiKCoP+laRlqaRliR07tLut11RtE0MwQ4Ez33WBC1lLBNtr7P4pf74E -M40sLx9LJtmDR88rXQgt/Rn1V6BMdZelyvl9bgVbpBUxZ/uDXZNrj4uovVH+lqby -JuBu42/xfHNqqu12yuhSc3uU7tBbvsGJtu6YuOJG8FT7tdwHis/ern1hEokswQAA -xwZo7ObZ29syUxcLv4cPfNe4/5L5ZD4HQgDVKMNlFxUtXI7bZGntAYVW3FV0CBgX -AIHa6M4kxoNoofEKwAlMb7+t0/msYKqwWesHKLtPvgQu95+NPKAACGXt7Xin4TfM -kzokbQkpNQ9QGcgkO75xi5nTZVKnkuwTLpnA0tXOXNka25DjrJ/W5uQGRbjCl+cK -rEsd9UJa1PIxBptBqVGK -=DtTN +iEYEAREIAAYFAlFXHdIACgkQ1fmVwcYIWAbIlgCfVFg43BCKuMfL76aMdX8sAI12 +s6YAn15Y6DbkLS3vPE6DRSqggKknerXe +=UhI/ -----END PGP SIGNATURE----- diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild deleted file mode 100644 index 79dccba67074..000000000000 --- a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild,v 1.8 2013/03/28 16:02:06 ago Exp $ - -EAPI="4" -VALA_MIN_API_VERSION="0.14" -VALA_USE_DEPEND="vapigen" - -inherit autotools eutils vala - -DESCRIPTION="GTK support library for colord" -HOMEPAGE="http://www.freedesktop.org/software/colord/" -SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~x86-fbsd" -IUSE="doc +introspection vala" -REQUIRED_USE="vala? ( introspection )" - -COMMON_DEPEND=">=dev-libs/glib-2.28:2 - >=media-libs/lcms-2.2:2 - x11-libs/gdk-pixbuf:2[introspection?] - x11-libs/gtk+:3[X(+),introspection?] - x11-misc/colord[introspection?,vala?] - introspection? ( >=dev-libs/gobject-introspection-0.9.8 )" -# ${PN} was part of x11-misc/colord until 0.1.22 -RDEPEND="${COMMON_DEPEND} - !<x11-misc/colord-0.1.22" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-libs/libxslt - >=dev-util/intltool-0.35 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.9 - ) - vala? ( $(vala_depend) )" - -RESTRICT="test" # Tests need a display device with a default color profile set - -src_prepare() { - use vala && vala_src_prepare - - # https://bugs.freedesktop.org/show_bug.cgi?id=55464 - epatch "${FILESDIR}/${PN}-0.1.22-automagic-vala.patch" - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable doc gtk-doc) \ - $(use_enable introspection) \ - $(use_enable vala) -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch deleted file mode 100644 index 5e7519fc7bba..000000000000 --- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 09cfb7f14f3766c80137a00586579dd2280ffe65 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 10 Aug 2012 14:34:03 -0400 -Subject: [PATCH] Make vala bindings non-automagic - ---- - configure.ac | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b51b7d2..e174c4b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,7 +134,9 @@ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2) - dnl --------------------------------------------------------------------------- - dnl - Build VALA support - dnl --------------------------------------------------------------------------- --if test x$found_introspection != xno; then -+AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]), -+ enable_vala=$enableval,enable_vala=no) -+if test x$found_introspection != xno -a x$enable_vala != xno; then - AC_PATH_PROG([VAPIGEN], [vapigen], []) - if test "x$VAPIGEN" = "x"; then - has_vapigen="no" -@@ -144,7 +146,9 @@ if test x$found_introspection != xno; then - fi - else - has_vapigen="no" -- AC_MSG_WARN([Not introspection found, will not build Vala binding]) -+ if test x$found_introspection = xno; then -+ AC_MSG_WARN([introspection not found, will not build Vala binding]) -+ fi - fi - AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"]) - --- -1.7.8.6 - diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch deleted file mode 100644 index abf9ba1f2a37..000000000000 --- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 71510fc785e440c068cc42dbd294dba5d74eeaff Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Wed, 27 Jun 2012 09:00:15 +0100 -Subject: [PATCH 1/2] Do not reuse __COLORD_H_INSIDE__ as this causes #include - insanity - ---- - libcolord-gtk/cd-version.h.in | 2 +- - libcolord-gtk/cd-window-sync.h | 2 +- - libcolord-gtk/cd-window.h | 2 +- - libcolord-gtk/colord-gtk.h | 9 +++------ - 4 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in -index 5ad7569..555556a 100644 ---- a/libcolord-gtk/cd-version.h.in -+++ b/libcolord-gtk/cd-version.h.in -@@ -29,7 +29,7 @@ - * See also: #CdClient, #CdDevice - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only <colord.h> can be included directly." - #endif - -diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h -index 6afe83b..47b8254 100644 ---- a/libcolord-gtk/cd-window-sync.h -+++ b/libcolord-gtk/cd-window-sync.h -@@ -19,7 +19,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only <colord.h> can be included directly." - #endif - -diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h -index 3b993a8..dbdab3e 100644 ---- a/libcolord-gtk/cd-window.h -+++ b/libcolord-gtk/cd-window.h -@@ -19,7 +19,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION) -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) - #error "Only <colord-gtk.h> can be included directly." - #endif - -diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h -index 658ec60..4080667 100644 ---- a/libcolord-gtk/colord-gtk.h -+++ b/libcolord-gtk/colord-gtk.h -@@ -31,20 +31,17 @@ - #ifndef __COLORD_GTK_H__ - #define __COLORD_GTK_H__ - --#define __COLORD_H_INSIDE__ -+#define __COLORD_GTK_H_INSIDE__ - - #include <gtk/gtk.h> -- - #include <colord.h> --//#include <colord/cd-device.h> --//#include <colord/cd-profile.h> --//#include <colord/cd-color.h> -+ - #include <colord-gtk/cd-sample-window.h> - #include <colord-gtk/cd-version.h> - #include <colord-gtk/cd-window.h> - #include <colord-gtk/cd-window-sync.h> - --#undef __COLORD_H_INSIDE__ -+#undef __COLORD_GTK_H_INSIDE__ - - #endif /* __COLORD_GTK_H__ */ - --- -1.7.12 - diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch deleted file mode 100644 index e27a650a7718..000000000000 --- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6c18326f3dc3aeb2b80db167fab5a1001f6bbe4c Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Wed, 27 Jun 2012 09:02:17 +0100 -Subject: [PATCH 2/2] trivial: add include guards to cd-sample-window.h - ---- - libcolord-gtk/cd-sample-window.h | 4 ++++ - libcolord-gtk/cd-window-sync.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libcolord-gtk/cd-sample-window.h b/libcolord-gtk/cd-sample-window.h -index c994409..d95dfbf 100644 ---- a/libcolord-gtk/cd-sample-window.h -+++ b/libcolord-gtk/cd-sample-window.h -@@ -19,6 +19,10 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) -+#error "Only <colord-gtk.h> can be included directly." -+#endif -+ - #ifndef __CD_SAMPLE_WINDOW_H - #define __CD_SAMPLE_WINDOW_H - -diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h -index 47b8254..632ab55 100644 ---- a/libcolord-gtk/cd-window-sync.h -+++ b/libcolord-gtk/cd-window-sync.h -@@ -20,7 +20,7 @@ - */ - - #if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION) --#error "Only <colord.h> can be included directly." -+#error "Only <colord-gtk.h> can be included directly." - #endif - - #ifndef __CD_WINDOW_SYNC_H --- -1.7.12 - |