Fix destdir installs #424237 by PetaMem R&D.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

3 files changed, 25 insertions, 2 deletions

diff --git a/dev-util/makepp/ChangeLog b/dev-util/makepp/ChangeLog
index bd5ca6a4550b..5a66bf691f6c 100644
--- a/dev-util/makepp/ChangeLog
+++ b/dev-util/makepp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/makepp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/makepp/ChangeLog,v 1.5 2012/06/30 15:56:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/makepp/ChangeLog,v 1.6 2012/07/01 18:52:49 vapier Exp $
+
+*makepp-2.0-r1 (01 Jul 2012)
+
+  01 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/makepp-2.0-destdir.patch, +makepp-2.0-r1.ebuild, -makepp-2.0.ebuild:
+  Fix destdir installs #424237 by PetaMem R&D.
 
 *makepp-2.0 (30 Jun 2012)
 
diff --git a/dev-util/makepp/files/makepp-2.0-destdir.patch b/dev-util/makepp/files/makepp-2.0-destdir.patch
new file mode 100644
index 000000000000..7d7950b2dff4
--- /dev/null
+++ b/dev-util/makepp/files/makepp-2.0-destdir.patch
@@ -0,0 +1,13 @@
+don't break install paths when DESTDIR is set
+
+--- a/install.pl
++++ b/install.pl
+@@ -131,7 +131,7 @@
+ 
+ if( $destdir ) {
+   for( $bindir, $datadir, $mandir, $htmldir_val ) {
+-    s/$prefix/$destdir/o if defined;
++    s/^/$destdir/o if defined;
+   }
+ }
+ 
diff --git a/dev-util/makepp/makepp-2.0.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
index 2f345e46cfff..449c8c1c6412 100644
--- a/dev-util/makepp/makepp-2.0.ebuild
+++ b/dev-util/makepp/makepp-2.0-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/makepp/makepp-2.0.ebuild,v 1.1 2012/06/30 15:56:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/makepp/makepp-2.0-r1.ebuild,v 1.1 2012/07/01 18:52:49 vapier Exp $
 
 EAPI="4"
 
+inherit eutils
+
 MY_PV=${PV/_}
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="GNU make replacement"
@@ -25,6 +27,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0-destdir.patch
+
 	# default "all" rule is to run tests :x
 	sed -i '/^all:/s:test::' config.pl || die
 }