sys-apps/openrc : revision bump

6 files changed, 23 insertions, 413 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
deleted file mode 100644
index f6df0118..00000000
--- a/sys-apps/dbus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dbus-1.10.18.tar.gz 1986589 SHA256 6049ddd5f3f3e2618f615f1faeda0a115104423a7996b7aa73e2f36e38cc514a SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed WHIRLPOOL ee164e1f6de80595fbfbcbad65d78dab4b91b5ec4e1ce88e1c4015f1c1b531f09796d54db163b2c2eceb3b92261f8a57852d2e0b29f71d9c65f9b91684433d9e
diff --git a/sys-apps/dbus/dbus-1.10.18-r1.ebuild b/sys-apps/dbus/dbus-1.10.18-r1.ebuild
deleted file mode 100644
index a233c8be..00000000
--- a/sys-apps/dbus/dbus-1.10.18-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
-
-RESTRICT="test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-CDEPEND="
-	>=dev-libs/expat-2
-	selinux? (
-		sys-libs/libselinux
-		)
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.36:2
-		${PYTHON_DEPS}
-		)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-dbus )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	eapply "${FILESDIR}/${PN}-enable-elogind.patch"
-
-	eapply_user
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-		)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
-
-	if use X; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
-
-	# Redcore Linux tweak to move the dbus service
-	# from default runlevel to boot runlevel
-	if [ "$(rc-config list default | grep dbus)" != "" ]; then
-		ewarn "dbus is currently started from default runlevel"
-		ewarn "moving it to boot runlevel"
-		"${ROOT}"/sbin/rc-update del dbus default
-		"${ROOT}"/sbin/rc-update add dbus boot
-	elif [ "$(rc-config list boot | grep dbus)" != "" ]; then
-		ewarn "dbus is currently started from boot runlevel"
-		ewarn "nothing to move around"
-	fi
-}
diff --git a/sys-apps/dbus/files/80-dbus b/sys-apps/dbus/files/80-dbus
deleted file mode 100644
index 5593e2cd..00000000
--- a/sys-apps/dbus/files/80-dbus
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  if [ -n "$command" ]; then
-    command="$dbuslaunch --exit-with-session $command"
-  else
-    eval `$dbuslaunch --sh-syntax --exit-with-session`
-  fi
-fi
-
diff --git a/sys-apps/dbus/files/dbus-enable-elogind.patch b/sys-apps/dbus/files/dbus-enable-elogind.patch
deleted file mode 100644
index 5cb5d649..00000000
--- a/sys-apps/dbus/files/dbus-enable-elogind.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/dbus/dbus-userdb-util.c	2015-09-30 16:48:40.000000000 +0200
-+++ b/dbus/dbus-userdb-util.c	2016-11-03 11:09:42.550520587 +0100
-@@ -32,6 +32,9 @@
- #if HAVE_SYSTEMD
- #include <systemd/sd-login.h>
- #endif
-+#if HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#endif
- 
- /**
-  * @addtogroup DBusInternalsUtils
-@@ -54,7 +57,7 @@
-   const DBusUserInfo *info;
-   dbus_bool_t result = FALSE;
- 
--#ifdef HAVE_SYSTEMD
-+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND)
-   /* check if we have logind */
-   if (access ("/run/systemd/seats/", F_OK) >= 0)
-     {
---- a/configure.ac	2016-11-03 11:13:58.286528265 +0100
-+++ b/configure.ac	2016-11-03 11:22:11.210543063 +0100
-@@ -185,6 +185,7 @@
- AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto)
- AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
- AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto)
-+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto)
- AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto)
- 
- AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
-@@ -1184,6 +1185,24 @@
- 
- AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
- 
-+dnl elogind detection
-+if test x$enable_elogind = xno ; then
-+    have_elogind=no;
-+else
-+    PKG_CHECK_MODULES([ELOGIND],
-+        [libelogind >= 209],
-+        [have_elogind=yes],
-+        [have_elogind=no])
-+fi
-+
-+if test x$have_elogind = xyes; then
-+    AC_DEFINE(HAVE_ELOGIND,1,[Have elogind])
-+fi
-+
-+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then
-+    AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found])
-+fi
-+
- dnl systemd detection
- if test x$enable_systemd = xno ; then
-     have_systemd=no;
-@@ -1290,7 +1309,7 @@
- fi
- 
- #### Set up final flags
--LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS"
-+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS"
- AC_SUBST([LIBDBUS_LIBS])
- 
- ### X11 detection
-@@ -1949,6 +1968,7 @@
-         Building AppArmor support: ${have_apparmor}
-         Building inotify support: ${have_inotify}
-         Building kqueue support:  ${have_kqueue}
-+        Building elogind support: ${have_elogind}
-         Building systemd support: ${have_systemd}
-         Building X11 code:        ${have_x11}
-         Building Doxygen docs:    ${enable_doxygen_docs}
diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1
deleted file mode 100644
index bd354238..00000000
--- a/sys-apps/dbus/files/dbus.initd-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-
-dbus_socket="/var/run/dbus/system_bus_socket"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start_pre() {
-	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	checkpath -q -d /var/run/dbus 
-}
-
-stop_post() {
-	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
-}
-
-reload() {
-	ebegin "Reloading D-BUS messagebus config"
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	eend $?
-}
diff --git a/sys-apps/openrc/openrc-0.34.11-r1.ebuild b/sys-apps/openrc/openrc-0.34.11-r2.ebuild
index 44e6b20b..092d9944 100644
--- a/sys-apps/openrc/openrc-0.34.11-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11-r2.ebuild
@@ -292,10 +292,6 @@ pkg_postinst() {
 				"${EROOT}"etc/runlevels
 		fi
 	fi
-	# Redcore Linux change : enable DKMS at boot runlevel
-	if use dkms; then
-		ln -sf /etc/init.d/dkms /etc/runlevels/boot
-	fi
 
 	if use hppa; then
 		elog "Setting the console font does not work on all HPPA consoles."
@@ -339,4 +335,27 @@ pkg_postinst() {
 		ewarn "without networking."
 		ewarn
 	fi
+
+	# Redcore Linux tweaks:
+
+	#1 : move dbus service to boot runlevel
+	if [ -e "${ROOT}"etc/init.d/dbus ]; then
+		if [ "$(rc-config list boot | grep dbus)" != "" ]; then
+			ewarn "dbus is currently started from boot runlevel, skiping"
+		elif [ "$(rc-config list default | grep dbus)" != "" ]; then
+			ewarn "dbus is currently started from default runlevel, moving"
+			"${ROOT}"sbin/rc-update del dbus default
+			"${ROOT}"sbin/rc-update del dbus boot
+		fi
+	fi
+
+	#2 : add dkms service to boot runlevel
+	if [ -e "${ROOT}"etc/init.d/dkms ] && use dkms; then
+		if [ "$(rc-config list boot | grep dkms)" != "" ]; then
+			ewarn "dkms is currently started from boot runlevel, skiping"
+		else
+			ewarn "dkms is currently not started from boot runlevel, enabling"
+			"${ROOT}"sbin/rc-update add dkms boot
+		fi
+	fi
 }