| 1 |
mgorny 14/08/28 16:55:33 |
| 2 |
|
| 3 |
Modified: drbd-8.4.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.11_p165/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-cluster/drbd/drbd-8.4.3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: drbd-8.4.3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- drbd-8.4.3.ebuild 30 Jul 2014 19:34:00 -0000 1.5 |
| 23 |
+++ drbd-8.4.3.ebuild 28 Aug 2014 16:55:33 -0000 1.6 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.5 2014/07/30 19:34:00 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.3.ebuild,v 1.6 2014/08/28 16:55:33 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
-inherit eutils multilib versionator udev |
| 33 |
+inherit bash-completion-r1 eutils multilib versionator udev |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
|
| 37 |
@@ -13,7 +13,7 @@ |
| 38 |
HOMEPAGE="http://www.drbd.org" |
| 39 |
|
| 40 |
KEYWORDS="~amd64 ~x86" |
| 41 |
-IUSE="bash-completion heartbeat pacemaker +udev xen" |
| 42 |
+IUSE="heartbeat pacemaker +udev xen" |
| 43 |
SLOT="0" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
@@ -27,8 +27,8 @@ |
| 47 |
sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ |
| 48 |
-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ |
| 49 |
-i user/{,legacy/}Makefile.in || die |
| 50 |
- # correct install paths |
| 51 |
- sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \ |
| 52 |
+ # correct install paths (really correct this time) |
| 53 |
+ sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ |
| 54 |
scripts/Makefile.in || die |
| 55 |
# don't participate in user survey bug 360483 |
| 56 |
sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die |
| 57 |
@@ -45,7 +45,7 @@ |
| 58 |
$(use_with xen) \ |
| 59 |
$(use_with pacemaker) \ |
| 60 |
$(use_with heartbeat) \ |
| 61 |
- $(use_with bash-completion bashcompletion) \ |
| 62 |
+ --with-bashcompletion \ |
| 63 |
--with-distro=gentoo |
| 64 |
} |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.133 sys-cluster/drbd/ChangeLog |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?rev=1.133&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?rev=1.133&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/drbd/ChangeLog?r1=1.132&r2=1.133 |
| 74 |
|
| 75 |
Index: ChangeLog |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v |
| 78 |
retrieving revision 1.132 |
| 79 |
retrieving revision 1.133 |
| 80 |
diff -u -r1.132 -r1.133 |
| 81 |
--- ChangeLog 30 Jul 2014 19:39:48 -0000 1.132 |
| 82 |
+++ ChangeLog 28 Aug 2014 16:55:33 -0000 1.133 |
| 83 |
@@ -1,6 +1,11 @@ |
| 84 |
# ChangeLog for sys-cluster/drbd |
| 85 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.132 2014/07/30 19:39:48 ssuominen Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.133 2014/08/28 16:55:33 mgorny Exp $ |
| 88 |
+ |
| 89 |
+ 28 Aug 2014; Michał Górny <mgorny@g.o> drbd-8.4.3.ebuild: |
| 90 |
+ Install the bash completion file to the correct location using bash- |
| 91 |
+ completion-r1. Remove USE=bash-completion since the file needs to be installed |
| 92 |
+ unconditionally. |
| 93 |
|
| 94 |
30 Jul 2014; Samuli Suominen <ssuominen@g.o> drbd-8.3.13.ebuild:, |
| 95 |
Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir() |
Archives