From 84f97f92cf3c92df39dfbe6984e366f9af333a98 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 1 Jul 2012 18:52:49 +0000
Subject: Fix destdir installs #424237 by PetaMem R&D.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)
---
 dev-util/makepp/ChangeLog                      |  8 +++-
 dev-util/makepp/files/makepp-2.0-destdir.patch | 13 +++++++
 dev-util/makepp/makepp-2.0-r1.ebuild           | 51 ++++++++++++++++++++++++++
 dev-util/makepp/makepp-2.0.ebuild              | 47 ------------------------
 4 files changed, 71 insertions(+), 48 deletions(-)
 create mode 100644 dev-util/makepp/files/makepp-2.0-destdir.patch
 create mode 100644 dev-util/makepp/makepp-2.0-r1.ebuild
 delete mode 100644 dev-util/makepp/makepp-2.0.ebuild

(limited to 'dev-util/makepp')

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-r1.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
new file mode 100644
index 000000000000..449c8c1c6412
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# 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-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"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
+	unpack ./${P}.tar.xz
+}
+
+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
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/makepp/makepp-2.0.ebuild b/dev-util/makepp/makepp-2.0.ebuild
deleted file mode 100644
index 2f345e46cfff..000000000000
--- a/dev-util/makepp/makepp-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 $
-
-EAPI="4"
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
-- 
cgit v1.2.3-65-gdbad