From: frank Date: Mon, 16 Jan 2012 22:35:06 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=df14f92688602b3ce9a4e0f8ac4af97cdf3f6fb3;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/make.conf b/make.conf index 6863b53f..13bbc161 100644 --- a/make.conf +++ b/make.conf @@ -57,14 +57,14 @@ LINGUAS="de en en_GB en_US ru vi" # These are the USE flags that were used in addition to what is provided by the # profile used for building. USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards - amr ao apache2 aqua archive audiofile avahi bash-completion bazaar branding bzip2 cairo + amr ao apache2 archive audiofile avahi bash-completion bazaar branding bzip2 cairo calendar caps cdda cddb cdparanoia cdr cgi cpudetection cscope css ctype cups curl curlwrappers cvs dbase dbus dga djvu doc dts dv dvb dvd dvdr dvdread eds examples encode exif expat fam fastcgi ffmpeg fftw fits flac flatfile fltk fontconfig foomaticdb ftp gconf gd gd-external ggi gif gimp git glade glib gmp gnome gnome-keyring gnustep gnutls gphoto2 graphviz gsl gsm gstreamer gtk gtk3 gtkhtml handbook hal hscolour html iconv icu id3 id3tag idea idn ieee1394 imagemagick imap imlib inifile ithreads java javascript - jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kerberos + jabber jack java6 jbig jikes jingle jpeg jpeg2k json-syck json-xs kde kdeenablefinal kdeprefix kerberos keyring kig-scripting kpathsea lame latex lcms ldap libnotify libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo mad meanwhile mercurial mhash mmx mmxext mng modperl modplug motif mp3 mp4 mpeg mplayer msn mtp @@ -73,14 +73,14 @@ USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altnburgcards perlsuid plasma plotutils png policykit posix ppds projectm pulseaudio python quicktime real rdesktop rle samba sasl sdl semantic-desktop session sharedmem sid simplexml sip skype slang slp sndfile soap sockets sox spamassassin speex spell sqlite sqlite3 srtp sse sse2 ssh - subversion svg sysvipc tetex theora thumbnail tidy timidity tiff + subversion svg sysvipc tetex theora threads thumbnail tidy timidity tiff tools truetype twolame udev unicode usb v4l v4l2 vcd vidix video vim-syntax vorbis wav wavpack wddx webdav webkit win32codecs wma wmf x264 xattr xcomposite xface xft xine xinetd xml xmlrpc xmp xosd xpm xprint xscreensaver xsl xulrunner xvid yahoo yaz yv12 zeroconf zlib " -# apache2 avahi darcs kate kde kdeenablefinal kdeprefix kerberos php qt3 qt4 sasl skey threads +# apache2 aqua avahi darcs kate kde kdeenablefinal kdeprefix kerberos php qt3 qt4 sasl skey threads #USE="3dnow 3dnowext X Xaw3d a52 aac aalib acl acpi ads aim alsa altenburgcards # amr ao apache2 aqua archive audiofile avahi bash-completion bazaar branding bzip2 cairo diff --git a/portage/package.keywords b/portage/package.keywords index ef19d464..5dca56fe 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -1,9 +1,13 @@ dev-python/fbrehm-libs -dev-vcs/rcs-fast-export ** +dev-vcs/rcs-fast-export ** ~dev-ruby/dnsruby-1.53 ~dev-ruby/zonecheck-3.0.4 ~sys-apps/etckeeper-0.58 + +~x11-plugins/wmcalendar-0.5.2 +~x11-plugins/wmmixer-1.5 ** + diff --git a/portage/package.use b/portage/package.use index dc597580..8caead5c 100644 --- a/portage/package.use +++ b/portage/package.use @@ -74,7 +74,8 @@ dev-perl/Template-Toolkit latex dev-python/ipython gnuplot smp wxwidgets dev-python/jinja -doc i18n dev-python/pyopenssl -doc -dev-python/PyQt4 assistant declarative multimedia phonon qt3support sql webkit xmlpatterns +#dev-python/PyQt4 assistant declarative multimedia phonon qt3support sql webkit xmlpatterns +dev-python/PyQt4 assistant declarative multimedia qt3support sql webkit xmlpatterns dev-ruby/rubygems server @@ -266,7 +267,7 @@ www-client/elinks finger gopher -ruby www-client/firefox mozdevelop system-sqlite wifi xforms www-client/opera -qt3 -www-servers/apache sni suexec +www-servers/apache sni suexec -threads x11-apps/desktopnova gnome xfce x11-apps/xdpyinfo dmx @@ -278,7 +279,7 @@ x11-base/xorg-x11 -doc x11-libs/cairo glitz x11-libs/qt glib pch qt3support x11-libs/qt-core optimized-qmake -x11-libs/qt-qt3support phonon +#x11-libs/qt-qt3support phonon x11-misc/google-gadgets soup x11-misc/xscreensaver insecure-savers offensive