mgorny 14/08/28 16:55:33 Modified: drbd-8.4.3.ebuild ChangeLog Log: Install the bash completion file to the correct location using bash-completion-r1. Remove USE=bash-completion since the file needs to be installed unconditionally. (Portage version: 2.2.11_p165/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.6 sys-cluster/drbd/drbd-8.4.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?r1=1.5&r2=1.6 Index: drbd-8.4.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- drbd-8.4.3.ebuild 30 Jul 2014 19:34:00 -0000 1.5 +++ drbd-8.4.3.ebuild 28 Aug 2014 16:55:33 -0000 1.6 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.5 2014/07/30 19:34:00 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.6 2014/08/28 16:55:33 mgorny Exp $ EAPI=4 -inherit eutils multilib versionator udev +inherit bash-completion-r1 eutils multilib versionator udev LICENSE="GPL-2" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.drbd.org"; KEYWORDS="~amd64 ~x86" -IUSE="bash-completion heartbeat pacemaker +udev xen" +IUSE="heartbeat pacemaker +udev xen" SLOT="0" src_prepare() { @@ -27,8 +27,8 @@ sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ -i user/{,legacy/}Makefile.in || die - # correct install paths - sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \ + # correct install paths (really correct this time) + sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ scripts/Makefile.in || die # don't participate in user survey bug 360483 sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die @@ -45,7 +45,7 @@ $(use_with xen) \ $(use_with pacemaker) \ $(use_with heartbeat) \ - $(use_with bash-completion bashcompletion) \ + --with-bashcompletion \ --with-distro=gentoo } 1.133 sys-cluster/drbd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?rev=1.133&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?rev=1.133&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?r1=1.132&r2=1.133 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- ChangeLog 30 Jul 2014 19:39:48 -0000 1.132 +++ ChangeLog 28 Aug 2014 16:55:33 -0000 1.133 @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/drbd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.132 2014/07/30 19:39:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.133 2014/08/28 16:55:33 mgorny Exp $ + + 28 Aug 2014; Michał Górny <[email protected]> drbd-8.4.3.ebuild: + Install the bash completion file to the correct location using bash- + completion-r1. Remove USE=bash-completion since the file needs to be installed + unconditionally. 30 Jul 2014; Samuli Suominen <[email protected]> drbd-8.3.13.ebuild:, Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
