| 1 |
commit: da9824bc03b8440ad9910c78b90a9850d18d7c7f |
| 2 |
Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 22 11:07:08 2014 +0000 |
| 4 |
Commit: Ralph Sennhauser <sera <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 22 11:07:08 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/sera.git;a=commit;h=da9824bc |
| 7 |
|
| 8 |
entrance-9999: Use upstream unit file |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.8-r1 |
| 11 |
Manifest-Sign-Key: 3C5CF75A |
| 12 |
|
| 13 |
--- |
| 14 |
x11-misc/entrance/entrance-9999.ebuild | 9 ++++-- |
| 15 |
.../files/0001-disable-check-for-systemd.patch | 36 ++++++++++++++++++++++ |
| 16 |
2 files changed, 42 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/entrance/entrance-9999.ebuild b/x11-misc/entrance/entrance-9999.ebuild |
| 19 |
index dab3b81..269eb9c 100644 |
| 20 |
--- a/x11-misc/entrance/entrance-9999.ebuild |
| 21 |
+++ b/x11-misc/entrance/entrance-9999.ebuild |
| 22 |
@@ -1,10 +1,10 @@ |
| 23 |
-# Copyright 1999-2013 Gentoo Foundation |
| 24 |
+# Copyright 1999-2014 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Header: $ |
| 27 |
|
| 28 |
EAPI=5 |
| 29 |
|
| 30 |
-inherit autotools git-2 pam systemd |
| 31 |
+inherit autotools eutils git-2 pam |
| 32 |
|
| 33 |
DESCRIPTION="Display-manager based on efl" |
| 34 |
HOMEPAGE="http://www.enlightenment.org/" |
| 35 |
@@ -24,9 +24,11 @@ RDEPEND=" |
| 36 |
consolekit? ( sys-auth/consolekit ) |
| 37 |
pam? ( sys-libs/pam )" |
| 38 |
DEPEND="${RDEPEND} |
| 39 |
+ !<sys-apps/systemd-192 |
| 40 |
virtual/pkgconfig" |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
+ epatch "${FILESDIR}"/0001-disable-check-for-systemd.patch |
| 44 |
eautoreconf |
| 45 |
} |
| 46 |
|
| 47 |
@@ -36,6 +38,8 @@ src_configure() { |
| 48 |
$(use_enable ekbd) |
| 49 |
$(use_enable grub2) |
| 50 |
$(use_enable pam) |
| 51 |
+ # only installs unit file for now |
| 52 |
+ --enable-systemd |
| 53 |
) |
| 54 |
|
| 55 |
econf "${config[@]}" |
| 56 |
@@ -45,5 +49,4 @@ src_install() { |
| 57 |
default |
| 58 |
|
| 59 |
newpamd "${FILESDIR}"/entrance.pamd entrance |
| 60 |
- systemd_dounit "${FILESDIR}"/entrance.service |
| 61 |
} |
| 62 |
|
| 63 |
diff --git a/x11-misc/entrance/files/0001-disable-check-for-systemd.patch b/x11-misc/entrance/files/0001-disable-check-for-systemd.patch |
| 64 |
new file mode 100644 |
| 65 |
index 0000000..5adee2f |
| 66 |
--- /dev/null |
| 67 |
+++ b/x11-misc/entrance/files/0001-disable-check-for-systemd.patch |
| 68 |
@@ -0,0 +1,36 @@ |
| 69 |
+From bd0486e720178009cc839cb813d669f4b4fc0051 Mon Sep 17 00:00:00 2001 |
| 70 |
+From: Ralph Sennhauser <sera@g.o> |
| 71 |
+Date: Sun, 16 Feb 2014 11:15:52 +0100 |
| 72 |
+Subject: [PATCH] disable check for systemd |
| 73 |
+ |
| 74 |
+Gentoo installs unit files unconditionally so long this is all that is |
| 75 |
+needed for systemd support. A blocker could be used should the version |
| 76 |
+of systemd be a concern. |
| 77 |
+--- |
| 78 |
+ configure.ac | 10 +++++----- |
| 79 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
| 80 |
+ |
| 81 |
+diff --git a/configure.ac b/configure.ac |
| 82 |
+index 4b9d39c..aaf80a8 100644 |
| 83 |
+--- a/configure.ac |
| 84 |
++++ b/configure.ac |
| 85 |
+@@ -155,11 +155,11 @@ if test "x${enable_pam}" = "xyes" ; then |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
+ # Systemd |
| 89 |
+-if test "x${enable_systemd}" = "xyes" ; then |
| 90 |
+- PKG_CHECK_EXISTS([systemd >= 192], |
| 91 |
+- [enable_systemd="yes"], |
| 92 |
+- [enable_systemd="no"]) |
| 93 |
+-fi |
| 94 |
++#if test "x${enable_systemd}" = "xyes" ; then |
| 95 |
++# PKG_CHECK_EXISTS([systemd >= 192], |
| 96 |
++# [enable_systemd="yes"], |
| 97 |
++# [enable_systemd="no"]) |
| 98 |
++#fi |
| 99 |
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test "x${enable_systemd}" = "xyes"]) |
| 100 |
+ |
| 101 |
+ ### Checks for header files |
| 102 |
+-- |
| 103 |
+1.8.3.2 |
| 104 |
+ |
Archives