From 3c332f9875aa3bb5a8a56720efe16cbfbd784f24 Mon Sep 17 00:00:00 2001 From: hasufell Date: Thu, 24 Sep 2015 12:57:06 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- paludis/use.conf | 2 +- paludis/use.conf.d/desktop.conf | 4 ++++ paludis/use.conf.d/development.conf | 3 +++ paludis/use.conf.d/python.conf | 6 ------ paludis/use.conf.d/testing.conf | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 paludis/use.conf.d/python.conf diff --git a/paludis/use.conf b/paludis/use.conf index c200943..ca2dde5 100644 --- a/paludis/use.conf +++ b/paludis/use.conf @@ -1,7 +1,7 @@ # use.conf */* cups qt3support -libav -qt5 qt4 -gnutls a52 aac acpi alsa apng bash-completion cairo cdr consolekit cscope css dbus dri dv dvd dvdr exif fat ffmpeg flac fontconfig gif -gnome-keyring gpm gstreamer hddtemp icq icu ipv6 jabber jpeg jpeg2k lame libressl libnotify lm_sensors matroska mmx mp3 mp4 mpeg musepack nsplugin ntfs ogg opengl oscar pdf png profile policykit python raw sdl sound sse sse2 ssse3 svg tcpd tiff timidity truetype threads udev unicode usb v4l vcd vdpau vim-syntax vnc vorbis wavpack wayland win32codecs wmf x264 xv xvmc xvid X */* ABI_X86: 32 64 -*/* CURL_SSL: -* -polarssl openssl +*/* CURL_SSL: -* openssl */* INPUT_DEVICES: -* evdev keyboard mouse joystick */* LIBREOFFICE_EXTENSIONS: -* pdfimport presenter-console presenter-minimizer */* LINGUAS: -* en de diff --git a/paludis/use.conf.d/desktop.conf b/paludis/use.conf.d/desktop.conf index a1b815f..a945390 100644 --- a/paludis/use.conf.d/desktop.conf +++ b/paludis/use.conf.d/desktop.conf @@ -89,3 +89,7 @@ media-libs/libvpx postproc app-text/ghostscript-gpl gtk + + +media-gfx/blender PYTHON_SINGLE_TARGET: -* python3_4 +net-irc/hexchat PYTHON_SINGLE_TARGET: -* python3_3 diff --git a/paludis/use.conf.d/development.conf b/paludis/use.conf.d/development.conf index 359a40e..1759a27 100644 --- a/paludis/use.conf.d/development.conf +++ b/paludis/use.conf.d/development.conf @@ -15,6 +15,7 @@ dev-util/anjuta devhelp doc dev-util/netbeans debug doc dev-vcs/git gtk tk dev-vcs/mercurial tk gpg +dev-vcs/git-cola PYTHON_SINGLE_TARGET: -* python3_4 # for wxmaxima sci-visualization/gnuplot wxwidgets @@ -27,3 +28,5 @@ dev-embedded/arduino doc examples dev-util/nemiver memoryview +app-editors/vim PYTHON_TARGETS: -* python2_7 +app-editors/gvim PYTHON_TARGETS: -* python2_7 diff --git a/paludis/use.conf.d/python.conf b/paludis/use.conf.d/python.conf deleted file mode 100644 index f4e56ce..0000000 --- a/paludis/use.conf.d/python.conf +++ /dev/null @@ -1,6 +0,0 @@ -media-gfx/blender PYTHON_SINGLE_TARGET: -* python3_4 -net-irc/hexchat PYTHON_SINGLE_TARGET: -* python3_3 -dev-vcs/git-cola PYTHON_SINGLE_TARGET: -* python3_3 -app-editors/vim PYTHON_TARGETS: -* python2_7 -app-editors/gvim PYTHON_TARGETS: -* python2_7 -#sys-apps/paludis PYTHON_SINGLE_TARGET: -* python3_3 diff --git a/paludis/use.conf.d/testing.conf b/paludis/use.conf.d/testing.conf index d023020..ff4f4ec 100644 --- a/paludis/use.conf.d/testing.conf +++ b/paludis/use.conf.d/testing.conf @@ -33,6 +33,6 @@ net-irc/znc PYTHON_SINGLE_TARGET: -* python3_4 # libressl -app-admin/rsyslog rfc5424hmac -net-misc/curl CURL_SSL: -* libressl -net-nds/openldap smbkrb5passwd ssl +#app-admin/rsyslog rfc5424hmac +#net-misc/curl CURL_SSL: -* libressl +#net-nds/openldap smbkrb5passwd ssl