From b94a6ca074f00b3f769933d074853d3c3ca50d00 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sun, 25 Sep 2016 10:33:02 +0300
Subject: gnu: Add and use gettext-minimal.

* gnu/packages/gettext.scm (gnu-gettext): Rename to...
(gettext-minimal): ... this.  Adjust synopsis and description.
(gnu-gettext): Inherit from it.
(po4a): Use 'gettext-minimal' instead of 'gnu-gettext'.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/apl.scm: Likewise.
* gnu/packages/attr.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/commencement.scm: Likewise.
* gnu/packages/crypto.scm: Likewise.
* gnu/packages/databases.scm: Likewise.
* gnu/packages/disk.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/education.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/enlightenment.scm: Likewise.
* gnu/packages/fcitx.scm: Likewise.
* gnu/packages/fontutils.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gkrellm.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/ibus.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/iso-codes.scm: Likewise.
* gnu/packages/kde-frameworks.scm: Likewise.
* gnu/packages/kodi.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/man.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mono.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/nano.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/package-management.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/sawfish.scm: Likewise.
* gnu/packages/statistics.scm: Likewise.
* gnu/packages/terminals.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/webkit.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wine.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
---
 gnu/packages/gettext.scm | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/gettext.scm')

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1ad1ce84ec..a5767ddedf 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -31,16 +31,9 @@
   #:use-module (gnu packages tex)
   #:use-module (gnu packages xml))
 
-;; Use that name to avoid clashes with Guile's 'gettext' procedure.
-;;
-;; We used to resort to #:renamer on the user side, but that prevented
-;; circular dependencies involving (gnu packages gettext).  This is because
-;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
-;; module when there's a #:renamer, and that module may be empty at that point
-;; in case or circular dependencies.
-(define-public gnu-gettext
+(define-public gettext-minimal
   (package
-    (name "gettext")
+    (name "gettext-minimal")
     (version "0.19.8.1")
     (source (origin
              (method url-fetch)
@@ -90,15 +83,28 @@
        ;; When tests fail, we want to know the details.
        #:make-flags '("VERBOSE=yes")))
     (home-page "http://www.gnu.org/software/gettext/")
-    (synopsis "Tools and documentation for translation")
+    (synopsis
+     "Tools and documentation for translation (used to build other packages)")
     (description
      "GNU Gettext is a package providing a framework for translating the
 textual output of programs into multiple languages.  It provides translators
-with the means to create message catalogs, as well as an Emacs mode to work
-with them, and a runtime library to load translated messages from the
-catalogs.  Nearly all GNU packages use Gettext.")
+with the means to create message catalogs, and a runtime library to load
+translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
     (license gpl3+)))                             ;some files are under GPLv2+
 
+;; Use that name to avoid clashes with Guile's 'gettext' procedure.
+;;
+;; We used to resort to #:renamer on the user side, but that prevented
+;; circular dependencies involving (gnu packages gettext).  This is because
+;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
+;; module when there's a #:renamer, and that module may be empty at that point
+;; in case or circular dependencies.
+(define-public gnu-gettext
+  (package
+    (inherit gettext-minimal)
+    (name "gettext")
+    (synopsis "Tools and documentation for translation")))
+
 (define-public po4a
   (package
     (name "po4a")
@@ -140,7 +146,7 @@ catalogs.  Nearly all GNU packages use Gettext.")
                         (find-files bin "\\.*$"))
               #t))))))
     (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
        ("perl-module-build" ,perl-module-build)
        ("docbook-xsl" ,docbook-xsl)
        ("docbook-xml" ,docbook-xml) ;for tests
-- 
cgit v1.2.3