diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2012-03-12 20:47:00 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2012-03-12 20:47:00 +0000 |
| commit | 8b43c00f9556ed29a77590d10aed5cfe9080dd04 (patch) | |
| tree | d41a5dd81200a788e11fad5081481e985fae9361 /sys-cluster | |
| parent | Clean up old versions. (diff) | |
| download | gentoo-2-8b43c00f9556ed29a77590d10aed5cfe9080dd04.tar.gz gentoo-2-8b43c00f9556ed29a77590d10aed5cfe9080dd04.tar.bz2 gentoo-2-8b43c00f9556ed29a77590d10aed5cfe9080dd04.zip | |
Extend multilib fixes wrt bug 407961 by Robin Johnson <robbat2@gentoo.org>
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/drbd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-8.3.12.ebuild | 9 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild | 9 | ||||
| -rw-r--r-- | sys-cluster/drbd/drbd-8.4.0.ebuild | 9 |
4 files changed, 23 insertions, 10 deletions
diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog index 0c2959226fd8..a940a0697ec3 100644 --- a/sys-cluster/drbd/ChangeLog +++ b/sys-cluster/drbd/ChangeLog @@ -1,6 +1,10 @@ # 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.116 2012/01/04 17:42:50 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.117 2012/03/12 20:47:00 xarthisius Exp $ + + 12 Mar 2012; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.12.ebuild, + drbd-8.3.8.1-r1.ebuild, drbd-8.4.0.ebuild: + Extend multilib fixes wrt bug 407961 by Robin Johnson <robbat2@gentoo.org> 04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> drbd-8.3.11-r1.ebuild: x86 stable wrt bug #396207 diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild index 34dd1f38d9c4..7806c795b8a2 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-2011 Gentoo Foundation +# 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.1 2011/11/03 13:24:53 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.12.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $ EAPI=4 @@ -22,7 +22,10 @@ src_prepare() { sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die # respect multilib sed -i -e "s:/lib/:/$(get_libdir)/:g" \ - scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die + 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 # 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 4e462e31b5d3..5e720b4eadad 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-2011 Gentoo Foundation +# 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.1 2011/01/18 18:55:33 xarthisius Exp $ +# $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 $ EAPI="2" @@ -21,7 +21,10 @@ src_prepare() { sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die # respect multilib sed -i -e "s:/lib/:/$(get_libdir)/:g" \ - scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die + 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 # 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.4.0.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild index 25554893f3cc..bfca13b6de18 100644 --- a/sys-cluster/drbd/drbd-8.4.0.ebuild +++ b/sys-cluster/drbd/drbd-8.4.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.4.0.ebuild,v 1.1 2011/11/03 13:24:53 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.4.0.ebuild,v 1.2 2012/03/12 20:47:00 xarthisius Exp $ EAPI=4 @@ -22,7 +22,10 @@ src_prepare() { sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die # respect multilib sed -i -e "s:/lib/:/$(get_libdir)/:g" \ - scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die + 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 # correct install paths sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \ scripts/Makefile.in || die |