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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/
Date: Sun,  4 Mar 2018 10:06:32 +0000 (UTC)	[thread overview]
Message-ID: <1520157777.b8cf4069ef23fbd881c9fb12b6f56f7fa6fd5f24.asturm@gentoo> (raw)

commit:     b8cf4069ef23fbd881c9fb12b6f56f7fa6fd5f24
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 00:03:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 10:02:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8cf4069

sys-auth/elogind: docdir to PF

Completely disable meson.build install to docdir - it was not honoring
the docdir config switch. Add remaining file to ebuild DOCS manually.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-auth/elogind/elogind-235.2-r2.ebuild        |  8 +++++---
 sys-auth/elogind/files/elogind-235.2-docs.patch | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild
index 299badb3a63..9aebf298ae6 100644
--- a/sys-auth/elogind/elogind-235.2-r2.ebuild
+++ b/sys-auth/elogind/elogind-235.2-r2.ebuild
@@ -40,7 +40,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-235.1-docs.patch"
+	"${FILESDIR}/${P}-docs.patch"
 	"${FILESDIR}/${P}-legacy-cgroupmode.patch"
 	"${FILESDIR}/${P}-drop-logintest.patch" # bug 645156
 )
@@ -69,8 +69,8 @@ src_configure() {
 	fi
 
 	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		-Dpamlibdir=$(getpam_mod_dir)
 		-Dudevrulesdir="$(get_udevdir)"/rules.d
 		--libdir="${EPREFIX}"/usr/$(get_libdir)
@@ -96,6 +96,8 @@ src_configure() {
 }
 
 src_install() {
+	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
 	meson_src_install
 
 	newinitd "${FILESDIR}"/${PN}.init ${PN}

diff --git a/sys-auth/elogind/files/elogind-235.2-docs.patch b/sys-auth/elogind/files/elogind-235.2-docs.patch
new file mode 100644
index 00000000000..7fbb4594bdc
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-235.2-docs.patch
@@ -0,0 +1,19 @@
+--- a/meson.build	2018-01-14 18:59:36.141461154 +0100
++++ b/meson.build	2018-01-14 19:00:46.208461781 +0100
+@@ -2634,16 +2634,5 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('README',
+-             'NEWS',
+-             'CODING_STYLE',
+-#if 0 /// UNNEEDED by elogind
+-#              'DISTRO_PORTING',
+-#              'ENVIRONMENT.md',
+-#endif // 0
+-             'LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+-             install_dir : docdir)
+ 
+ meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))

next             reply	other threads:[~2018-03-04 10:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-04 10:06 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-19 15:41 [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/ Andreas Sturmlechner
2024-11-24 10:28 Andreas Sturmlechner
2024-11-14 19:51 Andreas Sturmlechner
2024-08-28  7:40 Andreas Sturmlechner
2024-04-30 16:05 Andreas K. Hüttel
2023-06-12  3:49 Sam James
2023-06-10 14:54 Piotr Karbowski
2023-05-31  0:43 Sam James
2023-05-31  0:43 Sam James
2023-05-16  6:46 Sam James
2022-12-06  6:18 WANG Xuerui
2021-11-22  5:56 Sam James
2021-01-10 13:14 Piotr Karbowski
2020-04-04  9:30 Andreas Sturmlechner
2020-03-12 22:15 Andreas Sturmlechner
2020-02-02 16:19 Andreas Sturmlechner
2019-11-30 12:08 Andreas Sturmlechner
2019-11-15 17:37 Andreas Sturmlechner
2019-05-15 10:38 Andreas Sturmlechner
2019-04-18 19:14 Jory Pratt
2019-03-16  5:26 Michael Palimaka
2018-11-17  7:24 Michael Palimaka
2018-06-30 20:47 Andreas Sturmlechner
2018-03-05 22:14 Andreas Sturmlechner
2018-01-31 10:22 Andreas Sturmlechner
2018-01-10 10:00 Andreas Sturmlechner
2017-03-21 19:11 Andreas Sturmlechner
2017-03-21 10:15 Andreas Sturmlechner
2017-03-21 10:15 Andreas Sturmlechner
2017-01-15 12:17 Andreas Sturmlechner

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:299badb3a6 dfblob:9aebf298ae dfblob:7fbb4594bd )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/files/, sys-auth/elogind/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1520157777.b8cf4069ef23fbd881c9fb12b6f56f7fa6fd5f24.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox