From 786e056cc3a418bf209f768a71e5dd34f42d0780 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 23 Oct 2017 10:56:54 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                                 |  2 ++
 config-archive/etc/conf.d/modules          | 28 ++++++++++++++++++++++
 config-archive/etc/conf.d/modules.dist.new | 27 +++++++++++++++++++++
 portage/package.use                        |  2 ++
 4 files changed, 59 insertions(+)
 create mode 100644 config-archive/etc/conf.d/modules
 create mode 100644 config-archive/etc/conf.d/modules.dist.new

diff --git a/.etckeeper b/.etckeeper
index 07e54fb..d9577a6 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -177,6 +177,8 @@ maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include.dist
 maybe chmod 0755 'config-archive/etc/conf.d'
 maybe chmod 0644 'config-archive/etc/conf.d/apache2'
 maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist.new'
+maybe chmod 0644 'config-archive/etc/conf.d/modules'
+maybe chmod 0644 'config-archive/etc/conf.d/modules.dist.new'
 maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.6'
 maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.6.dist.new'
 maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster'
diff --git a/config-archive/etc/conf.d/modules b/config-archive/etc/conf.d/modules
new file mode 100644
index 0000000..dd86739
--- /dev/null
+++ b/config-archive/etc/conf.d/modules
@@ -0,0 +1,28 @@
+# Linux users can define a list of modules for a specific kernel version,
+# a released kernel version, a main kernel version or all kernel versions.
+# The most specific versioned variable will take precedence.
+# FreeBSD users can only use the modules="foo bar" setting.
+#modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#modules_2_6_23="tun ieee1394"
+#modules_2_6="tun"
+#modules_2="ipv6"
+#modules="ohci1394"
+modules="9p"
+
+# Linux users can give modules a different name when they load - the new name
+# will also be used to pick arguments below.
+# This is not supported on FreeBSD.
+#modules="dummy:dummy1"
+
+# Linux users can give the modules some arguments if needed, per version
+# if necessary.
+# Again, the most specific versioned variable will take precedence.
+# This is not supported on FreeBSD.
+#module_ieee1394_args="debug"
+#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
+#module_ieee1394_args_2_6_23="debug3"
+#module_ieee1394_args_2_6="debug4"
+#module_ieee1394_args_2="debug5"
+
+# You should consult your kernel documentation and configuration
+# for a list of modules and their options.
diff --git a/config-archive/etc/conf.d/modules.dist.new b/config-archive/etc/conf.d/modules.dist.new
new file mode 100644
index 0000000..c35b9ed
--- /dev/null
+++ b/config-archive/etc/conf.d/modules.dist.new
@@ -0,0 +1,27 @@
+# Linux users can define a list of modules for a specific kernel version,
+# a released kernel version, a main kernel version or all kernel versions.
+# The most specific versioned variable will take precedence.
+# FreeBSD users can only use the modules="foo bar" setting.
+#modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
+#modules_2_6_23="tun ieee1394"
+#modules_2_6="tun"
+#modules_2="ipv6"
+#modules="ohci1394"
+
+# Linux users can give modules a different name when they load - the new name
+# will also be used to pick arguments below.
+# This is not supported on FreeBSD.
+#modules="dummy:dummy1"
+
+# Linux users can give the modules some arguments if needed, per version
+# if necessary.
+# Again, the most specific versioned variable will take precedence.
+# This is not supported on FreeBSD.
+#module_ieee1394_args="debug"
+#module_ieee1394_args_2_6_23_gentoo_r5="debug2"
+#module_ieee1394_args_2_6_23="debug3"
+#module_ieee1394_args_2_6="debug4"
+#module_ieee1394_args_2="debug5"
+
+# You should consult your kernel documentation and configuration
+# for a list of modules and their options.
diff --git a/portage/package.use b/portage/package.use
index b50acb8..90527b8 100644
--- a/portage/package.use
+++ b/portage/package.use
@@ -66,6 +66,8 @@ dev-vcs/subversion              -dso extras
 mail-client/mutt		gpgme nntp sidebar smime
 mail-client/nail		net
 
+media-libs/openjpeg		-static-libs
+
 net-analyzer/pb-nagios-plugins  perl
 net-analyzer/wireshark		adns gcrypt geoip profile smi
 
-- 
2.39.5