Remove references to gudev, gtk-doc, and gobject-introspection.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 13 insertions, 38 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 3e55ec997276..68cf7a90f872 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1110 2015/06/06 17:42:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1111 2015/06/10 02:37:44 floppym Exp $
+
+  10 Jun 2015; Mike Gilbert <floppym@gentoo.org> udev-9999.ebuild:
+  Remove references to gudev, gtk-doc, and gobject-introspection.
 
   06 Jun 2015; William Hubbs <williamh@gentoo.org> -udev-220.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 003c5478d8a0..1892503b675a 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -18,8 +18,8 @@ EBUILD udev-217.ebuild 15525 SHA256 eb920670604de6cd456d71abbbe7d15f7210432f72f6
 EBUILD udev-218.ebuild 15632 SHA256 4dbe05631e4409da39262e5cbac85ca52566cdd7e08d7b769e6822d44a4c4cbf SHA512 16d5b15103acce110530b842e359707abfe457c265ab494c434dcec729b1013ed057e9aa018f9507aff5172caa145dadf41968780e7ff84dbc2f7bf7d0c204ea WHIRLPOOL b089bd769c18b0572ee95f61d6c4909f55415fe0aca78b14476e3bb46dd74fbe15250f0dbc91657df5dc6ad6e456387545046a317a432997ddc4cdde7cf91128
 EBUILD udev-219.ebuild 15631 SHA256 04249887a38cdd8646c85dfd6868e24ce5763e1a76276dde95546d06e1335628 SHA512 97f38fb0140a7cda267c12234ce28e74265c8d9f1bf9724190c6c20cc15616cc5e00397806dce60b523988aabd5b7532b55f130f6086a5bf73292f5c371b5d6f WHIRLPOOL fbb9591789f66c6df29820e788fd10af68d87b41eb28299664f5430556e61256b1cabab98a7e23d76c290e94531bca77b49b957baf9483cf6a6405215c7279eb
 EBUILD udev-220-r1.ebuild 15763 SHA256 44474f2993a86788bcd4f566530770d32787e8a55737a087153581d758c7f247 SHA512 e63ad37ca2dbe7264124473ee0780c58f3c13d10750405dc368cae794b6effb7d82e3b172324cb26497dbda658d0afe51a039df6a9710d4936c28c2f20c3b0fb WHIRLPOOL 75d1941144cf977eae894e5730b490818e8cfa6e9347fd13c48a0f0b4bb07b284e5dc75df8ec9a597228866051f866117b95764d7027da8db0e890cbf55e7c1d
-EBUILD udev-9999.ebuild 15675 SHA256 ffa8bc2ca5f3d30f60ab339b1410552de4e6b1edea458197aa5745fac27a0a65 SHA512 cfa5791fbcfb7d06e08b21fc1b6691e8269f0e8979ba50babf025769a71e34a6047f31c1d812328339609deffd76492db851bc71feffe61cef7b614e76498327 WHIRLPOOL 8ade9313d63c084732249542b7b8acb114205890692a36c9a614a5019640967ca2434657903f79d1150a6db1fae2c0af70e6f921081104117e69f37797d33acc
-MISC ChangeLog 61123 SHA256 1900352d412f5689bdbec891eb36612179706272eb4988ce5640f7a19ad73811 SHA512 d4e9e39e76c53d979b146776d2c6a11cfd11b88be64252d8e341c998194e394495bfc64bd051deada5b21aa69334f8a03e8042bd450212a8d802b2b4e54f10fb WHIRLPOOL 92e9f1a20e4d1bd81d5ecf80c4e4048f61d96bbd2d8089f9aa91b35ebb05446bd0bf00bcc06e68bfc03298e02b06a698d36a635ceb5fcd0b344d12dfa2027589
+EBUILD udev-9999.ebuild 14776 SHA256 157068bd412e884a3397fd8474bcb45f213381337c41daa8d3d899c82a45ef71 SHA512 72bd8354bcc2686cb9a7b57d24eeb57e0292ff1b059473137825ee6e141ba15558aa977ac796fba80971e2b00943dec8698b81625ad3081fcd7424938783b3d8 WHIRLPOOL a1b320a8ebd7db6fac4f8791b2c3cb06e581dd1faa6c55f9bc3154951f9e004f4a470b805d4bc178c36440230711e0104558239417409268872476cb3153d552
+MISC ChangeLog 61256 SHA256 8324c7d65a37c2361bfc8ee15854b1e79b1ce4fb1b436cafd12616c77af053ea SHA512 7c7bd69c1e5b1ca4987f6252ee3b4b93971c84cbe86b4b69041435e670341fd71172d195cc643c5feb61d1eae6a3e04fe9d7a8a54cdde8c030a6ee6fbd2a12ca WHIRLPOOL ce41df3bcf463eb8ed9e80b3f4842ec1bedf551ae3f5fe04db55075583845ad6b79f81be87120bf233726c36d04f1b81a15c61f20ce2ef0899acf310c9f427be
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -28,7 +28,7 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVzMQcACgkQblQW9DDEZTh9OACfeXgzGwQDyjE/YQn4p9z3pokh
-mkgAmwT77xMNCKqgAA4yvCXUmY8gf8St
-=teMx
+iF0EAREIAAYFAlV3ovkACgkQRxvnM+8pGj+zMAEAvUXpxMT/D874ggaMOirsUCOj
+E7oYm4fhulQfRDtn/NYA+Kmhk+rT6+pL/83Azwd+MC5xf1lbCDqJYs4Aar65fAU=
+=fqlW
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 50e3d0877898..234b7be3ba1b 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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-fs/udev/udev-9999.ebuild,v 1.327 2015/06/06 17:42:24 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.328 2015/06/10 02:37:44 floppym Exp $
 
 EAPI=5
 
@@ -26,14 +26,12 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl doc gudev introspection +kmod selinux static-libs"
+IUSE="acl doc +kmod selinux static-libs"
 
 RESTRICT="test"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	acl? ( sys-apps/acl )
-	gudev? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
@@ -51,8 +49,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/os-headers
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-3.9
-	doc? ( >=dev-util/gtk-doc-1.18 )"
+	>=sys-kernel/linux-headers-3.9"
 # Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs
 if [[ ${PV} = 9999* ]]; then
 	DEPEND="${DEPEND}
@@ -135,11 +132,6 @@ src_prepare() {
 	epatch_user
 
 	if [[ ! -e configure ]]; then
-		if use doc; then
-			gtkdocize --docdir docs || die "gtkdocize failed"
-		else
-			echo 'EXTRA_DIST =' > docs/gtk-doc.make
-		fi
 		eautoreconf
 	else
 		check_default_rules
@@ -171,7 +163,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable static-libs static)
 		--disable-nls
 		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable introspection)
 		--disable-python-devel
 		--disable-dbus
 		$(multilib_native_use_enable kmod)
@@ -195,7 +186,6 @@ multilib_src_configure() {
 		--disable-polkit
 		--disable-terminal
 		--disable-myhostname
-		$(use_enable gudev)
 		$(multilib_is_native_abi || echo "--disable-manpages")
 		--enable-split-usr
 		--with-html-dir=/usr/share/doc/${PF}/html
@@ -227,7 +217,6 @@ multilib_src_compile() {
 	# early enough, like eg. libsystemd-shared.la
 	if multilib_is_native_abi; then
 		local lib_targets=( libudev.la )
-		use gudev && lib_targets+=( libgudev-1.0.la )
 		emake "${lib_targets[@]}"
 
 		local exec_targets=(
@@ -260,11 +249,9 @@ multilib_src_compile() {
 
 		if use doc; then
 			emake -C docs/libudev
-			use gudev && emake -C docs/gudev
 		fi
 	else
 		local lib_targets=( libudev.la )
-		use gudev && lib_targets+=( libgudev-1.0.la )
 		emake "${lib_targets[@]}"
 	fi
 }
@@ -277,7 +264,6 @@ multilib_src_install() {
 		local targets=(
 			install-libLTLIBRARIES
 			install-includeHEADERS
-			install-libgudev_includeHEADERS
 			install-rootbinPROGRAMS
 			install-rootlibexecPROGRAMS
 			install-udevlibexecPROGRAMS
@@ -294,11 +280,6 @@ multilib_src_install() {
 			install-dist_networkDATA
 		)
 
-		if use gudev; then
-			lib_LTLIBRARIES+=" libgudev-1.0.la"
-			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-		fi
-
 		# add final values of variables:
 		targets+=(
 			rootlibexec_PROGRAMS=systemd-udevd
@@ -316,7 +297,6 @@ multilib_src_install() {
 
 		if use doc; then
 			emake -C docs/libudev DESTDIR="${D}" install
-			use gudev && emake -C docs/gudev DESTDIR="${D}" install
 		fi
 
 		if [[ ${PV} = 9999* ]]; then
@@ -335,11 +315,6 @@ multilib_src_install() {
 			install-pkgconfiglibDATA
 		)
 
-		if use gudev; then
-			lib_LTLIBRARIES+=" libgudev-1.0.la"
-			pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-		fi
-
 		targets+=(
 			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
 			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
@@ -366,9 +341,6 @@ multilib_src_install_all() {
 	mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
 
 	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
@@ -376,7 +348,7 @@ multilib_src_install_all() {
 
 pkg_preinst() {
 	local htmldir
-	for htmldir in gudev libudev; do
+	for htmldir in libudev; do
 		if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then
 			rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir}
 		fi