From 0768c64905eaa0210a4ca16e92d772d8ae8464c3 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 8 May 2018 00:19:08 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 2 ++ .../etc/portage/package.accept_keywords/mariadb | 10 ++++++++++ .../etc/portage/package.accept_keywords/mariadb.dist | 11 +++++++++++ portage/make.conf | 1 + portage/package.accept_keywords/mariadb | 3 ++- portage/package.use | 11 ++++++----- 6 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 config-archive/etc/portage/package.accept_keywords/mariadb create mode 100644 config-archive/etc/portage/package.accept_keywords/mariadb.dist diff --git a/.etckeeper b/.etckeeper index ce580105..c55523c5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -821,6 +821,8 @@ maybe chmod 0644 'config-archive/etc/portage/make.conf.dist' maybe chmod 0755 'config-archive/etc/portage/package.accept_keywords' maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/common' maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/common.dist' +maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/mariadb' +maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/mariadb.dist' maybe chmod 0644 'config-archive/etc/portage/package.keywords' maybe chmod 0644 'config-archive/etc/portage/package.keywords.dist' maybe chmod 0644 'config-archive/etc/portage/package.use' diff --git a/config-archive/etc/portage/package.accept_keywords/mariadb b/config-archive/etc/portage/package.accept_keywords/mariadb new file mode 100644 index 00000000..6f7fe939 --- /dev/null +++ b/config-archive/etc/portage/package.accept_keywords/mariadb @@ -0,0 +1,10 @@ + +~app-text/groonga-6.1.2 +~app-text/groonga-normalizer-mysql-1.1.1 + +~dev-db/mariadb-10.1.22 +~dev-db/mariadb-10.1.23 +~dev-db/xtrabackup-bin-2.4.6 + +~dev-libs/libgcrypt-1.5.6 + diff --git a/config-archive/etc/portage/package.accept_keywords/mariadb.dist b/config-archive/etc/portage/package.accept_keywords/mariadb.dist new file mode 100644 index 00000000..1f4ca56a --- /dev/null +++ b/config-archive/etc/portage/package.accept_keywords/mariadb.dist @@ -0,0 +1,11 @@ + +~app-text/groonga-6.1.2 +~app-text/groonga-normalizer-mysql-1.1.1 + +~dev-db/mariadb-10.1.22 +~dev-db/mariadb-10.1.23 +# move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin +~dev-db/percona-xtrabackup-bin-2.4.6 + +~dev-libs/libgcrypt-1.5.6 + diff --git a/portage/make.conf b/portage/make.conf index a03b3ee1..63170794 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -134,6 +134,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer nlpsolver \ # scripting-beanshell wiki-publisher #CURL_SSL="nss" +#CURL_SSL="openssl" PHP_TARGETS="php5-6 php7-0" diff --git a/portage/package.accept_keywords/mariadb b/portage/package.accept_keywords/mariadb index 6f7fe939..1f4ca56a 100644 --- a/portage/package.accept_keywords/mariadb +++ b/portage/package.accept_keywords/mariadb @@ -4,7 +4,8 @@ ~dev-db/mariadb-10.1.22 ~dev-db/mariadb-10.1.23 -~dev-db/xtrabackup-bin-2.4.6 +# move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin +~dev-db/percona-xtrabackup-bin-2.4.6 ~dev-libs/libgcrypt-1.5.6 diff --git a/portage/package.use b/portage/package.use index e6dd489e..7a503fae 100644 --- a/portage/package.use +++ b/portage/package.use @@ -99,6 +99,7 @@ dev-libs/geoip city perl-geoipupdate dev-libs/glib utils dev-libs/libburn track-src-odirect dev-libs/libgcrypt idea static-libs +dev-libs/libgit2 -curl dev-libs/liblogging rfc3195 dev-libs/libmateweather gtk3 -python dev-libs/libpcre libedit pcre16 pcre32 -readline @@ -377,15 +378,13 @@ net-libs/libvncserver gcrypt gnutls net-libs/telepathy-qt farstream net-libs/xulrunner system-sqlite wifi -# net-misc/curl curl_ssl_nss libssh2 -net-misc/curl libssh2 +net-misc/curl curl_ssl_nss libssh2 +# net-misc/curl -curl_ssl_nss curl_ssl_openssl libssh2 net-misc/ike nat net-misc/iputils arping caps clockdiff gnutls rarpd rdisc tftpd tracepath net-misc/networkmanager -dhclient dhcpcd nss net-misc/ntp parse-clocks -zeroconf net-misc/openssh -X509 sftplogging -# move net-misc/openvpn net-vpn/openvpn -net-vpn/openvpn down-root eurephia iproute2 passwordsave socks net-misc/rdesktop rdpusb net-misc/spice-gtk gstaudio gstvideo mjpeg python_single_target_python2_7 -python_single_target_python3_4 -pulseaudio usbredir net-misc/tigervnc gnutls @@ -397,7 +396,9 @@ net-nds/openldap cxx experimental -minimal overlays syslog net-print/cups pclm -usb net-print/hplip cupsddk fax hpijs new-hpcups parport scanner -net-vpn/openvpn inotify +# move net-misc/openvpn net-vpn/openvpn +net-vpn/openvpn down-root eurephia inotify iproute2 passwordsave socks +#net-vpn/openvpn inotify net-wireless/bluez user-session net-wireless/wpa_supplicant -qt4 wps -- 2.39.5