diff --git a/gnome/Makefile b/gnome/Makefile index 69945ac..a281f10 100644 --- a/gnome/Makefile +++ b/gnome/Makefile @@ -1,16 +1,16 @@ -# totem gst-inspect requires a machine id (generated by dbus). we -# don't have one yet because we are in a virgin chroot. fake one -preinstall: - mkdir -p "$(CHROOT)/var/lib/dbus" - echo 1234567890abcdef1234567890abcdef > \ - "$(CHROOT)"/var/lib/dbus/machine-id +preinstall: custom.conf dhclient.conf + mkdir -p "$(CHROOT)"/etc/dhcp + cp dhclient.conf "$(CHROOT)"/etc/dhcp/dhclient.conf + mkdir -p "$(CHROOT)"/etc/gdm + cp custom.conf "$(CHROOT)"/etc/gdm/custom.conf -postinstall: custom.conf gdm.start - $(RM) "$(CHROOT)"/var/lib/dbus/machine-id - cp custom.conf "$(CHROOT)"/etc/X11/gdm/custom.conf - ln -sf /etc/init.d/dbus "$(CHROOT)/etc/runlevels/default/dbus" - cp gdm.start "$(CHROOT)/etc/local.d/gdm.start" + +postinstall: + $(inroot) systemctl enable NetworkManager.service + $(inroot) systemctl enable gdm.service + $(inroot) systemctl enable avahi-daemon.service + $(inroot) ln -nsf /usr/lib/systemd/systemd /sbin/init clean: diff --git a/gnome/dhclient.conf b/gnome/dhclient.conf new file mode 100644 index 0000000..41769e5 --- /dev/null +++ b/gnome/dhclient.conf @@ -0,0 +1,34 @@ +send host-name = pick-first-value(gethostname(), "ISC-dhclient"); +#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; +#send dhcp-lease-time 3600; +#supersede domain-search "fugue.com", "home.vix.com"; +#prepend domain-name-servers 127.0.0.1; +#request subnet-mask, broadcast-address, time-offset, routers, +# domain-name, domain-name-servers, host-name; +#require subnet-mask, domain-name-servers; +#timeout 60; +#retry 60; +#reboot 10; +#select-timeout 5; +#initial-interval 2; +#media "-link0 -link1 -link2", "link0 link1"; +#reject 192.33.137.209; + +#alias { +# interface "ep0"; +# fixed-address 192.5.5.213; +# option subnet-mask 255.255.255.255; +#} + +#lease { +# interface "ep0"; +# fixed-address 192.33.137.200; +# medium "link0 link1"; +# option subnet-mask 255.255.255.0; +# option broadcast-address 192.33.137.255; +# option routers 192.33.137.250; +# option domain-name-servers 127.0.0.1; +# renew 2 2000/1/12 00:00:01; +# rebind 2 2000/1/12 00:00:01; +# expire 2 2000/1/12 00:00:01; +#} diff --git a/gnome/gdm.start b/gnome/gdm.start deleted file mode 100755 index df56f23..0000000 --- a/gnome/gdm.start +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# gdm.start: start gdm (duh) - -gdm &>/dev/null - diff --git a/gnome/make.conf b/gnome/make.conf new file mode 100644 index 0000000..fc159a9 --- /dev/null +++ b/gnome/make.conf @@ -0,0 +1,6 @@ +PYTHON_TARGETS="python2_7" +PYTHON_SINGLE_TARGET="python2_7" +USE="$USE introspection pulseaudio -openrc systemd" +RUBY_TARGETS=ruby20 +VIDEO_CARDS="" +APACHE2_MODULES="auth_digest authn_file authz_groupfile dav dav_fs" diff --git a/gnome/package.use b/gnome/package.use index 197d4f3..b9feb1a 100644 --- a/gnome/package.use +++ b/gnome/package.use @@ -4,40 +4,71 @@ sys-apps/hwids udev sys-apps/kmod openrc tools sys-apps/openrc netifrc sys-apps/portage python3 ipc +sys-apps/systemd gudev kmod sys-devel/gcc cxx nptl sys-fs/udev openrc sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal +virtual/udev gudev kmod # for gnome +app-crypt/gcr gtk vala +app-crypt/libsecret crypt # wtf? app-crypt/pinentry gtk app-text/enchant hunspell app-text/poppler cairo +dev-cpp/gtkmm X dev-db/sqlite extensions +dev-lang/vala vapigen +dev-libs/folks eds telepathy +dev-libs/gjs cairo +dev-libs/libpeas gtk dev-libs/libxml2 python dev-python/pygobject threads -gnome-base/gconf gtk +gnome-base/gconf gtk policykit +gnome-base/gnome extras gnome-base/gnome-menus python gnome-base/gnome-panel bonobo -gnome-base/gvfs cdda gdu udev -gnome-extra/evolution-data-server ssl weather +gnome-base/gnome-settings-daemon policykit udev +gnome-base/gvfs cdda gdu gtk http udev udisks +gnome-base/librsvg gtk +gnome-extra/evolution-data-server gnome-online-accounts ssl vala weather mail-client/evolution ssl -media-libs/libcanberra gtk +media-libs/clutter gtk +media-libs/cogl glib opengl pango +media-libs/gst-plugins-base X pango +media-libs/gst-plugins-base ogg theora vorbis +media-libs/harfbuzz glib icu truetype +media-libs/libcanberra gtk gtk3 media-libs/libtheora encode +media-libs/mesa gallium egl gles2 llvm nptl media-libs/swfdec gtk +media-sound/pulseaudio glib udev +net-dialup/ppp ipv6 +net-dns/avahi dbus net-libs/glib-networking ssl +net-libs/gtk-vnc gtk3 net-libs/libsoup gnome ssl +net-libs/telepathy-glib vala +net-libs/webkit-gtk gstreamer jit opengl webgl net-misc/curl ssl +net-misc/dhcp client +net-misc/networkmanager dhclient gnutls modemmanager ppp +net-misc/vino avahi zlib net-print/cups dbus gnutls sys-apps/dbus X sys-apps/hwids udev +sys-apps/systemd policykit sys-auth/consolekit policykit sys-auth/pambase consolekit sys-block/parted device-mapper sys-fs/udev gudev hwdb sys-power/upower deprecated virtual/udev gudev hwdb -x11-libs/cairo glib svg X +x11-apps/xinit minimal +x11-base/xorg-server minimal nptl +x11-libs/cairo glib svg X opengl x11-libs/gdk-pixbuf X jpeg x11-libs/gtk+ jpeg X x11-libs/pango X +x11-themes/gnome-themes-standard gtk