* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-05-08 17:36 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 80fba9c4e88f28aadf4a426b5e836ff7609dec17
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 17:34:49 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 17:34:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=80fba9c4
x11-misc/colord: Initial ebuild
---
x11-misc/colord/colord-0.1.7.ebuild | 53 +++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.7.ebuild b/x11-misc/colord/colord-0.1.7.ebuild
new file mode 100644
index 0000000..aab708c
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit base
+
+DESCRIPTION="system service to accurately color manage input and output devices"
+HOMEPAGE="http://colord.hughsie.com/"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# XXX: raise to libusb-1.0.9:1 when available
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.25.9:2
+ >=dev-libs/libusb-1.0.8:1
+ media-gfx/sane-backends
+ media-libs/lcms:2
+ >=sys-auth/polkit-0.97
+ sys-fs/udev[extras]
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-sgml-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ sys-devel/gettext
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+
+src_configure() {
+ econf \
+ --disable-examples \
+ --disable-static \
+ --enable-polkit \
+ --enable-reverse \
+ --enable-sane
+}
+
+src_install() {
+ base_src_install
+ find "${D}" -name "*.la" -delete
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-06-14 6:36 Nirbheek Chauhan
0 siblings, 0 replies; 12+ messages in thread
From: Nirbheek Chauhan @ 2011-06-14 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 74d6f190054fa4752419ac9f2334797093118299
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 22:10:12 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 05:59:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=74d6f190
x11-misc/colord: 0.1.7 → 0.1.8
Version bump; update glib and lcms dependencies, and update for new udev
USE flags (see bug #348472); colord builds and appears to work on ~x86.
Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>
---
.../{colord-0.1.7.ebuild => colord-0.1.8.ebuild} | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.7.ebuild b/x11-misc/colord/colord-0.1.8.ebuild
similarity index 80%
rename from x11-misc/colord/colord-0.1.7.ebuild
rename to x11-misc/colord/colord-0.1.8.ebuild
index aab708c..530558e 100644
--- a/x11-misc/colord/colord-0.1.7.ebuild
+++ b/x11-misc/colord/colord-0.1.8.ebuild
@@ -6,31 +6,31 @@ EAPI="3"
inherit base
-DESCRIPTION="system service to accurately color manage input and output devices"
+DESCRIPTION="System service to accurately color manage input and output devices"
HOMEPAGE="http://colord.hughsie.com/"
SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
# XXX: raise to libusb-1.0.9:1 when available
RDEPEND="
dev-db/sqlite:3
- >=dev-libs/glib-2.25.9:2
+ >=dev-libs/glib-2.28.0:2
>=dev-libs/libusb-1.0.8:1
media-gfx/sane-backends
- media-libs/lcms:2
+ >=media-libs/lcms-2.2:2
>=sys-auth/polkit-0.97
- sys-fs/udev[extras]
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
"
DEPEND="${RDEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
dev-util/pkgconfig
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
"
# FIXME: needs pre-installed dbus service files
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-06-24 17:35 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-06-24 17:35 UTC (permalink / raw
To: gentoo-commits
commit: d937f1d73539f2bae22f075a877267867b51a00b
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 12:49:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jun 19 02:21:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d937f1d7
x11-misc/colord: 0.1.8 → 0.1.9
Version bump. Make sane-backends and udev dependencies optional.
---
.../{colord-0.1.8.ebuild => colord-0.1.9.ebuild} | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.8.ebuild b/x11-misc/colord/colord-0.1.9.ebuild
similarity index 84%
rename from x11-misc/colord/colord-0.1.8.ebuild
rename to x11-misc/colord/colord-0.1.9.ebuild
index 530558e..1863ef0 100644
--- a/x11-misc/colord/colord-0.1.8.ebuild
+++ b/x11-misc/colord/colord-0.1.9.ebuild
@@ -8,22 +8,22 @@ inherit base
DESCRIPTION="System service to accurately color manage input and output devices"
HOMEPAGE="http://colord.hughsie.com/"
-SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.bz2"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="scanner +udev"
# XXX: raise to libusb-1.0.9:1 when available
RDEPEND="
dev-db/sqlite:3
>=dev-libs/glib-2.28.0:2
>=dev-libs/libusb-1.0.8:1
- media-gfx/sane-backends
>=media-libs/lcms-2.2:2
>=sys-auth/polkit-0.97
- || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+ scanner? ( media-gfx/sane-backends )
+ udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
DEPEND="${RDEPEND}
app-text/docbook-sgml-utils
@@ -44,7 +44,8 @@ src_configure() {
--disable-static \
--enable-polkit \
--enable-reverse \
- --enable-sane
+ $(use_enable scanner sane) \
+ $(use_enable udev gudev)
}
src_install() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-07-12 4:39 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-07-12 4:39 UTC (permalink / raw
To: gentoo-commits
commit: be011e471e387177d6cc6a01d26dc98004ea631e
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 04:30:30 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 04:30:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=be011e47
x11-misc/colord: 0.1.9 → 0.1.10 + live ebuild
Version bump. Add doc and examples USE flags. Add a live ebuild (which
has optional introspection and vala support).
---
x11-misc/colord/colord-0.1.10.ebuild | 84 ++++++++++++++++++++++++++++++
x11-misc/colord/colord-0.1.9.ebuild | 54 --------------------
x11-misc/colord/colord-9999.ebuild | 93 ++++++++++++++++++++++++++++++++++
3 files changed, 177 insertions(+), 54 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.10.ebuild b/x11-misc/colord/colord-0.1.10.ebuild
new file mode 100644
index 0000000..8f6a168
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit base
+if [[ ${PV} = 9999 ]]; then
+ GCONF_DEBUG="no"
+ inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
+fi
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://colord.hughsie.com/"
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://gitorious.org/colord/master.git"
+else
+ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~x86"
+fi
+IUSE="doc examples scanner +udev"
+
+# XXX: raise to libusb-1.0.9:1 when available
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.28.0:2
+ >=dev-libs/libusb-1.0.8:1
+ >=media-libs/lcms-2.2:2
+ >=sys-auth/polkit-0.97
+ scanner? ( media-gfx/sane-backends )
+ udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-gfx/shared-color-profiles"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ >=sys-devel/gettext-0.17
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9
+ )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+
+src_configure() {
+ econf \
+ --disable-examples \
+ --disable-static \
+ --enable-polkit \
+ --enable-reverse \
+ $(use_enable doc gtk-doc) \
+ $(use_enable scanner sane) \
+ $(use_enable udev gudev)
+ # parallel make fails in doc/api
+ use doc && MAKEOPTS=-j1
+}
+
+src_install() {
+ base_src_install
+
+ # additional documentation files not included in tarball releases
+ [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*.c
+ fi
+
+ find "${D}" -name "*.la" -delete
+}
diff --git a/x11-misc/colord/colord-0.1.9.ebuild b/x11-misc/colord/colord-0.1.9.ebuild
deleted file mode 100644
index 1863ef0..0000000
--- a/x11-misc/colord/colord-0.1.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit base
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://colord.hughsie.com/"
-SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner +udev"
-
-# XXX: raise to libusb-1.0.9:1 when available
-RDEPEND="
- dev-db/sqlite:3
- >=dev-libs/glib-2.28.0:2
- >=dev-libs/libusb-1.0.8:1
- >=media-libs/lcms-2.2:2
- >=sys-auth/polkit-0.97
- scanner? ( media-gfx/sane-backends )
- udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-utils
- dev-libs/libxslt
- >=dev-util/intltool-0.35
- dev-util/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
-
-src_configure() {
- econf \
- --disable-examples \
- --disable-static \
- --enable-polkit \
- --enable-reverse \
- $(use_enable scanner sane) \
- $(use_enable udev gudev)
-}
-
-src_install() {
- base_src_install
- find "${D}" -name "*.la" -delete
-}
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
new file mode 100644
index 0000000..5acd534
--- /dev/null
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit base
+if [[ ${PV} = 9999 ]]; then
+ GCONF_DEBUG="no"
+ inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
+fi
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://colord.hughsie.com/"
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://gitorious.org/colord/master.git"
+else
+ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~x86"
+fi
+IUSE="doc examples +introspection scanner +udev vala"
+
+# XXX: raise to libusb-1.0.9:1 when available
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.28.0:2
+ >=dev-libs/libusb-1.0.8:1
+ >=media-libs/lcms-2.2:2
+ >=sys-auth/polkit-0.97
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+ scanner? ( media-gfx/sane-backends )
+ udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-gfx/shared-color-profiles"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ >=sys-devel/gettext-0.17
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9
+ )
+ vala? ( dev-lang/vala:0.12 )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+
+src_configure() {
+ if use vala; then
+ if use introspection; then
+ export VAPIGEN=$(type -p vapigen-0.12)
+ else
+ ewarn "Vala bindings cannot be built because the introspection USE flag is disabled"
+ fi
+ fi
+ econf \
+ --disable-examples \
+ --disable-static \
+ --enable-polkit \
+ --enable-reverse \
+ $(use_enable doc gtk-doc) \
+ $(use_enable scanner sane) \
+ $(use_enable udev gudev)
+ # parallel make fails in doc/api
+ use doc && MAKEOPTS=-j1
+}
+
+src_install() {
+ base_src_install
+
+ # additional documentation files not included in tarball releases
+ [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*.c
+ fi
+
+ find "${D}" -name "*.la" -delete
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-08-10 1:33 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-08-10 1:33 UTC (permalink / raw
To: gentoo-commits
commit: 01731c4db9a5ca5137ff379d8ec0ae4d2dcf69a4
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Aug 10 01:26:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Aug 10 01:26:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=01731c4d
x11-misc/colord: 0.1.10 → 0.1.11
Version bump with introspection support (bringing an automagic vala
build-time dep, unfortunately). Update the homepage.
---
.../{colord-0.1.10.ebuild => colord-0.1.11.ebuild} | 13 +++++++++----
x11-misc/colord/colord-9999.ebuild | 20 ++++++++------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.10.ebuild b/x11-misc/colord/colord-0.1.11.ebuild
similarity index 81%
rename from x11-misc/colord/colord-0.1.10.ebuild
rename to x11-misc/colord/colord-0.1.11.ebuild
index 8f6a168..e966c19 100644
--- a/x11-misc/colord/colord-0.1.10.ebuild
+++ b/x11-misc/colord/colord-0.1.11.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://colord.hughsie.com/"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="git://gitorious.org/colord/master.git"
else
@@ -25,7 +25,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="doc examples scanner +udev"
+IUSE="doc examples +introspection scanner +udev"
# XXX: raise to libusb-1.0.9:1 when available
COMMON_DEPEND="
@@ -34,11 +34,13 @@ COMMON_DEPEND="
>=dev-libs/libusb-1.0.8:1
>=media-libs/lcms-2.2:2
>=sys-auth/polkit-0.97
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
+# XXX: automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -49,6 +51,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.9
)
+ introspection? ( dev-lang/vala:0.12 )
"
# FIXME: needs pre-installed dbus service files
@@ -63,8 +66,10 @@ src_configure() {
--enable-polkit \
--enable-reverse \
$(use_enable doc gtk-doc) \
+ $(use_enable introspection) \
$(use_enable scanner sane) \
- $(use_enable udev gudev)
+ $(use_enable udev gudev) \
+ VAPIGEN=$(type -p vapigen-0.12)
# parallel make fails in doc/api
use doc && MAKEOPTS=-j1
}
@@ -80,5 +85,5 @@ src_install() {
doins examples/*.c
fi
- find "${D}" -name "*.la" -delete
+ find "${D}" -name "*.la" -delete || die
}
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 5acd534..e966c19 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://colord.hughsie.com/"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="git://gitorious.org/colord/master.git"
else
@@ -25,7 +25,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~amd64 ~x86"
fi
-IUSE="doc examples +introspection scanner +udev vala"
+IUSE="doc examples +introspection scanner +udev"
# XXX: raise to libusb-1.0.9:1 when available
COMMON_DEPEND="
@@ -40,6 +40,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
+# XXX: automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -50,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.9
)
- vala? ( dev-lang/vala:0.12 )
+ introspection? ( dev-lang/vala:0.12 )
"
# FIXME: needs pre-installed dbus service files
@@ -59,21 +60,16 @@ RESTRICT="test"
DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
src_configure() {
- if use vala; then
- if use introspection; then
- export VAPIGEN=$(type -p vapigen-0.12)
- else
- ewarn "Vala bindings cannot be built because the introspection USE flag is disabled"
- fi
- fi
econf \
--disable-examples \
--disable-static \
--enable-polkit \
--enable-reverse \
$(use_enable doc gtk-doc) \
+ $(use_enable introspection) \
$(use_enable scanner sane) \
- $(use_enable udev gudev)
+ $(use_enable udev gudev) \
+ VAPIGEN=$(type -p vapigen-0.12)
# parallel make fails in doc/api
use doc && MAKEOPTS=-j1
}
@@ -89,5 +85,5 @@ src_install() {
doins examples/*.c
fi
- find "${D}" -name "*.la" -delete
+ find "${D}" -name "*.la" -delete || die
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-09-27 6:06 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-09-27 6:06 UTC (permalink / raw
To: gentoo-commits
commit: cc7a30f7a403697b2e94412a9fd6d9fde4311232
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 07:02:18 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 27 06:05:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cc7a30f7
x11-misc/colord: add 0.1.12
Add new colord version. Following the example of Debian, for security we
should run colord as a non-root user and refrain from automatically
scanning user directories for color profiles.
---
x11-misc/colord/colord-0.1.12.ebuild | 135 ++++++++++++++++++++++++++++++++++
x11-misc/colord/colord-9999.ebuild | 48 ++++++++++++-
2 files changed, 182 insertions(+), 1 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.12.ebuild b/x11-misc/colord/colord-0.1.12.ebuild
new file mode 100644
index 0000000..34b74ca
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.12.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils base
+if [[ ${PV} = 9999 ]]; then
+ GCONF_DEBUG="no"
+ inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
+fi
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://gitorious.org/colord/master.git"
+else
+ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~x86"
+fi
+IUSE="doc examples +introspection scanner +udev"
+
+# XXX: raise to libusb-1.0.9:1 when available
+COMMON_DEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.28.0:2
+ >=dev-libs/libusb-1.0.8:1
+ >=media-libs/lcms-2.2:2
+ >=sys-auth/polkit-0.97
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+ scanner? ( media-gfx/sane-backends )
+ udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-gfx/shared-color-profiles"
+# XXX: automagic build-time vala dependency if USE=introspection
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ dev-util/pkgconfig
+ >=sys-devel/gettext-0.17
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9
+ )
+ introspection? ( dev-lang/vala:0.12 )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+
+pkg_setup() {
+ enewgroup colord
+ enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_configure() {
+ econf \
+ --disable-examples \
+ --disable-static \
+ --enable-polkit \
+ --enable-reverse \
+ --disable-volume-search \
+ --with-daemon-user=colord \
+ --localstatedir="${EPREFIX}"/var \
+ $(use_enable doc gtk-doc) \
+ $(use_enable introspection) \
+ $(use_enable scanner sane) \
+ $(use_enable udev gudev) \
+ VAPIGEN=$(type -p vapigen-0.12)
+ # parallel make fails in doc/api
+ use doc && MAKEOPTS=-j1
+}
+
+src_install() {
+ base_src_install
+
+ # Ensure config and profile directories exist and are writable
+ local d
+ for d in /var/lib/{color,colord}; do
+ keepdir "${d}"
+ fowners colord:colord "${d}"
+ done
+
+ # additional documentation files not included in tarball releases
+ [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*.c
+ fi
+
+ find "${D}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+ # <=colord-0.1.11 ran as root and used /var/lib/lib/colord to store
+ # configuration files and /var/lib/lib/color for custom color profiles.
+ local old_dir="${EROOT}var/lib/lib/colord"
+ local new_dir="${EROOT}var/lib/colord"
+
+ if [[ -e "${old_dir}/mapping.db" || -e "${old_dir}/storage.db" ]] && \
+ ! [[ -e "${new_dir}/mapping.db" || -e "${new_dir}/storage.db" ]]; then
+ elog "Old colord configuration files are present in ${old_dir}. If you"
+ elog "are upgrading from colord-0.1.11 or older and had previously"
+ elog "customized your color management settings, you will need to copy"
+ elog "these files to ${new_dir} and then change the file ownership"
+ elog "to colord:colord :"
+ elog
+ elog " # cp ${old_dir}/*.db ${new_dir}"
+ elog " # chown colord:colord ${new_dir}/*.db"
+ elog
+ fi
+ old_dir="${EROOT}var/lib/lib/color"
+ new_dir="${EROOT}var/lib/color"
+ if [[ -e "${old_dir}/icc" && ! -e "${new_dir}/icc" ]]; then
+ elog "Old custom color profiles are present in ${old_dir}. If you are"
+ elog "upgrading from colord-0.1.11 or older, you will need to copy them"
+ elog "to ${new_dir} and then change the ownership to colord:colord :"
+ elog
+ elog " # cp -r ${old_dir}/icc ${new_dir}"
+ elog " # chown -R colord:colord ${new_dir}/icc"
+ elog
+ fi
+}
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index e966c19..34b74ca 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-inherit base
+inherit eutils base
if [[ ${PV} = 9999 ]]; then
GCONF_DEBUG="no"
inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -59,12 +59,20 @@ RESTRICT="test"
DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+pkg_setup() {
+ enewgroup colord
+ enewuser colord -1 -1 /var/lib/colord colord
+}
+
src_configure() {
econf \
--disable-examples \
--disable-static \
--enable-polkit \
--enable-reverse \
+ --disable-volume-search \
+ --with-daemon-user=colord \
+ --localstatedir="${EPREFIX}"/var \
$(use_enable doc gtk-doc) \
$(use_enable introspection) \
$(use_enable scanner sane) \
@@ -77,6 +85,13 @@ src_configure() {
src_install() {
base_src_install
+ # Ensure config and profile directories exist and are writable
+ local d
+ for d in /var/lib/{color,colord}; do
+ keepdir "${d}"
+ fowners colord:colord "${d}"
+ done
+
# additional documentation files not included in tarball releases
[[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
@@ -87,3 +102,34 @@ src_install() {
find "${D}" -name "*.la" -delete || die
}
+
+pkg_postinst() {
+ # <=colord-0.1.11 ran as root and used /var/lib/lib/colord to store
+ # configuration files and /var/lib/lib/color for custom color profiles.
+ local old_dir="${EROOT}var/lib/lib/colord"
+ local new_dir="${EROOT}var/lib/colord"
+
+ if [[ -e "${old_dir}/mapping.db" || -e "${old_dir}/storage.db" ]] && \
+ ! [[ -e "${new_dir}/mapping.db" || -e "${new_dir}/storage.db" ]]; then
+ elog "Old colord configuration files are present in ${old_dir}. If you"
+ elog "are upgrading from colord-0.1.11 or older and had previously"
+ elog "customized your color management settings, you will need to copy"
+ elog "these files to ${new_dir} and then change the file ownership"
+ elog "to colord:colord :"
+ elog
+ elog " # cp ${old_dir}/*.db ${new_dir}"
+ elog " # chown colord:colord ${new_dir}/*.db"
+ elog
+ fi
+ old_dir="${EROOT}var/lib/lib/color"
+ new_dir="${EROOT}var/lib/color"
+ if [[ -e "${old_dir}/icc" && ! -e "${new_dir}/icc" ]]; then
+ elog "Old custom color profiles are present in ${old_dir}. If you are"
+ elog "upgrading from colord-0.1.11 or older, you will need to copy them"
+ elog "to ${new_dir} and then change the ownership to colord:colord :"
+ elog
+ elog " # cp -r ${old_dir}/icc ${new_dir}"
+ elog " # chown -R colord:colord ${new_dir}/icc"
+ elog
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-09-28 21:18 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-09-28 21:18 UTC (permalink / raw
To: gentoo-commits
commit: f1df12bdba796242143abbee4d9c88a45c2c984c
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 21:17:17 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 28 21:18:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f1df12bd
x11-imisc/colord: 0.1.12 is in gx86
---
x11-misc/colord/colord-0.1.12.ebuild | 135 ----------------------------------
1 files changed, 0 insertions(+), 135 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.12.ebuild b/x11-misc/colord/colord-0.1.12.ebuild
deleted file mode 100644
index 34b74ca..0000000
--- a/x11-misc/colord/colord-0.1.12.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils base
-if [[ ${PV} = 9999 ]]; then
- GCONF_DEBUG="no"
- inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
-fi
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://www.freedesktop.org/software/colord/"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://gitorious.org/colord/master.git"
-else
- SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
-IUSE="doc examples +introspection scanner +udev"
-
-# XXX: raise to libusb-1.0.9:1 when available
-COMMON_DEPEND="
- dev-db/sqlite:3
- >=dev-libs/glib-2.28.0:2
- >=dev-libs/libusb-1.0.8:1
- >=media-libs/lcms-2.2:2
- >=sys-auth/polkit-0.97
- introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
- scanner? ( media-gfx/sane-backends )
- udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
-"
-RDEPEND="${COMMON_DEPEND}
- media-gfx/shared-color-profiles"
-# XXX: automagic build-time vala dependency if USE=introspection
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-sgml-utils
- dev-libs/libxslt
- >=dev-util/intltool-0.35
- dev-util/pkgconfig
- >=sys-devel/gettext-0.17
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.9
- )
- introspection? ( dev-lang/vala:0.12 )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
-
-pkg_setup() {
- enewgroup colord
- enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_configure() {
- econf \
- --disable-examples \
- --disable-static \
- --enable-polkit \
- --enable-reverse \
- --disable-volume-search \
- --with-daemon-user=colord \
- --localstatedir="${EPREFIX}"/var \
- $(use_enable doc gtk-doc) \
- $(use_enable introspection) \
- $(use_enable scanner sane) \
- $(use_enable udev gudev) \
- VAPIGEN=$(type -p vapigen-0.12)
- # parallel make fails in doc/api
- use doc && MAKEOPTS=-j1
-}
-
-src_install() {
- base_src_install
-
- # Ensure config and profile directories exist and are writable
- local d
- for d in /var/lib/{color,colord}; do
- keepdir "${d}"
- fowners colord:colord "${d}"
- done
-
- # additional documentation files not included in tarball releases
- [[ ${PV} = 9999 ]] && use doc && dodoc doc/*.txt doc/*.svg
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/*.c
- fi
-
- find "${D}" -name "*.la" -delete || die
-}
-
-pkg_postinst() {
- # <=colord-0.1.11 ran as root and used /var/lib/lib/colord to store
- # configuration files and /var/lib/lib/color for custom color profiles.
- local old_dir="${EROOT}var/lib/lib/colord"
- local new_dir="${EROOT}var/lib/colord"
-
- if [[ -e "${old_dir}/mapping.db" || -e "${old_dir}/storage.db" ]] && \
- ! [[ -e "${new_dir}/mapping.db" || -e "${new_dir}/storage.db" ]]; then
- elog "Old colord configuration files are present in ${old_dir}. If you"
- elog "are upgrading from colord-0.1.11 or older and had previously"
- elog "customized your color management settings, you will need to copy"
- elog "these files to ${new_dir} and then change the file ownership"
- elog "to colord:colord :"
- elog
- elog " # cp ${old_dir}/*.db ${new_dir}"
- elog " # chown colord:colord ${new_dir}/*.db"
- elog
- fi
- old_dir="${EROOT}var/lib/lib/color"
- new_dir="${EROOT}var/lib/color"
- if [[ -e "${old_dir}/icc" && ! -e "${new_dir}/icc" ]]; then
- elog "Old custom color profiles are present in ${old_dir}. If you are"
- elog "upgrading from colord-0.1.11 or older, you will need to copy them"
- elog "to ${new_dir} and then change the ownership to colord:colord :"
- elog
- elog " # cp -r ${old_dir}/icc ${new_dir}"
- elog " # chown -R colord:colord ${new_dir}/icc"
- elog
- fi
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-10-05 17:14 Nirbheek Chauhan
0 siblings, 0 replies; 12+ messages in thread
From: Nirbheek Chauhan @ 2011-10-05 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 186519950f1173d2a9c397e80c52cbfb42b1deb9
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 15:43:26 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 17:14:06 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=18651995
x11-misc/colord: fix docbook-sgml-utils dependency
* Only needed when building from git
* Also call gnome2_src_prepare in src_prepare
---
x11-misc/colord/colord-0.1.13.ebuild | 2 +-
x11-misc/colord/colord-9999.ebuild | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.13.ebuild b/x11-misc/colord/colord-0.1.13.ebuild
index 3615593..8350c8a 100644
--- a/x11-misc/colord/colord-0.1.13.ebuild
+++ b/x11-misc/colord/colord-0.1.13.ebuild
@@ -41,7 +41,6 @@ RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
# Automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
- app-text/docbook-sgml-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
dev-util/pkgconfig
@@ -67,6 +66,7 @@ src_prepare() {
# Ubuntu patch to allow root and at_console to access colord without polkit;
# this behavior matches upstream default polkit settings.
epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
+ gnome2_src_prepare
}
src_configure() {
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 3615593..b4678b8 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -41,7 +41,6 @@ RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
# Automagic build-time vala dependency if USE=introspection
DEPEND="${COMMON_DEPEND}
- app-text/docbook-sgml-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
dev-util/pkgconfig
@@ -52,6 +51,11 @@ DEPEND="${COMMON_DEPEND}
)
introspection? ( dev-lang/vala:0.14 )
"
+if [[ ${PV} =~ 9999 ]]; then
+ # Needed for generating man pages, not needed for tarballs
+ DEPEND="${DEPEND}
+ app-text/docbook-sgml-utils"
+fi
# FIXME: needs pre-installed dbus service files
RESTRICT="test"
@@ -67,6 +71,7 @@ src_prepare() {
# Ubuntu patch to allow root and at_console to access colord without polkit;
# this behavior matches upstream default polkit settings.
epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
+ gnome2_src_prepare
}
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2011-10-05 17:59 Alexandre Restovtsev
0 siblings, 0 replies; 12+ messages in thread
From: Alexandre Restovtsev @ 2011-10-05 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 962718d8e8558d5fe6e14f22fa5a26a17e48174a
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct 5 17:57:32 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 5 17:57:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=962718d8
x11-misc/colord: only call gnome2_src_prepare for the live version
The non-live version of colord does not use gnome2.eclass
---
x11-misc/colord/colord-0.1.13.ebuild | 2 +-
x11-misc/colord/colord-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/colord/colord-0.1.13.ebuild b/x11-misc/colord/colord-0.1.13.ebuild
index 8350c8a..a9c689f 100644
--- a/x11-misc/colord/colord-0.1.13.ebuild
+++ b/x11-misc/colord/colord-0.1.13.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
# Ubuntu patch to allow root and at_console to access colord without polkit;
# this behavior matches upstream default polkit settings.
epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
- gnome2_src_prepare
+ [[ ${PV} = 9999 ]] && gnome2_src_prepare
}
src_configure() {
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index b4678b8..13bf3c8 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
# Ubuntu patch to allow root and at_console to access colord without polkit;
# this behavior matches upstream default polkit settings.
epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
- gnome2_src_prepare
+ [[ ${PV} = 9999 ]] && gnome2_src_prepare
}
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2012-11-05 7:51 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-05 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 0b7fd148ea80a1dfff3fb600fade9001c0aa0f58
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 07:51:06 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 07:51:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0b7fd148
x11-misc/colord: fix repoman warnings
And resync with gentoo-x86 and current policies.
---
x11-misc/colord/colord-9999.ebuild | 39 +++++++++++++++++------------------
x11-misc/colord/metadata.xml | 12 +++++++++++
2 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 336a914..eb03ee3 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -3,8 +3,10 @@
# $Header: $
EAPI="4"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
-inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs
+inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs vala
if [[ ${PV} = 9999 ]]; then
GCONF_DEBUG="no"
inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -23,40 +25,37 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
IUSE="doc examples +gusb +introspection 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
- gtk? (
- x11-libs/gdk-pixbuf:2[introspection?]
- x11-libs/gtk+:3[introspection?] )
gusb? ( >=dev-libs/libgusb-0.1.1 )
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
- udev? ( sys-fs/udev[gudev] )
+ udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND="${COMMON_DEPEND}
media-gfx/shared-color-profiles"
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
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.9
- )
- vala? ( dev-lang/vala:0.14[vapigen] )
+ doc? ( app-text/docbook-xml-dtd:4.1.2 )
+ vala? ( $(vala_depend) )
"
if [[ ${PV} =~ 9999 ]]; then
# Needed for generating man pages, not needed for tarballs
DEPEND="${DEPEND}
- app-text/docbook-sgml-utils"
+ app-text/docbook-sgml-utils
+ doc? ( >=dev-util/gtk-doc-1.9 )"
fi
# FIXME: needs pre-installed dbus service files
@@ -70,14 +69,14 @@ pkg_setup() {
}
src_prepare() {
+ # https://bugs.freedesktop.org/show_bug.cgi?id=55464
epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
+
+ # https://bugs.freedesktop.org/show_bug.cgi?id=55465
epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
- if [[ ${PV} = 9999 ]]; then
- gnome2_src_prepare
- else
- eautoreconf
- fi
+ eautoreconf
+ use vala && vala_src_prepare
}
src_configure() {
@@ -96,8 +95,8 @@ src_configure() {
$(use_enable scanner sane) \
$(use_enable udev gudev) \
$(use_enable vala) \
- "$(systemd_with_unitdir)" \
- VAPIGEN=$(type -P vapigen-0.14)
+ "$(systemd_with_unitdir)"
+
# parallel make fails in doc/api
use doc && MAKEOPTS="${MAKEOPTS} -j1"
}
@@ -121,5 +120,5 @@ src_install() {
doins examples/*.c
fi
- prune_libtool_files
+ prune_libtool_files --all
}
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
new file mode 100644
index 0000000..9840b90
--- /dev/null
+++ b/x11-misc/colord/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
+ colorimeter drivers</flag>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ <flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2014-02-12 23:48 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2014-02-12 23:48 UTC (permalink / raw
To: gentoo-commits
commit: e3c655600a41017fdf179cc3ff6fb33a66ad1d67
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:42:49 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:42:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3c65560
x11-misc/colord: sync with gentoo-x86
---
x11-misc/colord/colord-9999.ebuild | 55 +++++++++++++++++++++++---------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index eac06ce..ec57608 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,7 +6,7 @@ EAPI="5"
VALA_MIN_API_VERSION="0.18"
VALA_USE_DEPEND="vapigen"
-inherit autotools bash-completion-r1 check-reqs eutils user systemd base udev vala
+inherit bash-completion-r1 check-reqs eutils user systemd base udev vala
if [[ ${PV} = 9999 ]]; then
GCONF_DEBUG="no"
inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -22,41 +22,47 @@ fi
LICENSE="GPL-2+"
SLOT="0/1" # subslot = libcolord soname version
+IUSE="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
+REQUIRED_USE="
+ gusb? ( udev )
+ scanner? ( udev )
+ vala? ( introspection )
+"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
+ IUSE="${IUSE} doc"
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="doc examples extra-print-profiles +gusb +introspection 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=
+ >=dev-libs/glib-2.32.0:2
+ >=media-libs/lcms-2.5:2=
>=sys-auth/polkit-0.103
- gusb? ( >=dev-libs/libgusb-0.1.1 )
+ gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+ scanner? ( media-gfx/sane-backends )
systemd? ( >=sys-apps/systemd-44 )
udev? ( virtual/udev:=[gudev] )"
RDEPEND="${COMMON_DEPEND}
!media-gfx/shared-color-profiles"
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
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.9 )
extra-print-profiles? ( media-gfx/argyllcms )
vala? ( $(vala_depend) )
"
if [[ ${PV} =~ 9999 ]]; then
# Needed for generating man pages, not needed for tarballs
DEPEND="${DEPEND}
- >=dev-util/gtk-doc-am-1.9
- app-text/docbook-sgml-utils"
+ app-text/docbook-sgml-utils
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9 )"
fi
# FIXME: needs pre-installed dbus service files
@@ -78,41 +84,46 @@ pkg_setup() {
src_prepare() {
use vala && vala_src_prepare
-
- epatch "${FILESDIR}/${PN}-0.1.26-fix-automagic-systemd.patch"
- eautoreconf
}
src_configure() {
+ local myconf=""
+ [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
# Reverse tools require gusb
+ # bash-completion test does not work on gentoo
econf \
+ --disable-bash-completion \
--disable-examples \
+ --disable-gtk-doc \
--disable-static \
- --enable-polkit \
--disable-volume-search \
+ --enable-polkit \
--with-daemon-user=colord \
--localstatedir="${EPREFIX}"/var \
- $(use_enable doc gtk-doc) \
$(use_enable extra-print-profiles print-profiles) \
$(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \
$(use_enable gusb) \
$(use_enable gusb reverse) \
$(use_enable introspection) \
- $(use_enable systemd libsystemd-login) \
+ $(use_enable scanner sane) \
+ $(use_enable systemd systemd-login) \
$(use_enable udev gudev) \
--with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
$(use_enable vala) \
- "$(systemd_with_unitdir)"
+ "$(systemd_with_unitdir)" \
+ ${myconf}
- # parallel make fails in doc/api
- use doc && MAKEOPTS="${MAKEOPTS} -j1"
+ if [[ ${PV} = 9999 ]]; then
+ # parallel make fails in doc/api
+ use doc && MAKEOPTS="${MAKEOPTS} -j1"
+ fi
}
src_install() {
DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
default
- newbashcomp client/colormgr-completion.bash colormgr
+ newbashcomp data/colormgr colormgr
rm -vr "${ED}etc/bash_completion.d"
# Ensure config and profile directories exist and /var/lib/colord/*
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/
@ 2019-02-24 12:26 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-02-24 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 0a86a60b478f31b585276b61baebf6a19b4d540a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 12:22:36 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 12:22:36 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0a86a60b
x11-misc/colord: remove outdated live ebuild
Upstream uses meson now and it's hosted elsewhere than the ebuild had
as repo location.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
x11-misc/colord/colord-9999.ebuild | 152 -------------------------------------
x11-misc/colord/metadata.xml | 15 ----
2 files changed, 167 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
deleted file mode 100644
index ac125cb8..00000000
--- a/x11-misc/colord/colord-9999.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 user systemd udev vala
-if [[ ${PV} = 9999 ]]; then
- GCONF_DEBUG="no"
- inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
-fi
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://www.freedesktop.org/software/colord/"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://gitorious.org/colord/master.git"
-else
- SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-
-# 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 )
-"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- IUSE="${IUSE} doc"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-COMMON_DEPEND="
- dev-db/sqlite:3=
- >=dev-libs/glib-2.36:2
- >=media-libs/lcms-2.6:2=
- gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
- 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:=
- )
-"
-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
- extra-print-profiles? ( media-gfx/argyllcms )
- vala? ( $(vala_depend) )
-"
-if [[ ${PV} =~ 9999 ]]; then
- # Needed for generating man pages, not needed for tarballs
- DEPEND="${DEPEND}
- app-text/docbook-sgml-utils
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/gtk-doc-1.9 )"
-fi
-
-# 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
-}
-
-src_configure() {
- local myconf=""
- [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
- # Reverse tools require gusb
- # bash-completion test does not work on gentoo
- gnome2_src_configure \
- --disable-bash-completion \
- --disable-examples \
- --disable-static \
- --enable-libcolordcompat \
- --with-daemon-user=colord \
- --localstatedir="${EPREFIX}"/var \
- $(use_enable extra-print-profiles print-profiles) \
- $(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \
- $(use_enable gusb) \
- $(use_enable gusb reverse) \
- $(use_enable introspection) \
- $(use_enable policykit polkit) \
- $(use_enable scanner sane) \
- $(use_enable systemd systemd-login) \
- $(use_enable udev) \
- --with-udevrulesdir="$(get_udevdir)"/rules.d \
- $(use_enable vala) \
- "$(systemd_with_unitdir)" \
- ${myconf}
-
- if [[ ${PV} = 9999 ]]; then
- # parallel make fails in doc/api
- use doc && MAKEOPTS="${MAKEOPTS} -j1"
- fi
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
- gnome2_src_install
-
- newbashcomp data/colormgr colormgr
- rm -vr "${ED}etc/bash_completion.d"
-
- # 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
- insinto /usr/share/doc/${PF}/examples
- doins examples/*.c
- fi
-}
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
deleted file mode 100644
index 2ca10f47..00000000
--- a/x11-misc/colord/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="argyllcms">Enable ArgyllCMS sensor</flag>
- <flag name="extra-print-profiles">Generate extra print profiles.
- Warning: significant build time and memory requirements.</flag>
- <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
- colorimeter drivers</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-02-24 12:26 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12 4:39 [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2019-02-24 12:26 Mart Raudsepp
2014-02-12 23:48 Gilles Dartiguelongue
2012-11-05 7:51 Gilles Dartiguelongue
2011-10-05 17:59 Alexandre Restovtsev
2011-10-05 17:14 Nirbheek Chauhan
2011-09-28 21:18 Alexandre Restovtsev
2011-09-27 6:06 Alexandre Restovtsev
2011-08-10 1:33 Alexandre Restovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-06-14 6:36 Nirbheek Chauhan
2011-05-08 17:36 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox