commit: 8a04db225ddc10a5a6c6daf6bd37a11c922a6ef1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 18:27:17 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 18:27:17 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a04db22
sys-auth/elogind: port to EAPI 6
Package-Manager: portage-2.2.26
sys-auth/elogind/elogind-219.12.ebuild | 16 +++++++---------
sys-auth/elogind/files/elogind-docs.patch | 19 +++++++++++++++++++
sys-auth/elogind/files/elogind-lrt.patch | 4 ++--
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/sys-auth/elogind/elogind-219.12.ebuild
b/sys-auth/elogind/elogind-219.12.ebuild
index 2ad7fbb..2ec5e67 100644
--- a/sys-auth/elogind/elogind-219.12.ebuild
+++ b/sys-auth/elogind/elogind-219.12.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit autotools pam
@@ -30,10 +30,14 @@ RDEPEND="${DEPEND}
policykit? ( sys-auth/polkit )
"
-PATCHES=( "${FILESDIR}/${PN}-lrt.patch" )
+DOCS=( NEWS README TODO )
+PATCHES=(
+ "${FILESDIR}/${PN}-docs.patch"
+ "${FILESDIR}/${PN}-lrt.patch"
+)
src_prepare() {
- epatch ${PATCHES[@]}
+ default
eautoreconf
}
@@ -46,9 +50,3 @@ src_configure() {
$(use_enable seccomp) \
$(use_enable selinux)
}
-
-src_install() {
- default
-
- rm -r "${D}"/usr/share/doc/elogind/ || die
-}
diff --git a/sys-auth/elogind/files/elogind-docs.patch
b/sys-auth/elogind/files/elogind-docs.patch
new file mode 100644
index 0000000..4763be2
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-docs.patch
@@ -0,0 +1,19 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -253,16 +253,6 @@
+ dist_bashcompletion_DATA =
+ dist_zshcompletion_DATA =
+
+-dist_doc_DATA = \
+- README \
+- NEWS \
+- LICENSE.LGPL2.1 \
+- LICENSE.GPL2 \
+- LICENSE.MIT \
+- src/libelogind/sd-bus/PORTING-DBUS1 \
+- src/libelogind/sd-bus/DIFFERENCES \
+- src/libelogind/sd-bus/GVARIANT-SERIALIZATION
+-
+ @INTLTOOL_POLICY_RULE@
+
+ #
------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind-lrt.patch
b/sys-auth/elogind/files/elogind-lrt.patch
index e4a4225..19055fa 100644
--- a/sys-auth/elogind/files/elogind-lrt.patch
+++ b/sys-auth/elogind/files/elogind-lrt.patch
@@ -1,5 +1,5 @@
---- Makefile.am 2015-09-01 14:19:31.000000000 +0300
-+++ Makefile.am 2016-01-05 17:18:44.834511975 +0300
+--- a/Makefile.am
++++ b/Makefile.am
@@ -778,6 +778,7 @@
libelogind_core_la_LIBADD = \
