From 63228455da9b2cbef949ff54947056bee3bfeea1 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Wed, 28 Mar 2012 14:07:24 +0000 Subject: Fix overzealous sed that doesn't apply for <8.4.0 wrt bug 409981 by Marcin Mirosław MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.0_alpha94/cvs/Linux x86_64) --- sys-cluster/drbd/ChangeLog | 7 ++++++- sys-cluster/drbd/drbd-8.3.12.ebuild | 4 ++-- sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'sys-cluster') diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog index a940a0697ec3..efe8a326dda7 100644 --- a/sys-cluster/drbd/ChangeLog +++ b/sys-cluster/drbd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/drbd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.117 2012/03/12 20:47:00 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.118 2012/03/28 14:07:24 xarthisius Exp $ + + 28 Mar 2012; Kacper Kowalik drbd-8.3.12.ebuild, + drbd-8.3.8.1-r1.ebuild: + Fix overzealous sed that doesn't apply for <8.4.0 wrt bug 409981 by Marcin + Mirosław 12 Mar 2012; Kacper Kowalik drbd-8.3.12.ebuild, drbd-8.3.8.1-r1.ebuild, drbd-8.4.0.ebuild: diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild index 7806c795b8a2..3e276c408b80 100644 --- a/sys-cluster/drbd/drbd-8.3.12.ebuild +++ b/sys-cluster/drbd/drbd-8.3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.12.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.12.ebuild,v 1.3 2012/03/28 14:07:24 xarthisius Exp $ EAPI=4 @@ -25,7 +25,7 @@ src_prepare() { Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ - -i user/{,legacy/}Makefile.in || die + -i user/Makefile.in || die # correct install paths sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \ scripts/Makefile.in || die diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild index 5e720b4eadad..e6f718dc1735 100644 --- a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild +++ b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild,v 1.3 2012/03/28 14:07:24 xarthisius Exp $ EAPI="2" @@ -24,7 +24,7 @@ src_prepare() { Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ - -i user/{,legacy/}Makefile.in || die + -i user/Makefile.in || die # correct install paths sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \ scripts/Makefile.in || die -- cgit v1.2.3-65-gdbad