commit: 1dc1195271f1723ea1708dd29133106a57c11258 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jun 4 03:20:36 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jun 4 03:21:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc11952
sys-fs/udev: eliminate pointless backslashes Overuse of backslash escapes led to a weird directory named ' ' being installed in the root directory. Thanks to Coacher for spotting the weird directory. Bug: https://bugs.gentoo.org/584256 Package-Manager: portage-2.3.0_rc1_p14 sys-fs/udev/{udev-225.ebuild => udev-225-r1.ebuild} | 19 ++++++++----------- sys-fs/udev/{udev-230.ebuild => udev-230-r1.ebuild} | 19 ++++++++----------- sys-fs/udev/udev-9999.ebuild | 19 ++++++++----------- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225-r1.ebuild similarity index 96% rename from sys-fs/udev/udev-225.ebuild rename to sys-fs/udev/udev-225-r1.ebuild index 3a1d0ba..18bfd8c 100644 --- a/sys-fs/udev/udev-225.ebuild +++ b/sys-fs/udev/udev-225-r1.ebuild @@ -250,8 +250,8 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" local targets=( install-libLTLIBRARIES @@ -277,18 +277,16 @@ multilib_src_install() { lib_LTLIBRARIES="${lib_LTLIBRARIES}" pkgconfiglib_DATA="${pkgconfiglib_DATA}" pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ - $(sysconfdir)/udev/hwdb.d \ - $(sysconfdir)/systemd/network' + INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' dist_bashcompletion_DATA="shell-completion/bash/udevadm" dist_network_DATA="network/99-default.link" ) emake -j1 DESTDIR="${D}" "${targets[@]}" doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} else - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" \ - include_HEADERS="src/libudev/libudev.h" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" + local include_HEADERS="src/libudev/libudev.h" local targets=( install-libLTLIBRARIES @@ -309,9 +307,8 @@ multilib_src_install_all() { dodoc TODO prune_libtool_files --all - rm -f \ - "${D}"/lib/udev/rules.d/99-systemd.rules \ - "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} + rm -f "${D}"/lib/udev/rules.d/99-systemd.rules + rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} # see src_prepare() for content of 40-gentoo.rules insinto /lib/udev/rules.d diff --git a/sys-fs/udev/udev-230.ebuild b/sys-fs/udev/udev-230-r1.ebuild similarity index 96% rename from sys-fs/udev/udev-230.ebuild rename to sys-fs/udev/udev-230-r1.ebuild index 08f87f6..ef0b093 100644 --- a/sys-fs/udev/udev-230.ebuild +++ b/sys-fs/udev/udev-230-r1.ebuild @@ -251,8 +251,8 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" local targets=( install-libLTLIBRARIES @@ -278,18 +278,16 @@ multilib_src_install() { lib_LTLIBRARIES="${lib_LTLIBRARIES}" pkgconfiglib_DATA="${pkgconfiglib_DATA}" pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ - $(sysconfdir)/udev/hwdb.d \ - $(sysconfdir)/systemd/network' + INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' dist_bashcompletion_DATA="shell-completion/bash/udevadm" dist_network_DATA="network/99-default.link" ) emake -j1 DESTDIR="${D}" "${targets[@]}" doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} else - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" \ - include_HEADERS="src/libudev/libudev.h" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" + local include_HEADERS="src/libudev/libudev.h" local targets=( install-libLTLIBRARIES @@ -310,9 +308,8 @@ multilib_src_install_all() { dodoc TODO prune_libtool_files --all - rm -f \ - "${D}"/lib/udev/rules.d/99-systemd.rules \ - "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} + rm -f "${D}"/lib/udev/rules.d/99-systemd.rules + rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} # see src_prepare() for content of 40-gentoo.rules insinto /lib/udev/rules.d diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 8779e43..6f25076 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -251,8 +251,8 @@ multilib_src_compile() { multilib_src_install() { if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" local targets=( install-libLTLIBRARIES @@ -278,18 +278,16 @@ multilib_src_install() { lib_LTLIBRARIES="${lib_LTLIBRARIES}" pkgconfiglib_DATA="${pkgconfiglib_DATA}" pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ - $(sysconfdir)/udev/hwdb.d \ - $(sysconfdir)/systemd/network' + INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' dist_bashcompletion_DATA="shell-completion/bash/udevadm" dist_network_DATA="network/99-default.link" ) emake -j1 DESTDIR="${D}" "${targets[@]}" doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} else - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" \ - include_HEADERS="src/libudev/libudev.h" + local lib_LTLIBRARIES="libudev.la" + local pkgconfiglib_DATA="src/libudev/libudev.pc" + local include_HEADERS="src/libudev/libudev.h" local targets=( install-libLTLIBRARIES @@ -310,9 +308,8 @@ multilib_src_install_all() { dodoc TODO prune_libtool_files --all - rm -f \ - "${D}"/lib/udev/rules.d/99-systemd.rules \ - "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} + rm -f "${D}"/lib/udev/rules.d/99-systemd.rules + rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} # see src_prepare() for content of 40-gentoo.rules insinto /lib/udev/rules.d
