From: Frank Brehm Date: Mon, 8 Aug 2016 15:42:26 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=d7d84234e56db69bed4f37395c47fdd73ac9e5ab;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index 1440d91d..411f102d 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,20 +1,12 @@ # Subscription configuration file for CUPS v2.1.3 -# Written by cupsd on 2016-08-07 15:15 +# Written by cupsd on 2016-08-08 15:19 NextSubscriptionId 291 - -Events printer-changed -Owner root -LeaseDuration 86400 -Interval 60 -ExpirationTime 1470662118 -NextEventId 1 - Events all Owner anonymous Recipient dbus:// LeaseDuration 86400 Interval 0 -ExpirationTime 1470662118 +ExpirationTime 1470748459 NextEventId 1 diff --git a/portage/package.keywords b/portage/package.keywords index 2fcf91f9..bdbc1c26 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -53,6 +53,7 @@ app-misc/ddate ~dev-db/sqlite-3.8.5 ~dev-db/sqlite-3.9.2 +~dev-db/sqlite-3.13.0 ~dev-db/virtuoso-odbc-6.1.4 ~dev-db/virtuoso-server-6.1.4 @@ -93,6 +94,7 @@ app-misc/ddate ~dev-libs/nss-3.19.1 ~dev-libs/nss-3.22.2 ~dev-libs/nss-3.23 +~dev-libs/nss-3.25 ~dev-libs/sgml-data-2.0.8 ~dev-libs/xml-core-0.13_p2 diff --git a/portage/package.mask b/portage/package.mask index b8a4eaba..7e1fc089 100644 --- a/portage/package.mask +++ b/portage/package.mask @@ -11,6 +11,9 @@ =media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3 +#=media-libs/phonon-4.9.0 +#=media-libs/phonon-gstreamer-4.9.0 + =media-video/mplayer-1.2_pre20150214 =www-client/google-chrome-39.0.2171.99_p1 diff --git a/portage/package.unmask b/portage/package.unmask index 7076ad17..237abaab 100644 --- a/portage/package.unmask +++ b/portage/package.unmask @@ -1,15 +1,23 @@ ~x11-wm/mate-window-manager-1.6.2