summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-06-10 01:40:59 +0000
committerMike Gilbert <floppym@gentoo.org>2015-06-10 01:40:59 +0000
commit22a92d305e492b333ce563b8ddafee9e85e9e9c0 (patch)
tree1f81e630421d9bc051eeb488475a483ee9db6593 /sys-apps
parentFix >=sys-devel/gcc-5 compilation (diff)
downloadgentoo-2-22a92d305e492b333ce563b8ddafee9e85e9e9c0.tar.gz
gentoo-2-22a92d305e492b333ce563b8ddafee9e85e9e9c0.tar.bz2
gentoo-2-22a92d305e492b333ce563b8ddafee9e85e9e9c0.zip
Drop references to gudev, gtk-doc, and gobject-introspection.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog5
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild28
2 files changed, 7 insertions, 26 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 8d9a706f8598..a39af1605a65 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.375 2015/05/30 18:08:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.376 2015/06/10 01:40:59 floppym Exp $
+
+ 10 Jun 2015; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
+ Drop references to gudev, gtk-doc, and gobject-introspection.
30 May 2015; Mike Gilbert <floppym@gentoo.org> systemd-9999.ebuild:
Depend on >=sys-apps/util-linux-2.26, bug 550832 by Elias Probst.
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index aacbc75a9787..b59080229ee7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.170 2015/05/30 18:08:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.171 2015/06/10 01:40:59 floppym Exp $
EAPI=5
@@ -26,8 +26,8 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http
- idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
+IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
+ idn importd kdbus +kmod +lz4 lzma nat pam policykit python
qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
REQUIRED_USE="importd? ( curl gcrypt lzma )"
@@ -43,7 +43,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
curl? ( net-misc/curl:0= )
elfutils? ( >=dev-libs/elfutils-0.158:0= )
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
- gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
http? (
>=net-libs/libmicrohttpd-0.9.33:0=
ssl? ( >=net-libs/gnutls-3.1.4:0= )
@@ -53,7 +52,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
app-arch/bzip2:0=
sys-libs/zlib:0=
)
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
kmod? ( >=sys-apps/kmod-15:0= )
lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
@@ -98,7 +96,6 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-${MINKV}
ia64? ( >=sys-kernel/linux-headers-3.9 )
virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.18 )
gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
python? ( dev-python/lxml[${PYTHON_USEDEP}] )
terminal? ( media-fonts/unifont[utils(+)] )
@@ -110,7 +107,6 @@ if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-libs/libxslt:0
- dev-libs/gobject-introspection-common
>=dev-libs/libgcrypt-1.4.5:0"
fi
@@ -157,14 +153,6 @@ pkg_setup() {
}
src_prepare() {
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- if use doc; then
- gtkdocize --docdir docs/ || die
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- fi
-
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
@@ -212,18 +200,15 @@ multilib_src_configure() {
$(multilib_native_use_enable audit)
$(multilib_native_use_enable cryptsetup libcryptsetup)
$(multilib_native_use_enable curl libcurl)
- $(multilib_native_use_enable doc gtk-doc)
$(multilib_native_use_enable elfutils)
$(use_enable gcrypt)
$(multilib_native_use_enable gnuefi)
- $(use_enable gudev)
$(multilib_native_use_enable http microhttpd)
$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
$(multilib_native_use_enable idn libidn)
$(multilib_native_use_enable importd)
$(multilib_native_use_enable importd bzip2)
$(multilib_native_use_enable importd zlib)
- $(multilib_native_use_enable introspection)
$(use_enable kdbus)
$(multilib_native_use_enable kmod)
$(use_enable lz4)
@@ -241,9 +226,6 @@ multilib_src_configure() {
$(multilib_native_use_enable test dbus)
$(multilib_native_use_enable xkb xkbcommon)
- # not supported (avoid automagic deps in the future)
- --disable-chkconfig
-
# hardcode a few paths to spare some deps
QUOTAON=/usr/sbin/quotaon
QUOTACHECK=/usr/sbin/quotacheck
@@ -282,9 +264,6 @@ multilib_src_compile() {
if multilib_is_native_abi; then
emake "${mymakeopts[@]}"
else
- # prerequisites for gudev
- use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
-
echo 'gentoo: $(BUILT_SOURCES)' | \
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
@@ -317,7 +296,6 @@ multilib_src_install() {
install-pkgconfiglibDATA
install-includeHEADERS
# safe to call unconditionally, 'installs' empty list
- install-libgudev_includeHEADERS
install-pkgincludeHEADERS
)