[gentoo-commits] proj/kde:master commit in: sys-auth/elogind/files/, sys-auth/elogind/

[Michael Palimaka]

commit:     8cf2900b95905e4e78312a6d74201d4e12df8d27
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Sat Feb 25 09:44:10 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 09:44:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cf2900b

sys-auth/elogind: improve ebuild

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{elogind-9999.ebuild => elogind-225.9999.ebuild}     | 16 +++++++---------
 .../{elogind-docs.patch => elogind-225.9999-docs.patch}  |  0
 sys-auth/elogind/metadata.xml                            |  3 ---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/sys-auth/elogind/elogind-9999.ebuild 
b/sys-auth/elogind/elogind-225.9999.ebuild
similarity index 80%
rename from sys-auth/elogind/elogind-9999.ebuild
rename to sys-auth/elogind/elogind-225.9999.ebuild
index 38df8c18de..75c77b0a5e 100644
--- a/sys-auth/elogind/elogind-9999.ebuild
+++ b/sys-auth/elogind/elogind-225.9999.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="dev_v226"
 LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
 SLOT="0"
 KEYWORDS=""
-IUSE="acl pam policykit selinux"
+IUSE="acl debug pam policykit selinux"
 
 COMMON_DEPEND="
        sys-apps/util-linux
@@ -40,7 +40,7 @@ DEPEND="${COMMON_DEPEND}
 PDEPEND="policykit? ( sys-auth/polkit )"
 
 PATCHES=(
-       "${FILESDIR}/${PN}-docs.patch"
+       "${FILESDIR}/${P}-docs.patch"
 )
 
 pkg_setup() {
@@ -54,15 +54,18 @@ pkg_setup() {
 
 src_prepare() {
        default
-       eautoreconf # Makefile.am patched by "${FILESDIR}/${PN}-docs.patch"
+       eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
 }
 
 src_configure() {
        econf \
                --with-pamlibdir=$(getpam_mod_dir) \
                --with-udevrulesdir="$(get_udevdir)"/rules.d \
-               --libdir="${EPREFIX}"/$(get_libdir) \
+               --libdir="${EPREFIX}"/usr/$(get_libdir) \
+               --with-rootlibdir="${EPREFIX}"/$(get_libdir) \
                --enable-smack \
+               --disable-kdbus \
+               $(use_enable debug debug elogind) \
                $(use_enable acl) \
                $(use_enable pam) \
                $(use_enable selinux)
@@ -72,11 +75,6 @@ src_install() {
        default
        find "${D}" -name '*.la' -delete || die
 
-       # Build system ignores --with-rootlibdir and puts pkgconfig below
-       # /$(libdir) - Move it to /usr/$(libdir)/pkgconfig
-       mkdir -p "${ED%/}"/usr/$(get_libdir) || die
-       mv "${ED%/}"/$(get_libdir)/pkgconfig "${ED%/}"/usr/$(get_libdir)/ || die
-
        newinitd "${FILESDIR}"/${PN}.init ${PN}
        newconfd "${FILESDIR}"/${PN}.conf ${PN}
 }

diff --git a/sys-auth/elogind/files/elogind-docs.patch 
b/sys-auth/elogind/files/elogind-225.9999-docs.patch
similarity index 100%
rename from sys-auth/elogind/files/elogind-docs.patch
rename to sys-auth/elogind/files/elogind-225.9999-docs.patch

diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 927a215253..95e86c1210 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -4,7 +4,4 @@
        <maintainer type="project">
                <email>freedesktop-b...@gentoo.org</email>
        </maintainer>
-       <use>
-               <flag name="apparmor">Enable AppArmor support</flag>
-       </use>
 </pkgmetadata>