Merge branch 'master' of github.com:Rogentos/kogaion-desktop

4 files changed, 47 insertions, 1 deletions

diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
new file mode 100644
index 00000000..ce358cac
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -0,0 +1 @@
+DIST gentoo-systemd-integration-4.tar.bz2 52449 SHA256 7027bd2056449e5ec8f9fc3da81c0f157810d482bfa11be48903643335fc6bde SHA512 2f60a98062fc5b9c7247e5df77b8875e532d28b2b903a2770713bbcfb2706f0f1bd7809396dd49ff1cc41f69d8c3dceaef87909fa8683c458a5f818f5e05a574 WHIRLPOOL f87b8aa01f24fad4ff90e694fa03b718425bbb0c0dc8a00950b0ae81230f3b92255d07efc9161707a35c8f3e0e7664c57b7ae061ccc0d896bfc55a632a8b4f09
diff --git a/sys-apps/gentoo-systemd-integration/files/gentoo-systemd-integration-pure-systemd.patch b/sys-apps/gentoo-systemd-integration/files/gentoo-systemd-integration-pure-systemd.patch
new file mode 100644
index 00000000..e8e050e2
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/files/gentoo-systemd-integration-pure-systemd.patch
@@ -0,0 +1,12 @@
+diff -Nur a/system-generators/gentoo-local-generator b/system-generators/gentoo-local-generator
+--- a/system-generators/gentoo-local-generator	2014-02-20 05:28:14.000000000 +0000
++++ b/system-generators/gentoo-local-generator	2015-05-25 16:20:26.847675246 +0100
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++# we don't need those from below being systemd only so exit gracefully
++exit 0
++
+ locald_dir=/etc/local.d
+ cd "${locald_dir}" || exit 1
+ 
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
new file mode 100644
index 00000000..d02b525f
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils systemd
+
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://bitbucket.org/mgorny/gentoo-systemd-integration"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/systemd-207
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-pure-systemd.patch"
+}
+
+src_configure() {
+	local myeconfargs=(
+		"$(systemd_with_unitdir)"
+		# TODO: solve it better in the eclass
+		--with-systemdsystemgeneratordir="$(systemd_get_utildir)"/system-generators
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/sys-devel/gcc-config/gcc-config-1.8.ebuild b/sys-devel/gcc-config/gcc-config-1.8.ebuild
index 6d6d95dc..da5c634b 100644
--- a/sys-devel/gcc-config/gcc-config-1.8.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8.ebuild
@@ -17,7 +17,7 @@ IUSE="+systemd"
 DEPEND="
 	systemd? ( >=sys-apps/gentoo-functions-0.7 )"
 
-src_unpack() {
+src_prepare() {
 	unpacker_src_unpack
 	cd "${S}" || die
 	epatch "${FILESDIR}/${PN}-kogaion-base-gcc-support-2.patch"