Replace dialout with uucp group in udev rules, bug 463376.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 411 insertions, 26 deletions

diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 6adfd4cd28b4..2cffaf59a5f4 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.209 2014/01/19 12:01:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.210 2014/01/20 22:53:07 floppym Exp $
+
+*systemd-208-r3 (20 Jan 2014)
+
+  20 Jan 2014; Mike Gilbert <floppym@gentoo.org> +systemd-208-r3.ebuild,
+  systemd-208-r2.ebuild, systemd-9999.ebuild:
+  Replace dialout with uucp group in udev rules, bug 463376.
 
   19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> systemd-208-r2.ebuild:
   Add ~sparc, wrt bug #478076
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 590a836745b9..6bd9fc9d4a57 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 204-0001-polkit-Avoid-race-condition-in-scraping-proc.patch 3781 SHA256 74652f48fac07aab87278a4a4c1c73335c94909e390d4b42181004466102141e SHA512 8fa85d1d35360a2eec1eb16924080fe0abe63851ca1ec1f7dcaadfe0794d6d2ea05a46fc357053acfb8b4fbe0594af49924b6843e02500b90df163b4dfc87347 WHIRLPOOL 77665b0a9c2ce56c7b6294f9695474dfb0ac56944f4166c0a9ef83a8c3bd12b21e02e3c4f3079abecd168f4e7631f3643b495cded29e9aaa0154ef4017008784
 AUX 204-0002-Add-usr-share-keymaps-to-localectl-supported-locatio.patch 996 SHA256 7c5593ccd8d6324f2ed6a21fc572c2a4604d6ba5e5a76ce1da6a294dcd0d19b1 SHA512 6879d7363c142736911009964b49631181ef9eccb39ffbef27e41c7a3fc20e167dc59c5be6cd500b80394a3aafc9e28b86fcb6d29dc23569386ca642a3730c80 WHIRLPOOL 646e7db9954f8d0e451df4c15686847c858161eb6d9e0e9906b42c53c77bc194beb619ac98717b074f6f88b0f7c9a2bdce7a07e538a194cb90f0ee5fe158987b
@@ -16,24 +16,15 @@ DIST systemd-204.tar.xz 2186264 SHA256 072c393503c7c1e55ca7acf3db659cbd28c7fe5fa
 DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
 DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417
 EBUILD systemd-204-r1.ebuild 10452 SHA256 3454b43f0e7d1676bbde2b0e8d46d6a35b0a690de6a6a95854be9cc695cb042b SHA512 26fbb8ccc54e6af15b35ece361c2dd31279782563d977240f977997ea0adf72d9557d54dc0302be3107493c8471345a976061c2e26279b88d0d602e9c45c4610 WHIRLPOOL 8398bde7b79315cd2a3eaecdaa80a66ec3693930674078aa9bff16c032a811f3d489fc996d9e213035e3cd14dffb6da0abb493bac4d6c5467fe80c172a74ffdd
-EBUILD systemd-208-r2.ebuild 11047 SHA256 576e5ba89eaa917128bda1568d56813bf27d6e9772f5c91b2ff1f95f4497a704 SHA512 2b4dede3c51cad2cef4d5fad5f017ee55ee0a71af119e347c9bf1d2d55f09cbb491a0f599bd58145528d9a01ab7db1d5451943289f8d66e91d3ad3cd736a2c97 WHIRLPOOL 0db769c245bdc961a34f14ee995e93fd01587497564bbb2f805c943ea8c5bca32e9b9c3ff681b464e6d48fa159040b1481b46238b3911822bca3787e6ab2e252
-EBUILD systemd-9999.ebuild 11469 SHA256 d9e5eb77fe29630502394dbcb2fa544de333ea7d6ddd813268607a3fa53a76cb SHA512 e1a7c6afbddee536205288585b9b6f0f577043ed50fae7f8966298df241aff0dfee3ceadab6dd5614b05ecde75f53de3a2377a6d94355cf4817d479f0e044a27 WHIRLPOOL 98611f729c9523f9d05bb36beee79e3a02c789ae89aeeed84485c73bdf9b52ec94d944ebe221e1bf058611f693b80f62ca931b92c4c7542b08ed2fcf3d126dcb
-MISC ChangeLog 39896 SHA256 057babe428d0e3a1f15eccb71df8f7d4ade49dfad9f26a0d9f47121af54d1ba3 SHA512 64f2ad93e1f9c952a528c91dba27c45a35495491956cdefe8fdb5d4874aedb6d61d258178912af6c77cb222daa13ece958f8fa3d144fce8b74e4413bb34da0da WHIRLPOOL 8833e1103e01ebef55a972687664301b3442444e93b56df8ebe981e46053f850a257a784f1afc55a69b44e5303088813ce115eba2db34668ea76fd8a9cbd0e89
+EBUILD systemd-208-r2.ebuild 11094 SHA256 d5300c3f3ea803db6cbbc3ec9b38dcd0afa2d4038a807b32ace5663e5d5fa5eb SHA512 0bf803952b01d061af309e36253e581dd452499285f99500289e89519886f6ea36cd1551550ec2eb6608dad1ec845611ece95e441b334f3fb740792da7d150c7 WHIRLPOOL 60a36c730848efa74fd1c247d514b511f7348bd4237135a045d67954e6f66da4512b4a9091470486e91bba2b6d5b7b622b313e6bc1b16dd31c8e3777ffdf95aa
+EBUILD systemd-208-r3.ebuild 11096 SHA256 eb0dd9a1dd103fbe583153403086899aa061526a2f6fccab534b8722a6f5edc1 SHA512 d5c4591690ada3a768293bc518a7f690a00da9b0fdaeda7ec135a0bffdbd72cb530d259f2b156c401cfad0586cd9965fb48d4b3cfd1f53e00ce63691515eb720 WHIRLPOOL aba7d175530d0eb397a121b3fe5676ca5ea27efeac65f7d71ec9e9cc5d227199eaec8559c91d7f73bd1bd17d6aaf2ab970d35f8222da2a0582938aedddc6c7c6
+EBUILD systemd-9999.ebuild 11514 SHA256 f31baed2641575a72603ff8125f55509d4a05d8b14c46e526ceb50dfa5231775 SHA512 ac850aeba0f9266b7df80ceb7c32b8de521cbd72d0cc94c2d1d6a36da79cae80df623c1ee16886919ec12a755a4cfe9a6a3fd020174e11fa15bb09e16f9d396f WHIRLPOOL 8bf8f846c4dece8df5c5a38f0175552d76e81961356953b2bc2c62d42fc9efebc637e6ea70b7005cb31d2512d7d0d37a9993c2ed0c9c2147b46869c32fdaa0ed
+MISC ChangeLog 40112 SHA256 090887228eca6fc81c436fbb901e9fce34142f8a594ca7abf90a9001adc2464c SHA512 ea8fcfcb774f5cc5773bbb0cf63e62e879ea7a14ee4c9a976befceb9f1615dc7e1f47d2ae6eb41f89bb0477a876f2e71cb591172b35f7dd38664052dc0561f57 WHIRLPOOL a36a7379cc75c4b4b83a6a9dbd3806d1978e77c5e051f5978177f891a8c2403256bb7a77aea3a5f1c9399dd8a60cb50adea1610d9b4741944767d687a474a539
 MISC metadata.xml 1206 SHA256 b41e6cde21af3e32f3ecd8fd69127d7f1316bdc19766ae87dd062f6ab55b5ed1 SHA512 39c92a8d7a4611f9ba7d513918706c67b36a6dfdf2f27d521741db8762775995f563a7b374bb3cdd78494f8ff550ff36a1b7b1b739e5d0329d9b673c3ca4dabf WHIRLPOOL 02ac9439148531384dd3f2a2bc6bb201cbc0d41672a6f044a91f0e7d8fb4fc68aa59e402d11e4344ead8c88324416577e83d88d11a3d02119d0ef90aa2974ce8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS276hAAoJELp701BxlEWfzIQP/1JEPjb33doKKm94WeVr0Lrw
-R1B14ujaAfu64kFX9v+CrIxb2c6gO3Jf6xy0eWeso3RRZA1zNnniCvtCYpElnXV+
-UhXgc6T98wK2zPS9k29WAW5jzrjoqwJPqm+s0nNnDpkbF0FJOCxObY6ZKg4Z+HCz
-YW8OzK2yEIUxH4rmmxBvrA3YeE3pdqekJSW6tB9/PZCMepvcK1rn9mBzqIRWpFcp
-qVaDOhJFI0nK5B5TfUnK0f7j9+yNVYhaMGIYQqWr8WcLBf1yK3rAauqP5JIYfkGw
-/Cb/S7OFADPFzwNMVAGXHOL6jKmfHll33E0OoDGxL3TfltM1h7uOugBx+jByb6aG
-Sh1NjSti3WM5CbNSpJE0jzgza9LFio75kUFI/z7bjYLah74hJK5FBVQe9QpDAuSS
-W1DXE3sLczjSgzYEcjBwCpHsSeoP54oFvjEYFgsbSJ7yMk40D5nqaLtEPdX5of2r
-nwLbPp7EcEujVcuWTEuXQCiP1gXFNEr0yF9/fKU0GhlEwEG7YSEkrhGFJfDUrN4v
-jndgNRXiOYlWd9NJwsquzX9i8lNdBIw2qnpJg2NhwAv75TgIy/T5QdlJjmDOnzsT
-aNrkVpA+letqwNntccauFp4hCQWoEWWiNvOcL7GStCb8LF+MqEAe3fR2Z2F5e8CC
-y4pMMtIfhKDhb1Im2s7c
-=Fy38
+iF4EAREIAAYFAlLdqNYACgkQC77qH+pIQ6TaDwEAmb6FuA/rj5u1pjbgrbqR1fr5
+pu3zLtBne9kPNJmMyAkA/1m/7a91OfuCfVndRXaIOhJcXkI6tJ/KCxO4HQrfxwzt
+=ZBIN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-208-r2.ebuild b/sys-apps/systemd/systemd-208-r2.ebuild
index 12b3923c98a0..a9a25e914230 100644
--- a/sys-apps/systemd/systemd-208-r2.ebuild
+++ b/sys-apps/systemd/systemd-208-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.13 2014/01/19 12:01:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r2.ebuild,v 1.14 2014/01/20 22:53:07 floppym Exp $
 
 EAPI=5
 
@@ -131,6 +131,9 @@ src_prepare() {
 		"${WORKDIR}"/${PN}-gentoo-patchset*/*.patch
 	)
 
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
 	autotools-utils_src_prepare
 }
 
@@ -333,9 +336,6 @@ migrate_locale() {
 }
 
 pkg_postinst() {
-	# for udev rules
-	enewgroup dialout
-
 	enewgroup systemd-journal
 	if use http; then
 		enewgroup systemd-journal-gateway
diff --git a/sys-apps/systemd/systemd-208-r3.ebuild b/sys-apps/systemd/systemd-208-r3.ebuild
new file mode 100644
index 000000000000..ee2da2165094
--- /dev/null
+++ b/sys-apps/systemd/systemd-208-r3.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-208-r3.ebuild,v 1.1 2014/01/20 22:53:07 floppym Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python2_7 )
+inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
+	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
+	user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.xz
+	http://dev.gentoo.org/~mgorny/dist/${PN}-gentoo-patchset-${PV}_p19.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
+	+kmod lzma pam policykit python qrcode selinux tcpd test
+	vanilla xattr"
+
+MINKV="3.0"
+
+COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1
+	>=sys-apps/util-linux-2.20
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	audit? ( >=sys-process/audit-2 )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5 )
+	gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] )
+	http? ( net-libs/libmicrohttpd )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	kmod? ( >=sys-apps/kmod-14-r1 )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( sys-apps/tcp-wrappers )
+	xattr? ( sys-apps/attr )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	|| (
+		>=sys-apps/util-linux-2.22
+		<sys-apps/sysvinit-2.88-r4
+	)
+	!sys-auth/nss-myhostname
+	!<sys-libs/glibc-2.10
+	!sys-fs/udev"
+
+PDEPEND=">=sys-apps/hwids-20130717-r1[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-devel/binutils-2.23.1
+	>=sys-devel/gcc-4.6
+	>=sys-kernel/linux-headers-${MINKV}
+	ia64? ( >=sys-kernel/linux-headers-3.9 )
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.18 )"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
+		~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
+		~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
+		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+		~!GRKERNSEC_PROC"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
+	use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+	use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
+
+	if linux_config_exists; then
+		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) -lt 4
+			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
+		then
+			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "systemd requires at least gcc 4.6"
+		fi
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		if ! use firmware-loader && kernel_is -lt 3 8; then
+			ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+			ewarn "require systemd with USE=firmware-loader to support loading"
+			ewarn "firmware. Missing this flag may cause some hardware not to work."
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}"/${PN}-gentoo-patchset*/*.patch
+	)
+
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+		# optional components/dependencies
+		$(use_enable acl)
+		$(use_enable audit)
+		$(use_enable cryptsetup libcryptsetup)
+		$(use_enable doc gtk-doc)
+		$(use_enable gcrypt)
+		$(use_enable gudev)
+		$(use_enable http microhttpd)
+		$(use_enable introspection)
+		$(use_enable kmod)
+		$(use_enable lzma xz)
+		$(use_enable pam)
+		$(use_enable policykit polkit)
+		$(use_enable python python-devel)
+		$(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python})
+		$(use_enable qrcode qrencode)
+		$(use_enable selinux)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable test tests)
+		$(use_enable xattr)
+
+		# not supported (avoid automagic deps in the future)
+		--disable-chkconfig
+
+		# hardcode a few paths to spare some deps
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+	)
+
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+
+	if use firmware-loader; then
+		myeconfargs+=(
+			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			ac_cv_search_cap_init=
+			ac_cv_header_sys_capability_h=yes
+			DBUS_CFLAGS=' '
+			DBUS_LIBS=' '
+
+			--disable-acl
+			--disable-audit
+			--disable-gcrypt
+			--disable-gtk-doc
+			--disable-introspection
+			--disable-kmod
+			--disable-libcryptsetup
+			--disable-microhttpd
+			--disable-pam
+			--disable-polkit
+			--disable-qrencode
+			--disable-selinux
+			--disable-tcpwrap
+			--disable-tests
+			--disable-xattr
+			--disable-xz
+			--disable-python-devel
+		)
+	fi
+
+	# Work around bug 463846.
+	tc-export CC
+
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		# prerequisites for gudev
+		use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
+
+		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || continue
+
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-libLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			# safe to call unconditionally, 'installs' empty list
+			install-libgudev_includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+
+	# we just keep sysvinit tools, so no need for the mans
+	rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		|| die
+	rm "${D}"/usr/share/man/man1/init.1 || die
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# if locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	enewgroup systemd-journal
+	if use http; then
+		enewgroup systemd-journal-gateway
+		enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
+	fi
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 468876
+	fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if [[ ! -L "${ROOT}"/etc/mtab ]]; then
+		ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
+		ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
+		ewarn "and 'mount' to not work properly. Please run:"
+		ewarn "	# ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
+		ewarn
+	fi
+
+	if ! has_version sys-apps/systemd-ui; then
+		elog "To get additional features, a number of optional runtime dependencies may"
+		elog "be installed:"
+		elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8804ac9dd551..2116a53b9535 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.79 2014/01/07 09:41:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.80 2014/01/20 22:53:07 floppym Exp $
 
 EAPI=5
 
@@ -100,6 +100,9 @@ src_prepare() {
 		echo 'EXTRA_DIST =' > docs/gtk-doc.make
 	fi
 
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
 	autotools-utils_src_prepare
 }
 #endif
@@ -356,9 +359,6 @@ migrate_locale() {
 }
 
 pkg_postinst() {
-	# for udev rules
-	enewgroup dialout
-
 	enewgroup systemd-journal
 	if use http; then
 		enewgroup systemd-journal-gateway