summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/gnome-color-manager')
-rw-r--r--gnome-extra/gnome-color-manager/ChangeLog9
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild79
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild (renamed from gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild)46
3 files changed, 28 insertions, 106 deletions
diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog
index 7c3481551062..4931dec487e4 100644
--- a/gnome-extra/gnome-color-manager/ChangeLog
+++ b/gnome-extra/gnome-color-manager/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/gnome-color-manager
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.23 2012/12/11 14:09:43 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.24 2012/12/24 18:17:54 eva Exp $
+
+*gnome-color-manager-3.6.0 (24 Dec 2012)
+
+ 24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+ -gnome-color-manager-3.2.3.ebuild, -gnome-color-manager-3.2.4.ebuild,
+ +gnome-color-manager-3.6.0.ebuild:
+ Version bump for Gnome 3.6. Clean up old revisions.
11 Dec 2012; Ian Stakenvicius <axs@gentoo.org>
gnome-color-manager-2.32.0.ebuild:
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild
deleted file mode 100644
index d64a20c05948..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clutter packagekit raw"
-
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-
- >=media-libs/lcms-2.2:2
- >=media-libs/libcanberra-0.10[gtk3]
- media-libs/libexif
- media-libs/tiff
-
- x11-libs/libX11
- x11-libs/libXrandr
- >=x11-libs/gtk+-2.91:3
- >=x11-libs/vte-0.25.1:2.90
- >=x11-misc/colord-0.1.12
-
- clutter? (
- media-libs/clutter-gtk:1.0
- media-libs/mash:0.2 )
- packagekit? ( app-admin/packagekit-base )
- raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${COMMON_DEPEND}
- media-gfx/shared-color-profiles
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-sgml-utils
- app-text/gnome-doc-utils
- dev-libs/libxslt
- >=dev-util/intltool-0.35
-"
-
-# FIXME: run test-suite with files on live file-system
-RESTRICT="test"
-
-pkg_setup() {
- # Always enable tests since they are check_PROGRAMS anyway
- G2CONF="${G2CONF}
- --disable-static
- --disable-schemas-compile
- --disable-scrollkeeper
- --enable-tests
- $(use_enable clutter)
- $(use_enable packagekit)
- $(use_enable raw exiv)"
-}
-
-src_prepare() {
- # argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
- # https://bugzilla.gnome.org/show_bug.cgi?id=672028
- epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
-
- gnome2_src_prepare
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- elog "If you want to do display or scanner calibration, you will need to"
- elog "install media-gfx/argyllcms"
-}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
index 5c89d4ae6997..9943c4e4d9b9 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
@@ -1,24 +1,25 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.2.4.ebuild,v 1.2 2012/05/21 19:02:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild,v 1.1 2012/12/24 18:17:54 eva Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="Color profile manager for the GNOME desktop"
HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="clutter packagekit raw"
-# FIXME: fix detection of docbook2man
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+COMMON_DEPEND="
+ >=dev-libs/glib-2.31.10:2
+ gnome-base/gnome-desktop:3=
>=media-libs/lcms-2.2:2
>=media-libs/libcanberra-0.10[gtk3]
media-libs/libexif
@@ -26,24 +27,23 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
x11-libs/libX11
x11-libs/libXrandr
- >=x11-libs/gtk+-2.91:3
+ >=x11-libs/gtk+-3.3.8:3
>=x11-libs/vte-0.25.1:2.90
- >=x11-misc/colord-0.1.12
+ >=x11-libs/colord-gtk-0.1.20
clutter? (
+ >=media-libs/clutter-1.9.11:1.0
media-libs/clutter-gtk:1.0
media-libs/mash:0.2 )
packagekit? ( app-admin/packagekit-base )
raw? ( media-gfx/exiv2 )
"
RDEPEND="${COMMON_DEPEND}
- media-gfx/shared-color-profiles
-"
+ media-gfx/shared-color-profiles"
# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
DEPEND="${COMMON_DEPEND}
app-text/docbook-sgml-dtd:4.1
app-text/docbook-sgml-utils
- app-text/gnome-doc-utils
dev-libs/libxslt
>=dev-util/intltool-0.35
virtual/pkgconfig
@@ -52,29 +52,23 @@ DEPEND="${COMMON_DEPEND}
# FIXME: run test-suite with files on live file-system
RESTRICT="test"
-pkg_setup() {
+src_configure() {
# Always enable tests since they are check_PROGRAMS anyway
G2CONF="${G2CONF}
--disable-static
- --disable-schemas-compile
- --disable-scrollkeeper
--enable-tests
$(use_enable clutter)
$(use_enable packagekit)
- $(use_enable raw exiv)"
-}
-
-src_prepare() {
- # argyllcms executables are prefixed with "argyll-" in Gentoo; bug #407319,
- # https://bugzilla.gnome.org/show_bug.cgi?id=672028
- epatch "${FILESDIR}/${PN}-3.2.2-argyll-prefix.patch"
-
- gnome2_src_prepare
+ $(use_enable raw exiv)
+ ITSTOOL=$(type -P true)"
+ gnome2_src_configure
}
pkg_postinst() {
gnome2_pkg_postinst
- elog "If you want to do display or scanner calibration, you will need to"
- elog "install media-gfx/argyllcms"
+ if ! has_version media-gfx/argyllcms ; then
+ elog "If you want to do display or scanner calibration, you will need to"
+ elog "install media-gfx/argyllcms"
+ fi
}