public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/
Date: Tue, 13 Oct 2015 00:01:44 +0000 (UTC)	[thread overview]
Message-ID: <1444694854.108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40.blueness@gentoo> (raw)

commit:     108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 00:07:15 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 00:07:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108e4c77

sys-fs/eudev: remove gtk-doc stuff and add rule-generator

Package-Manager: portage-2.2.20.1

 sys-fs/eudev/eudev-9999.ebuild | 51 +++++++++++-------------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 9f29df2..f090a05 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc +hwdb +kmod introspection selinux static-libs test"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
@@ -41,12 +41,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
 	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
@@ -98,12 +92,6 @@ src_prepare() {
 	|| die "failed to change group dialout to uucp"
 
 	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
 	eautoreconf
 }
 
@@ -121,10 +109,8 @@ multilib_src_configure() {
 		DBUS_LIBS=' '
 		--with-rootprefix=
 		--with-rootrundir=/run
-		--docdir=/usr/share/doc/${PF}
 		--libdir=/usr/$(get_libdir)
 		--with-rootlibexecdir=/lib/udev
-		--with-html-dir="/usr/share/doc/${PF}/html"
 		--enable-split-usr
 		--enable-manpages
 		--disable-hwdb
@@ -136,19 +122,19 @@ multilib_src_configure() {
 	if multilib_is_native_abi; then
 		econf_args+=(
 			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
 			$(use_enable introspection)
 			$(use_enable kmod)
 			$(use_enable static-libs static)
 			$(use_enable selinux)
+			$(use_enable rule-generator)
 		)
 	else
 		econf_args+=(
 			--disable-static
-			--disable-gtk-doc
 			--disable-introspection
 			--disable-kmod
 			--disable-selinux
+			--disable-rule-generator
 		)
 	fi
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -187,31 +173,11 @@ multilib_src_test() {
 
 multilib_src_install_all() {
 	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules
 
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/gudev
-		doins "${S}"/docs/gudev/html/*
-
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
 }
 
 pkg_postinst() {
@@ -242,6 +208,15 @@ pkg_postinst() {
 	ewarn "upgrade go into effect:"
 	ewarn "\t/etc/init.d/udev --nodeps restart"
 
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
 	elog
 	elog "For more information on eudev on Gentoo, writing udev rules, and"
 	elog "fixing known issues visit:"


             reply	other threads:[~2015-10-13  0:01 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-13  0:01 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-06 18:00 [gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/ Sam James
2023-08-20 20:09 Mike Gilbert
2023-05-17  1:58 Sam James
2022-12-05 17:24 WANG Xuerui
2022-12-05 17:24 WANG Xuerui
2022-12-05 17:24 WANG Xuerui
2022-10-30  9:35 Sam James
2022-06-16  1:00 Sam James
2022-06-10  2:45 Sam James
2022-06-07  2:02 Sam James
2022-04-29  5:04 Sam James
2022-04-17  8:16 Sam James
2021-12-25  0:02 Mike Gilbert
2021-12-21  2:55 Sam James
2021-12-21  2:55 Sam James
2021-12-21  2:55 Sam James
2021-12-21  2:49 Sam James
2021-12-21  2:49 Sam James
2021-12-21  2:49 Sam James
2021-12-21  2:48 Sam James
2021-12-20  6:47 Sam James
2021-12-20  6:46 Sam James
2021-12-18  5:46 Sam James
2021-12-18  5:43 Sam James
2021-12-18  5:43 Sam James
2021-12-18  5:16 Sam James
2021-12-18  4:40 Sam James
2021-12-18  4:39 Sam James
2021-12-18  4:39 Sam James
2021-12-18  4:39 Sam James
2021-12-18  4:39 Sam James
2021-08-15 19:06 Sam James
2021-07-20 18:31 Sam James
2021-07-20  2:18 Sam James
2021-07-17 21:57 Andreas K. Hüttel
2021-03-26 12:01 Agostino Sarubbo
2021-02-18  7:26 Sam James
2021-02-16 12:30 Sam James
2021-02-14 14:53 Sam James
2021-02-12 13:56 Sam James
2021-02-12 13:47 Sam James
2021-02-12  9:58 Sam James
2021-02-12  9:57 Sam James
2021-02-09 19:41 Anthony G. Basile
2020-02-13 21:40 David Seifert
2019-12-02 11:04 Mikle Kolyada
2019-12-02 11:04 Mikle Kolyada
2019-12-02 11:04 Mikle Kolyada
2019-11-08  3:23 Aaron Bauman
2019-11-04 20:06 Sergei Trofimovich
2019-11-04 20:06 Sergei Trofimovich
2019-11-01 20:09 Matt Turner
2019-11-01 20:09 Matt Turner
2019-11-01 10:34 Mikle Kolyada
2019-10-28 11:27 Agostino Sarubbo
2019-10-28  9:43 Agostino Sarubbo
2019-10-26 20:37 Anthony G. Basile
2019-07-29 17:50 Mike Gilbert
2019-05-20 14:06 Anthony G. Basile
2019-05-04 19:51 Andreas K. Hüttel
2019-04-10  5:13 Jory Pratt
2018-12-01 22:16 Anthony G. Basile
2018-10-26 13:57 Anthony G. Basile
2018-10-26 13:57 Anthony G. Basile
2018-09-18 13:52 Anthony G. Basile
2018-09-15 22:10 Anthony G. Basile
2018-08-18  2:49 Mikle Kolyada
2018-06-20  8:17 Michał Górny
2018-05-11  2:09 Matt Turner
2018-05-09 11:08 Jeroen Roovers
2018-05-09 10:44 Mikle Kolyada
2018-04-04 10:27 Anthony G. Basile
2018-04-04 10:27 Anthony G. Basile
2018-03-29  6:59 Sergei Trofimovich
2018-03-15 14:47 Mikle Kolyada
2018-03-15  1:50 Mart Raudsepp
2018-03-04 16:23 Tobias Klausmann
2018-01-27 22:31 Sergei Trofimovich
2018-01-26 21:12 Mikle Kolyada
2018-01-26 19:54 Thomas Deutschmann
2017-11-23  9:59 Anthony G. Basile
2017-10-19 23:19 Anthony G. Basile
2017-10-19 23:19 Anthony G. Basile
2017-09-05 22:37 Anthony G. Basile
2017-09-03 18:31 Anthony G. Basile
2017-09-02 14:15 Michael Palimaka
2017-07-30  9:23 Michał Górny
2017-05-01 14:48 Anthony G. Basile
2017-05-01 14:48 Anthony G. Basile
2017-04-19 21:25 Anthony G. Basile
2016-12-12  6:58 Anthony G. Basile
2016-12-12  6:58 Anthony G. Basile
2016-08-01  5:50 Benda XU
2016-07-25 16:21 Ian Stakenvicius
2016-07-05  0:37 Anthony G. Basile
2016-06-24 13:44 Anthony G. Basile
2016-06-01 22:28 Anthony G. Basile
2016-05-30 14:53 Mike Gilbert
2016-04-09 10:17 Anthony G. Basile
2016-04-09  2:10 Anthony G. Basile
2016-02-24 19:18 Anthony G. Basile
2016-02-24 18:20 Anthony G. Basile
2016-01-24  8:23 Jeroen Roovers
2016-01-11  9:56 Agostino Sarubbo
2016-01-10 11:22 Agostino Sarubbo
2016-01-09  7:00 Agostino Sarubbo
2015-12-26 12:03 Agostino Sarubbo
2015-12-19  6:18 Jeroen Roovers
2015-12-11 10:50 Mikle Kolyada
2015-10-13  6:11 Anthony G. Basile
2015-10-13  6:11 Anthony G. Basile
2015-10-12 11:51 Anthony G. Basile
2015-10-12 11:46 Anthony G. Basile
2015-09-06 12:41 Agostino Sarubbo

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=1444694854.108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40.blueness@gentoo \
    --to=blueness@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