Merge pull request #1356 from marineam/systemd

systemd: sync with upstream, dropping python use flag

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/Manifest

@@ -0,0 +1 @@
+DIST unifont-8.0.01.hex.gz 938016 SHA256 f67cffeb5e8a0ce5ad2c19a6f289a4e7c8caa0b8c624368adaf8571994c3ec1c SHA512 23aa0228da186b2f6575c1f06101f58713dfb98193ad3772405668d4e3e18d4c1e0fea40639b237dd3a5f4dee6dea90aed85fea3c28165fdfeeace79a2059e6f WHIRLPOOL 23069b019ca1aa9e33df4ce7a728d399090670b85e37029d45f9a0125d13f965039c7e5b9cd6bc633ef259780286f0e6a596b410c1fc144f1f1205e69e36c5cb

sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.174 2015/06/27 18:00:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.179 2015/07/11 16:39:36 floppym Exp $
 
 EAPI=5
 
@@ -17,6 +17,8 @@ else
 	CROS_WORKON_COMMIT="015325350548732458e61c193f5fab6f139f47fc"
 	KEYWORDS="amd64 arm64 ~arm ~x86"
 fi
+UNIFONT=unifont-8.0.01
+SRC_URI="terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )"
 
 # cros-workon must be imported first, in cases where cros-workon and
 # another eclass exports the same function (say src_compile) we want
@@ -24,7 +26,7 @@ fi
 inherit cros-workon
 
 inherit autotools-utils bash-completion-r1 linux-info multilib \
-	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
+	multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \
 	user
 
 DESCRIPTION="System and service manager for Linux"
@@ -33,14 +35,13 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
 IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
-	idn importd +kdbus +kmod +lz4 lzma nat pam policykit python
+	idn importd +kdbus +kmod +lz4 lzma nat pam policykit
 	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
 
 # CoreOS specific use flags
 IUSE+=" man symlink-usr"
 
-REQUIRED_USE="importd? ( curl gcrypt lzma )
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
-	python? ( ${PYTHON_REQUIRED_USE} )"
 
 MINKV="3.8"
 
@@ -68,7 +69,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
 	pam? ( virtual/pam:= )
-	python? ( ${PYTHON_DEPS} )
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( sys-libs/libseccomp:0= )
 	selinux? ( sys-libs/libselinux:0= )
@@ -107,8 +107,7 @@ DEPEND="${COMMON_DEPEND}
 	ia64? ( >=sys-kernel/linux-headers-3.9 )
 	virtual/pkgconfig
 	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	terminal? ( ${PYTHON_DEPS} )
-	terminal? ( media-fonts/unifont[utils(+)] )
 	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
 # Not required when building from unpatched tarballs, but we build from git.
@@ -117,11 +116,8 @@ DEPEND+="
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets
 		dev-libs/libxslt:0 )
-	terminal? ( ${PYTHON_DEPS} )
 	>=dev-libs/libgcrypt-1.4.5:0"
 
-REQUIRED_USE+=" terminal? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_pretend() {
 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
@@ -164,6 +160,11 @@ pkg_setup() {
 	:
 }
 
+src_unpack() {
+	default
+	cros-workon_src_unpack
+}
+
 src_prepare() {
 	# Bug 463376
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
@@ -177,7 +178,7 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
-	if use python || use terminal; then
+	if use terminal; then
 		python_setup
 	fi
 
@@ -188,6 +189,9 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--with-pamconfdir=/usr/share/pam.d
 
+		# Workaround for gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=no
+
 		# Workaround for bug 516346
 		--enable-dependency-tracking
 
@@ -207,6 +211,9 @@ multilib_src_configure() {
 		# no deps
 		--enable-efi
 		--enable-ima
+		# Moved to dev-python/python-systemd
+		--disable-python-devel
+		--without-python
 
 		# Optional components/dependencies
 		$(multilib_native_use_enable acl)
@@ -231,12 +238,11 @@ multilib_src_configure() {
 		$(multilib_native_use_enable nat libiptc)
 		$(multilib_native_use_enable pam)
 		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_with python)
-		$(multilib_native_use_enable python python-devel)
 		$(multilib_native_use_enable qrcode qrencode)
 		$(multilib_native_use_enable seccomp)
 		$(multilib_native_use_enable selinux)
 		$(multilib_native_use_enable terminal)
+		$(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex")
 		$(multilib_native_use_enable test tests)
 		$(multilib_native_use_enable test dbus)
 		$(multilib_native_use_enable xkb xkbcommon)