From dcb311d0379e1b7f9cbee820700d13c7116071fc Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 2 Jun 2018 00:05:48 +0200
Subject: [PATCH] fix

---
 packages_gnome.txt   | 62 ++++++++++++++++-----------------
 packages_libre.txt   | 81 +++++++++++++++-----------------------------
 packages_manjaro.txt | 58 +++++++++++++++----------------
 packages_xfce4.txt   | 48 +++++++++++++-------------
 4 files changed, 111 insertions(+), 138 deletions(-)

diff --git a/packages_gnome.txt b/packages_gnome.txt
index 9b710ad..45db383 100644
--- a/packages_gnome.txt
+++ b/packages_gnome.txt
@@ -17,18 +17,18 @@ appstream-glib
 apr
 apr-util
 arc-gtk-theme
+arc-icon-theme
 arch-install-scripts
 archlinux-appstream-data
 archlinux-keyring
-arc-icon-theme
 argon2
 aspell
+at-spi2-atk
+at-spi2-core
 atk
 atkmm
 atom
 atomix
-at-spi2-atk
-at-spi2-core
 attr
 audacious
 audacious-plugins
@@ -175,8 +175,8 @@ freerdp
 freetype2
 frei0r-plugins
 fribidi
-fuse2
 fuse-common
+fuse2
 galculator-gtk2
 gamin
 garcon
@@ -207,11 +207,11 @@ gimp
 git
 gjs
 glew
+glib-networking
 glib2
 glib2-docs
 glibc
 glibmm
-glib-networking
 glu
 gmime3
 gmp
@@ -305,18 +305,18 @@ gst-plugins-base-libs
 gst-plugins-good
 gst-plugins-ugly
 gstreamer
-gtk2
-gtk3
 gtk-doc
 gtk-engine-murrine
+gtk-update-icon-cache
+gtk-vnc
+gtk-xfce-engine
+gtk2
+gtk3
 gtkmm
 gtkmm3
 gtksourceview3
 gtkspell
 gtkspell3
-gtk-update-icon-cache
-gtk-vnc
-gtk-xfce-engine
 gts
 gufw
 guile
@@ -380,8 +380,8 @@ jre8-openjdk
 jre8-openjdk-headless
 js52
 json-c
-jsoncpp
 json-glib
+jsoncpp
 jsonrpc-glib
 kauth
 kbd
@@ -503,8 +503,8 @@ libdvbpsi
 libdvdcss
 libdvdnav
 libdvdread
-libebml
 libe-book
+libebml
 libedit
 libelf
 libepoxy
@@ -732,10 +732,10 @@ libytnef
 libzapojit
 libzmf
 licenses
+light-locker
 lightdm
 lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
-light-locker
 lightsoff
 links
 linux
@@ -793,21 +793,21 @@ nbd
 ncurses
 ndctl
 neon
+net-snmp
 netbeans
 netcf
 netctl
-net-snmp
 nettle
-networkmanager
 network-manager-applet
+networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nfsidmap
 nfs-utils
-nmap
+nfsidmap
 nm-connection-editor
+nmap
 noto-fonts
 noto-fonts-extra
 npth
@@ -835,8 +835,8 @@ opus
 orage
 orc
 orca
-osinfo-db
 os-prober
+osinfo-db
 ostree
 p11-kit
 p7zip
@@ -901,14 +901,11 @@ pulseaudio
 pulseaudio-alsa
 pulseaudio-bluetooth
 pulseaudio-zeroconf
-pygobject2-devel
 pygobject-devel
+pygobject2-devel
 pygtk
 pyqt5-common
 python
-python2
-python2-cairo
-python2-gobject2
 python-anytree
 python-appdirs
 python-astroid
@@ -958,8 +955,8 @@ python-sip
 python-six
 python-snowballstemmer
 python-sphinx
-python-sphinx_rtd_theme
 python-sphinx-alabaster-theme
+python-sphinx_rtd_theme
 python-sphinxcontrib-websupport
 python-sqlalchemy
 python-systemd
@@ -970,16 +967,19 @@ python-whoosh
 python-wrapt
 python-xdg
 python-yaml
+python2
+python2-cairo
+python2-gobject2
 qemu
 qpdf
 qpdfview
 qqwing
 qrencode
 qt5-base
-qt5ct
 qt5-styleplugins
 qt5-svg
 qt5-x11extras
+qt5ct
 quadrapassel
 raptor
 rasqal
@@ -995,15 +995,16 @@ rtmpdump
 ruby
 ruby-dbus
 ruby-ffi
-rubygems
 ruby-maruku
 ruby-rb-inotify
 ruby-rdoc
 ruby-sass
 ruby-sass-listen
 ruby-yard
+rubygems
 run-parts
 rygel
+s-nail
 samba
 sane
 sbc
@@ -1020,7 +1021,6 @@ simple-scan
 sip
 slang
 smbclient
-s-nail
 snappy
 sound-theme-freedesktop
 soundtouch
@@ -1117,8 +1117,8 @@ virtualbox-host-modules-arch
 vlc
 volume_key
 vpnc
-vte3
 vte-common
+vte3
 vulkan-icd-loader
 wavpack
 wayland
@@ -1129,8 +1129,8 @@ wget
 which
 whois
 wildmidi
-wireless_tools
 wireless-regdb
+wireless_tools
 wireshark-gtk
 woff2
 wpa_supplicant
@@ -1197,14 +1197,13 @@ xfwm4-themes
 xkeyboard-config
 xmlsec
 xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
 xorg-font-util
 xorg-font-utils
+xorg-fonts-alias
+xorg-fonts-encodings
 xorg-iceauth
 xorg-mkfontdir
 xorg-mkfontscale
-xorgproto
 xorg-server
 xorg-server-common
 xorg-server-xwayland
@@ -1219,6 +1218,7 @@ xorg-xmodmap
 xorg-xrandr
 xorg-xrdb
 xorg-xset
+xorgproto
 xvidcore
 xz
 yajl
diff --git a/packages_libre.txt b/packages_libre.txt
index a42e6af..6755cc0 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -14,17 +14,17 @@ appstream-glib
 apr
 apr-util
 arc-gtk-theme
+arc-icon-theme
 arch-install-scripts
+archlinux-keyring
 archlinux32-keyring
 archlinuxarm-keyring
-archlinux-keyring
-arc-icon-theme
 argon2
 aspell
-atk
-atkmm
 at-spi2-atk
 at-spi2-core
+atk
+atkmm
 attr
 audacious
 audacious-plugins
@@ -122,8 +122,8 @@ foomatic-db-engine
 freeglut
 freetype2
 fribidi
-fuse2
 fuse-common
+fuse2
 galculator-gtk2
 gamin
 garcon
@@ -145,10 +145,10 @@ giflib
 gimp
 git
 glew
+glib-networking
 glib2
 glibc
 glibmm
-glib-networking
 glu
 gmp
 gnome-icon-theme
@@ -180,15 +180,15 @@ gst-plugins-base-libs
 gst-plugins-good
 gst-plugins-ugly
 gstreamer
+gtk-engine-murrine
+gtk-update-icon-cache
+gtk-xfce-engine
 gtk2
 gtk3
-gtk-engine-murrine
 gtkmm
 gtkmm3
 gtksourceview3
 gtkspell
-gtk-update-icon-cache
-gtk-xfce-engine
 gufw
 guile
 gvfs
@@ -242,8 +242,8 @@ jre8-openjdk
 jre8-openjdk-headless
 js52
 json-c
-jsoncpp
 json-glib
+jsoncpp
 kauth
 kbd
 kcoreaddons
@@ -354,8 +354,8 @@ libdvbpsi
 libdvdcss
 libdvdnav
 libdvdread
-libebml
 libe-book
+libebml
 libedit
 libelf
 libepoxy
@@ -550,10 +550,10 @@ libxxf86vm
 libyaml
 libzmf
 licenses
+light-locker
 lightdm
 lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
-light-locker
 links
 linux-headers
 linux-libre
@@ -597,19 +597,19 @@ nbd
 ncurses
 ndctl
 neon
-netctl
 net-snmp
+netctl
 nettle
-networkmanager
 network-manager-applet
+networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nfsidmap
 nfs-utils
-nmap
+nfsidmap
 nm-connection-editor
+nmap
 noto-fonts
 noto-fonts-extra
 npth
@@ -698,14 +698,11 @@ pulseaudio
 pulseaudio-alsa
 pulseaudio-bluetooth
 pulseaudio-zeroconf
-pygobject2-devel
 pygobject-devel
+pygobject2-devel
 pygtk
 pyqt5-common
 python
-python2
-python2-cairo
-python2-gobject2
 python-appdirs
 python-cairo
 python-dbus
@@ -730,14 +727,17 @@ python-six
 python-systemd
 python-xdg
 python-yaml
+python2
+python2-cairo
+python2-gobject2
 qpdf
 qpdfview
 qrencode
 qt5-base
-qt5ct
 qt5-styleplugins
 qt5-svg
 qt5-x11extras
+qt5ct
 raptor
 rasqal
 readline
@@ -750,6 +750,7 @@ rsync
 rtkit
 rtmpdump
 run-parts
+s-nail
 samba
 sbc
 screen
@@ -762,7 +763,6 @@ shared-mime-info
 sip
 slang
 smbclient
-s-nail
 sound-theme-freedesktop
 soundtouch
 spandsp
@@ -826,8 +826,8 @@ viewnior
 vlc
 volume_key
 vpnc
-vte3
 vte-common
+vte3
 vulkan-icd-loader
 wavpack
 wayland
@@ -838,8 +838,8 @@ wget
 which
 whois
 wildmidi
-wireless_tools
 wireless-regdb
+wireless_tools
 wireshark-gtk
 woff2
 wpa_supplicant
@@ -903,14 +903,13 @@ xfwm4-themes
 xkeyboard-config
 xmlsec
 xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
 xorg-font-util
 xorg-font-utils
+xorg-fonts-alias
+xorg-fonts-encodings
 xorg-iceauth
 xorg-mkfontdir
 xorg-mkfontscale
-xorgproto
 xorg-server
 xorg-server-common
 xorg-setxkbmap
@@ -923,6 +922,7 @@ xorg-xmodmap
 xorg-xrandr
 xorg-xrdb
 xorg-xset
+xorgproto
 xvidcore
 xz
 yelp
@@ -937,30 +937,3 @@ zlib
 zsh
 zstd
 zvbi
-lib32-libxxf86vm
-libxxf86misc
-libxxf86vm
-xf86-input-elographics
-xf86-input-evdev
-xf86-input-keyboard
-xf86-input-libinput
-xf86-input-mouse
-xf86-input-void
-packages_gnome.txt:lib32-libxxf86vm
-packages_gnome.txt:libxxf86misc
-packages_gnome.txt:libxxf86vm
-packages_gnome.txt:xf86-input-elographics
-packages_gnome.txt:xf86-input-evdev
-packages_gnome.txt:xf86-input-keyboard
-packages_gnome.txt:xf86-input-libinput
-packages_gnome.txt:xf86-input-mouse
-packages_gnome.txt:xf86-input-void
-packages_xfce4.txt:lib32-libxxf86vm
-packages_xfce4.txt:libxxf86misc
-packages_xfce4.txt:libxxf86vm
-packages_xfce4.txt:xf86-input-elographics
-packages_xfce4.txt:xf86-input-evdev
-packages_xfce4.txt:xf86-input-keyboard
-packages_xfce4.txt:xf86-input-libinput
-packages_xfce4.txt:xf86-input-mouse
-packages_xfce4.txt:xf86-input-void
diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index 8facd92..e8ed81d 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -15,16 +15,16 @@ appstream-glib
 apr
 apr-util
 arc-gtk-theme
+arc-icon-theme
 archlinux-appstream-data
 archlinux-keyring
-arc-icon-theme
 argon2
 aspell
+at-spi2-atk
+at-spi2-core
 atk
 atkmm
 atom
-at-spi2-atk
-at-spi2-core
 attica
 attr
 audacious
@@ -124,8 +124,8 @@ foomatic-db-engine
 freeglut
 freetype2
 fribidi
-fuse2
 fuse-common
+fuse2
 fzf
 galculator-gtk2
 gamin
@@ -147,10 +147,10 @@ giflib
 gimp
 git
 glew
+glib-networking
 glib2
 glibc
 glibmm
-glib-networking
 glu
 gmp
 gnome-icon-theme
@@ -184,16 +184,16 @@ gst-plugins-base-libs
 gst-plugins-good
 gst-plugins-ugly
 gstreamer
+gtk-engine-murrine
+gtk-theme-breath
+gtk-update-icon-cache
+gtk-xfce-engine
 gtk2
 gtk3
-gtk-engine-murrine
 gtkmm
 gtkmm3
 gtksourceview3
 gtkspell
-gtk-theme-breath
-gtk-update-icon-cache
-gtk-xfce-engine
 gufw
 guile
 gvfs
@@ -383,8 +383,8 @@ libdvbpsi
 libdvdcss
 libdvdnav
 libdvdread
-libebml
 libe-book
+libebml
 libedit
 libelf
 libepoxy
@@ -573,14 +573,14 @@ libxxf86vm
 libyaml
 libzmf
 licenses
+light-locker
 lightdm
 lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
-light-locker
-linux414
-linux414-virtualbox-guest-modules
 linux-api-headers
 linux-firmware
+linux414
+linux414-virtualbox-guest-modules
 llvm-libs
 lm_sensors
 logrotate
@@ -595,6 +595,7 @@ m4
 mailcap
 make
 man-db
+man-pages
 manjaro-alsa
 manjaro-architect
 manjaro-architect-launcher
@@ -617,7 +618,6 @@ manjaro-system
 manjaro-tools-base
 manjaro-wallpapers-17.0
 manjaro-xfce-settings
-man-pages
 mdadm
 media-player-info
 memtest86+
@@ -654,20 +654,20 @@ nano
 nbd
 ncurses
 neon
-netbeans
 net-snmp
+netbeans
 nettle
-networkmanager
 network-manager-applet
+networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nfsidmap
 nfs-utils
+nfsidmap
 nilfs-utils
-nmap
 nm-connection-editor
+nmap
 noto-fonts
 noto-fonts-extra
 npth
@@ -754,14 +754,11 @@ pulseaudio-alsa
 pulseaudio-bluetooth
 pulseaudio-ctl
 pulseaudio-zeroconf
-pygobject2-devel
 pygobject-devel
+pygobject2-devel
 pygtk
 pyqt5-common
 python
-python2
-python2-cairo
-python2-gobject2
 python-appdirs
 python-cairo
 python-dbus
@@ -780,19 +777,21 @@ python-psutil
 python-ptyprocess
 python-pyparsing
 python-pyqt5
-pythonqt
 python-reportlab
 python-setuptools
 python-sip
 python-six
 python-xdg
 python-yaml
+python2
+python2-cairo
+python2-gobject2
+pythonqt
 qemu
 qpdf
 qpdfview
 qrencode
 qt5-base
-qt5ct
 qt5-declarative
 qt5-location
 qt5-multimedia
@@ -805,6 +804,7 @@ qt5-webchannel
 qt5-webkit
 qt5-x11extras
 qt5-xmlpatterns
+qt5ct
 raptor
 rasqal
 readline
@@ -816,6 +816,7 @@ rsync
 rtkit
 rtmpdump
 run-parts
+s-nail
 samba
 sbc
 sdl
@@ -828,7 +829,6 @@ sip
 slang
 smartmontools
 smbclient
-s-nail
 solid
 sonnet
 sound-theme-freedesktop
@@ -903,8 +903,8 @@ virtualbox-guest-utils
 vlc
 volume_key
 vpnc
-vte3
 vte-common
+vte3
 vulkan-icd-loader
 wavpack
 wayland
@@ -980,14 +980,13 @@ xfwm4-themes
 xkeyboard-config
 xmlsec
 xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
 xorg-font-util
 xorg-font-utils
+xorg-fonts-alias
+xorg-fonts-encodings
 xorg-iceauth
 xorg-mkfontdir
 xorg-mkfontscale
-xorgproto
 xorg-server
 xorg-server-common
 xorg-setxkbmap
@@ -1001,6 +1000,7 @@ xorg-xmodmap
 xorg-xrandr
 xorg-xrdb
 xorg-xset
+xorgproto
 xvidcore
 xz
 yaml-cpp
diff --git a/packages_xfce4.txt b/packages_xfce4.txt
index e51f097..0b19c23 100644
--- a/packages_xfce4.txt
+++ b/packages_xfce4.txt
@@ -15,16 +15,16 @@ appstream-glib
 apr
 apr-util
 arc-gtk-theme
+arc-icon-theme
 archlinux-appstream-data
 archlinux-keyring
-arc-icon-theme
 argon2
 aspell
+at-spi2-atk
+at-spi2-core
 atk
 atkmm
 atom
-at-spi2-atk
-at-spi2-core
 attr
 audacious
 audacious-plugins
@@ -118,8 +118,8 @@ foomatic-db-engine
 freeglut
 freetype2
 fribidi
-fuse2
 fuse-common
+fuse2
 galculator-gtk2
 gamin
 garcon
@@ -140,10 +140,10 @@ giflib
 gimp
 git
 glew
+glib-networking
 glib2
 glibc
 glibmm
-glib-networking
 glu
 gmp
 gnome-icon-theme
@@ -174,15 +174,15 @@ gst-plugins-base-libs
 gst-plugins-good
 gst-plugins-ugly
 gstreamer
+gtk-engine-murrine
+gtk-update-icon-cache
+gtk-xfce-engine
 gtk2
 gtk3
-gtk-engine-murrine
 gtkmm
 gtkmm3
 gtksourceview3
 gtkspell
-gtk-update-icon-cache
-gtk-xfce-engine
 gufw
 guile
 gvfs
@@ -348,8 +348,8 @@ libdvbpsi
 libdvdcss
 libdvdnav
 libdvdread
-libebml
 libe-book
+libebml
 libedit
 libelf
 libepoxy
@@ -537,10 +537,10 @@ libxxf86vm
 libyaml
 libzmf
 licenses
+light-locker
 lightdm
 lightdm-gtk-greeter
 lightdm-gtk-greeter-settings
-light-locker
 linux-api-headers
 linux-firmware
 linux-headers
@@ -579,19 +579,19 @@ mumble
 nano
 ncurses
 neon
-netbeans
 net-snmp
+netbeans
 nettle
-networkmanager
 network-manager-applet
+networkmanager
 networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
-nfsidmap
 nfs-utils
-nmap
+nfsidmap
 nm-connection-editor
+nmap
 noto-fonts
 noto-fonts-extra
 npth
@@ -674,14 +674,11 @@ pulseaudio
 pulseaudio-alsa
 pulseaudio-bluetooth
 pulseaudio-zeroconf
-pygobject2-devel
 pygobject-devel
+pygobject2-devel
 pygtk
 pyqt5-common
 python
-python2
-python2-cairo
-python2-gobject2
 python-appdirs
 python-cairo
 python-dbus
@@ -704,15 +701,18 @@ python-sip
 python-six
 python-xdg
 python-yaml
+python2
+python2-cairo
+python2-gobject2
 qemu
 qpdf
 qpdfview
 qrencode
 qt5-base
-qt5ct
 qt5-styleplugins
 qt5-svg
 qt5-x11extras
+qt5ct
 raptor
 rasqal
 readline
@@ -724,6 +724,7 @@ rsync
 rtkit
 rtmpdump
 run-parts
+s-nail
 samba
 sbc
 sdl
@@ -735,7 +736,6 @@ shared-mime-info
 sip
 slang
 smbclient
-s-nail
 sound-theme-freedesktop
 soundtouch
 spandsp
@@ -804,8 +804,8 @@ virtualbox-host-modules-arch
 vlc
 volume_key
 vpnc
-vte3
 vte-common
+vte3
 vulkan-icd-loader
 wavpack
 wayland
@@ -879,14 +879,13 @@ xfwm4-themes
 xkeyboard-config
 xmlsec
 xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
 xorg-font-util
 xorg-font-utils
+xorg-fonts-alias
+xorg-fonts-encodings
 xorg-iceauth
 xorg-mkfontdir
 xorg-mkfontscale
-xorgproto
 xorg-server
 xorg-server-common
 xorg-setxkbmap
@@ -899,6 +898,7 @@ xorg-xmodmap
 xorg-xrandr
 xorg-xrdb
 xorg-xset
+xorgproto
 xvidcore
 xz
 yelp