[gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-color-manager/files/, gnome-extra/gnome-color-manager/

[Alexandre Restovtsev]

commit:     604f1c85bdb42773f323242916526e8a803d360f
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 08:09:17 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 08:28:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=604f1c85

gnome-extra/gnome-color-manager: 3.1.2 → 3.1.92

Version bump, update dependencies. Patches were applied upstream.

---
 .../gnome-color-manager-3.1.2-as-needed.patch      |   27 ---------------
 ...ome-color-manager-3.1.2-automagic-clutter.patch |   34 --------------------
 ....2.ebuild => gnome-color-manager-3.1.92.ebuild} |   15 +-------
 .../gnome-color-manager-9999.ebuild                |   15 ++-------
 4 files changed, 5 insertions(+), 86 deletions(-)

diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-as-needed.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-as-needed.patch
deleted file mode 100644
index 60e54b2..0000000
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-as-needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3a0683d6b4804f9cd4924713dcab8b80f5864354 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dominique-gnomezilla@×××××××××××.net>
-Date: Thu, 16 Jun 2011 12:55:00 +0000
-Subject: Fix linking with -Wl,--as-needed
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=652722
-
-Signed-off-by: Richard Hughes <richard@×××××××.com>
----
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 1edc90c..9621137 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -28,10 +28,10 @@ gcm_dump_profile_SOURCES =				\
- 	gcm-dump-profile.c
- 
- gcm_dump_profile_LDADD =				\
-+	$(top_builddir)/src/libgcmshared.a		\
- 	$(GLIB_LIBS)					\
- 	$(COLORD_LIBS)					\
- 	$(LCMS_LIBS)					\
--	$(top_builddir)/src/libgcmshared.a		\
- 	-lm
- 
- gcm_dump_profile_CFLAGS =				\
---
-cgit v0.9

diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-automagic-clutter.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-automagic-clutter.patch
deleted file mode 100644
index e0e8214..0000000
--- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.1.2-automagic-clutter.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 285fa89b030ac9f525d0283d10bbb7a6d4b2b6b2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@×××××.com>
-Date: Wed, 20 Jul 2011 05:31:55 -0400
-Subject: [PATCH] Make the clutter and mash dependency non-automagic (#654954)
-
-Ensure that there is a way of building gnome-color-manager without
-clutter and 3D support on a system that happens to have clutter-gtk
-and mash installed. (Gnome bug #654954)
----
- configure.ac |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee1760e..02ad961 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,13 @@ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2)
- PKG_CHECK_MODULES(X11, x11)
- PKG_CHECK_MODULES(COLORD, colord >= 0.1.9)
- 
--PKG_CHECK_MODULES(CLUTTER, clutter-gtk-1.0 mash-0.1, has_clutter=yes, has_clutter=no)
-+dnl **** Check for clutter ****
-+AC_ARG_ENABLE(clutter, AS_HELP_STRING([--enable-clutter],[Enable clutter for 3D support]), enable_clutter=$enableval, enable_clutter=yes)
-+if test x$enable_clutter != xno; then
-+	PKG_CHECK_MODULES(CLUTTER, clutter-gtk-1.0 mash-0.1, has_clutter=yes, has_clutter=no)
-+else
-+	has_clutter=no
-+fi
- AM_CONDITIONAL(HAVE_CLUTTER, test x$has_clutter = xyes)
- if test x$has_clutter = xyes; then
- 	AC_DEFINE(HAVE_CLUTTER,1,[has clutter support])
--- 
-1.7.6
-

diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.1.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.1.92.ebuild
similarity index 83%
rename from gnome-extra/gnome-color-manager/gnome-color-manager-3.1.2.ebuild
rename to gnome-extra/gnome-color-manager/gnome-color-manager-3.1.92.ebuild
index 572a261..82e6bf1 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.1.2.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.1.92.ebuild
@@ -35,11 +35,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	x11-libs/libXrandr
 	>=x11-libs/gtk+-2.91:3
 	>=x11-libs/vte-0.25.1:2.90
-	>=x11-misc/colord-0.1.9
+	>=x11-misc/colord-0.1.12
 
 	clutter? (
 		media-libs/clutter-gtk:1.0
-		media-libs/mash:0.1 )
+		media-libs/mash:0.2 )
 	packagekit? ( app-admin/packagekit-base )
 	raw? ( media-gfx/exiv2 )
 "
@@ -69,14 +69,3 @@ pkg_setup() {
 		$(use_enable packagekit)
 		$(use_enable raw exiv)"
 }
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654954
-	epatch "${FILESDIR}/${PN}-3.1.2-automagic-clutter.patch"
-
-	# Fix --as-needed support, will be in next release
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	[[ ${PV} = 9999 ]] || eautoreconf
-	gnome2_src_prepare
-}

diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
index 840c8cc..82e6bf1 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="clutter +introspection packagekit raw"
+IUSE="clutter packagekit raw"
 
 # FIXME: fix detection of docbook2man
 COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
@@ -35,12 +35,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	x11-libs/libXrandr
 	>=x11-libs/gtk+-2.91:3
 	>=x11-libs/vte-0.25.1:2.90
-	>=x11-misc/colord-0.1.9
+	>=x11-misc/colord-0.1.12
 
 	clutter? (
 		media-libs/clutter-gtk:1.0
-		media-libs/mash:0.1 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+		media-libs/mash:0.2 )
 	packagekit? ( app-admin/packagekit-base )
 	raw? ( media-gfx/exiv2 )
 "
@@ -70,11 +69,3 @@ pkg_setup() {
 		$(use_enable packagekit)
 		$(use_enable raw exiv)"
 }
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=654954
-	epatch "${FILESDIR}/${PN}-3.1.2-automagic-clutter.patch"
-
-	[[ ${PV} = 9999 ]] || eautoreconf
-	gnome2_src_prepare
-}