[gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild ChangeLog

[Mike Gilbert (floppym)]

floppym     14/07/10 00:08:58

  Modified:             systemd-9999.ebuild ChangeLog
  Log:
  Use multilib_native_use functions.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.123                sys-apps/systemd/systemd-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.122&r2=1.123

Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- systemd-9999.ebuild	8 Jul 2014 17:01:13 -0000	1.122
+++ systemd-9999.ebuild	10 Jul 2014 00:08:58 -0000	1.123
@@ -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.122 2014/07/08 17:01:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.123 2014/07/10 00:08:58 floppym Exp $
 
 EAPI=5
 
@@ -171,6 +171,14 @@
 	multilib-minimal_src_configure
 }
 
+multilib_native_enable() {
+	if multilib_is_native_abi; then
+		echo "--enable-${1}"
+	else
+		echo "--disable-${1}"
+	fi
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		# disable -flto since it is an optimization flag
@@ -193,28 +201,51 @@
 		# 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 elfutils)
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable elfutils)
 		$(use_enable gcrypt)
 		$(use_enable gudev)
-		$(use_enable http microhttpd)
-		$(usex http $(use_enable ssl gnutls) --disable-gnutls)
-		$(use_enable introspection)
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable introspection)
 		$(use_enable kdbus)
-		$(use_enable kmod)
+		$(multilib_native_use_enable kmod)
 		$(use_enable lzma xz)
-		$(use_enable pam)
-		$(use_enable policykit polkit)
-		$(use_with python)
-		$(use_enable python python-devel)
-		$(use_enable qrcode qrencode)
-		$(use_enable seccomp)
-		$(use_enable selinux)
-		$(use_enable test tests)
+		$(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 test tests)
+		$(multilib_native_use_enable test dbus)
+
+		# Disable optional binaries for non-native abis
+		$(multilib_native_enable backlight)
+		$(multilib_native_enable binfmt)
+		$(multilib_native_enable bootchart)
+		$(multilib_native_enable coredump)
+		$(multilib_native_enable hostnamed)
+		$(multilib_native_enable localed)
+		$(multilib_native_enable logind)
+		$(multilib_native_enable machined)
+		$(multilib_native_enable networkd)
+		$(multilib_native_enable quotacheck)
+		$(multilib_native_enable randomseed)
+		$(multilib_native_enable readahead)
+		$(multilib_native_enable resolved)
+		$(multilib_native_enable rfkill)
+		$(multilib_native_enable sysusers)
+		$(multilib_native_enable timedated)
+		$(multilib_native_enable timesyncd)
+		$(multilib_native_enable tmpfiles)
+		$(multilib_native_enable vconsole)
 
 		# not supported (avoid automagic deps in the future)
 		--disable-apparmor
@@ -251,47 +282,6 @@
 		myeconfargs+=(
 			ac_cv_search_cap_init=
 			ac_cv_header_sys_capability_h=yes
-			DBUS_CFLAGS=' '
-			DBUS_LIBS=' '
-
-			# Binaries
-			--disable-backlight
-			--disable-binfmt
-			--disable-bootchart
-			--disable-coredump
-			--disable-hostnamed
-			--disable-localed
-			--disable-logind
-			--disable-machined
-			--disable-networkd
-			--disable-quotacheck
-			--disable-randomseed
-			--disable-readahead
-			--disable-resolved
-			--disable-rfkill
-			--disable-sysusers
-			--disable-timedated
-			--disable-timesyncd
-			--disable-tmpfiles
-			--disable-vconsole
-
-			# Libraries
-			--disable-acl
-			--disable-audit
-			--disable-elfutils
-			--disable-gnutls
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-libcryptsetup
-			--disable-microhttpd
-			--disable-pam
-			--disable-polkit
-			--disable-python-devel
-			--disable-qrencode
-			--disable-seccomp
-			--disable-selinux
-			--disable-tests
 		)
 	fi
 



1.282                sys-apps/systemd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.282&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.282&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.281&r2=1.282

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- ChangeLog	8 Jul 2014 17:01:13 -0000	1.281
+++ ChangeLog	10 Jul 2014 00:08:58 -0000	1.282
@@ -1,6 +1,9 @@
 # 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.281 2014/07/08 17:01:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.282 2014/07/10 00:08:58 floppym Exp $
+
+  10 Jul 2014; Mike Gilbert <floppym@g.o> systemd-9999.ebuild:
+  Use multilib_native_use functions.
 
   08 Jul 2014; Mike Gilbert <floppym@g.o> systemd-9999.ebuild:
   Don't disable gcrypt and xz support for non-native abis, bug 516702.