summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2017-02-25 20:44:10 +1100
committerMichael Palimaka <kensington@gentoo.org>2017-02-25 20:44:49 +1100
commit8cf2900b95905e4e78312a6d74201d4e12df8d27 (patch)
tree5198bd3b84a04be99efa4cdd46873b1048f8a381
parentc74795dc80133e090e9d2dd64f667f955e4a68f1 (diff)
downloadkde-8cf2900b95905e4e78312a6d74201d4e12df8d27.tar.gz
kde-8cf2900b95905e4e78312a6d74201d4e12df8d27.tar.bz2
kde-8cf2900b95905e4e78312a6d74201d4e12df8d27.zip
sys-auth/elogind: improve ebuild
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--sys-auth/elogind/elogind-225.9999.ebuild (renamed from sys-auth/elogind/elogind-9999.ebuild)16
-rw-r--r--sys-auth/elogind/files/elogind-225.9999-docs.patch (renamed from sys-auth/elogind/files/elogind-docs.patch)0
-rw-r--r--sys-auth/elogind/metadata.xml3
3 files changed, 7 insertions, 12 deletions
diff --git a/sys-auth/elogind/elogind-9999.ebuild b/sys-auth/elogind/elogind-225.9999.ebuild
index 38df8c18de9..75c77b0a5e9 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
index b48e52d73aa..b48e52d73aa 100644
--- a/sys-auth/elogind/files/elogind-docs.patch
+++ b/sys-auth/elogind/files/elogind-225.9999-docs.patch
diff --git a/sys-auth/elogind/metadata.xml b/sys-auth/elogind/metadata.xml
index 927a2152535..95e86c12108 100644
--- a/sys-auth/elogind/metadata.xml
+++ b/sys-auth/elogind/metadata.xml
@@ -4,7 +4,4 @@
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
- <use>
- <flag name="apparmor">Enable AppArmor support</flag>
- </use>
</pkgmetadata>