From 8b0275b6443eab620adff05bc7652c53984977d5 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Tue, 1 Oct 2013 21:27:26 +0200
Subject: [PATCH] gnu: Revert inputs from gtk+-3 to gtk+-2.

* gnu/packages/cdrom.scm (dvdisaster): Replace input gtk+ by gtk+-2.
* gnu/packages/emacs.scm (emacs): Replace input gtk+ by gtk+-2.
* gnu/packages/geeqie.scm (geeqie): Replace input gtk+ by gtk+-2.
* gnu/packages/gkrellm.scm (gkrellm): Replace input gtk+ by gtk+-2.
* gnu/packages/mp3.scm (ripperx): Replace input gtk+ by gtk+-2.
* gnu/packages/scheme.scm: Drop duplicate inclusion of module gtk.
---
 gnu/packages/cdrom.scm   | 2 +-
 gnu/packages/emacs.scm   | 2 +-
 gnu/packages/geeqie.scm  | 2 +-
 gnu/packages/gkrellm.scm | 2 +-
 gnu/packages/mp3.scm     | 2 +-
 gnu/packages/scheme.scm  | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 92fd7282be..e207ae65d6 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -160,7 +160,7 @@ reconstruction capability.")
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gnu:gettext)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("pkg-config" ,pkg-config)
        ("which" ,which)))
     (arguments
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e517dc85e1..8554cc3f01 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -72,7 +72,7 @@
 
        ;; TODO: Add the optional dependencies.
        ("xlibs" ,libx11)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("libXft" ,libxft)
        ("libtiff" ,libtiff)
        ;; ("libungif" ,libungif)
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 54b3a05c3f..9f182e95be 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -76,7 +76,7 @@ and XMP metadata of images in various formats.")
        ("lcms" ,lcms)
        ("exiv2" ,exiv2)
        ("libpng" ,libpng)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("pkg-config" ,pkg-config)))
     (home-page "http://geeqie.sourceforge.net")
     (synopsis "Lightweight GTK+ based image viewer")
diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm
index b57ab3212a..f53b4fc891 100644
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@@ -43,7 +43,7 @@
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gnu:gettext)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("libice" ,libice)
        ("libsm" ,libsm)))
     (native-inputs
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index ee7f938e45..2d103b9d8d 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -250,7 +250,7 @@ use with CD-recording software).")
    (inputs
     `(("patch/libm" ,(search-patch "ripperx-libm.patch"))
       ("glib" ,glib)
-      ("gtk+" ,gtk+)
+      ("gtk+" ,gtk+-2)
       ("id3lib" ,id3lib)
       ("pkg-config" ,pkg-config)))
    (arguments
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index b7df902136..1351e1a4bb 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -35,7 +35,6 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libjpeg)
-  #:use-module ((gnu packages gtk) #:select (cairo pango))
   #:use-module (ice-9 match))
 
 (define-public mit-scheme