gnu: Merge (gnu packages xnee) into (gnu packages xdisorg).

The xnee module has only one package definition. Since this is a simple
X11-related application, it should be on xdisorg module.

* gnu/packages/xnee.scm (xnee): Migrate from here...
* gnu/packages/xdisorg.scm: ...to here

* gnu/local.mk: Remove reference to xnee.
* gnu/packages/xnee.scm: Remove file.
* po/packages/POTFILES.in: Remove reference to xnee.

Change-Id: I1128d3db412fab366b6d4c508128b86ee3d7b26b
Reviewed-by: Nicolas Graves <ngraves@ngraves.fr>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

4 files changed, 34 insertions, 62 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index e303fed9d4e..3f7fbdfb071 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -709,7 +709,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/xfig.scm				\
   %D%/packages/xiph.scm				\
   %D%/packages/xml.scm				\
-  %D%/packages/xnee.scm				\
   %D%/packages/xdisorg.scm			\
   %D%/packages/xorg.scm				\
   %D%/packages/xfce.scm				\
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d07cc7cae7c..095e0ecaf19 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
@@ -175,6 +175,39 @@
 
 ;; packages outside the x.org system proper
 
+(define-public xnee
+  (package
+    (name "xnee")
+    (version "3.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnu/xnee/xnee-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("CFLAGS=-O2 -g -fcommon")
+       #:make-flags '("LIBSEMA=-lpthread")))
+    (inputs
+     (list gtk+-2
+           libx11
+           libxext
+           libxi
+           libxtst
+           xorgproto))
+    (native-inputs
+     (list pkg-config))
+    (home-page "https://www.gnu.org/software/xnee/")
+    (synopsis "Record, replay and distribute user actions under X11")
+    (description
+     "GNU Xnee is a program that can record, replay and distribute user
+actions in X11.  It can be used to automate user interactions for testing or
+demonstration purposes.")
+    (license license:gpl3+)))
+
 (define-public xtitle
   (package
     (name "xtitle")
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
deleted file mode 100644
index 05a4daeeb6f..00000000000
--- a/gnu/packages/xnee.scm
+++ /dev/null
@@ -1,59 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages xnee)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages xorg))
-
-(define-public xnee
-  (package
-    (name "xnee")
-    (version "3.19")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://gnu/xnee/xnee-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("CFLAGS=-O2 -g -fcommon")
-       #:make-flags '("LIBSEMA=-lpthread")))
-    (inputs
-     (list gtk+-2
-           libx11
-           libxext
-           libxi
-           libxtst
-           xorgproto))
-    (native-inputs
-      (list pkg-config))
-    (home-page "https://www.gnu.org/software/xnee/")
-    (synopsis "Record, replay and distribute user actions under X11")
-    (description
-     "GNU Xnee is a program that can record, replay and distribute user
-actions in X11.  It can be used to automate user interactions for testing or
-demonstration purposes.")
-    (license gpl3+)))
diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in
index 316a6fd9e61..5150264d913 100644
--- a/po/packages/POTFILES.in
+++ b/po/packages/POTFILES.in
@@ -575,5 +575,4 @@ gnu/packages/fluidplug.scm
 gnu/packages/oyacc.scm
 gnu/packages/wxwidgets.scm
 gnu/packages/xfig.scm
-gnu/packages/xnee.scm
 gnu/packages/xorg.scm