[patch] udev-186.ebuild.patch

udev-186.ebuild.patch (text/plain), 2.33 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2012-07-05 18:09:40 UTC

--- udev-186.ebuild
+++ udev-186.ebuild
@@ -106,6 +106,8 @@
 
 src_prepare()
 {
+	epatch "${FILESDIR}"/${PN}-186-revert-systemd-messup.patch
+
 	# change rules back to group uucp instead of dialout for now
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
 		-i rules/*.rules \
@@ -121,6 +123,7 @@
 		eautoreconf
 	else
 		check_default_rules
+		eautoreconf
 		elibtoolize
 	fi
 }
@@ -138,8 +141,10 @@
 	local switches
 
 	switches=(
+		--bindir=/bin
+		--sbindir=/sbin
 		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
+		--libdir=/$(get_libdir)
 		--with-distro=gentoo
 		--with-html-dir=/usr/share/doc/${PF}/html
 		--with-pci-ids-path=/usr/share/misc/pci.ids
@@ -176,7 +181,7 @@
 	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
 	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
 	local targets=(
-		systemd-udevd
+		udevd
 		udevadm
 		libudev.la
 		ata_id
@@ -188,8 +193,7 @@
 		mtd_probe
 		man/udev.7
 		man/udevadm.8
-		man/systemd-udevd.8
-		man/systemd-udevd.service.8
+		man/udevd.8
 	)
 	use keymap && targets+=( keymap )
 	use gudev && targets+=( libgudev-1.0.la )
@@ -210,6 +214,7 @@
 		install-libLTLIBRARIES
 		install-includeHEADERS
 		install-libgudev_includeHEADERS
+		install-sbinPROGRAMS
 		install-binPROGRAMS
 		install-rootlibexecPROGRAMS
 		install-udevlibexecPROGRAMS
@@ -239,10 +244,11 @@
 	# add final values of variables:
 	targets+=(
 		udevlibexecdir=/lib/udev
-		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
+		rootlibexec_PROGRAMS=""
+		bin_PROGRAMS=""
+		sbin_PROGRAMS="udevd udevadm"
 		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8"
+		MANPAGES="man/udev.7 man/udevadm.8 man/udevd.8"
 		MANPAGES_ALIAS="man/systemd-udevd.8"
 		dist_systemunit_DATA="units/systemd-udevd-control.socket \
 			units/systemd-udevd-kernel.socket"
@@ -262,14 +268,15 @@
 		use gudev && emake -C docs/gudev DESTDIR="${D}" install
 	fi
 
+	# move pkgconfig data to /usr
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/pkgconfig "${D}"/usr/$(get_libdir) || die
+
 	prune_libtool_files --all
 
 	# remove rule that should be installed by systemd
 	rm -f "${ED}"/lib/udev/rules.d/99-systemd.rules
 
-	# udevadm is now in /usr/bin
-	dosym ../usr/bin/udevadm /sbin/udevadm
-
 	# Now install rules
 	insinto /lib/udev/rules.d
 	doins "${FILESDIR}"/40-gentoo.rules