summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-10-12 20:07:15 -0400
committerAnthony G. Basile <blueness@gentoo.org>2015-10-12 20:07:34 -0400
commit108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40 (patch)
treea20ad7c5cb5ebba8d1ec2abc3aa39859c9c3dafa /sys-fs
parentx11-libs/gdk-pixbuf: clean up old/vulnerable revisions (diff)
downloadgentoo-108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40.tar.gz
gentoo-108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40.tar.bz2
gentoo-108e4c77ebb783d7b751fcc5d6b44dfaa3f15e40.zip
sys-fs/eudev: remove gtk-doc stuff and add rule-generator
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/eudev/eudev-9999.ebuild51
1 files changed, 13 insertions, 38 deletions
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 9f29df26e3d..f090a0556cf 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:"