[gentoo-commits] gentoo-x86 commit in sys-apps/baselayout: ChangeLog baselayout-2.0.0.ebuild

[Mike Frysinger (vapier)]

vapier      08/05/10 10:03:38

  Modified:             ChangeLog baselayout-2.0.0.ebuild
  Log:
  Install the Makefile into $D so that we can use it in pkg_preinst steps (for binpkgs) #218877 by Kevin Cody Jr.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.468                sys-apps/baselayout/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.468&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?rev=1.468&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/ChangeLog?r1=1.467&r2=1.468

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- ChangeLog	19 Apr 2008 06:22:52 -0000	1.467
+++ ChangeLog	10 May 2008 10:03:38 -0000	1.468
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.467 2008/04/19 06:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.468 2008/05/10 10:03:38 vapier Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  10 May 2008; Mike Frysinger <vapier@g.o> baselayout-2.0.0.ebuild:
+  Install the Makefile into $D so that we can use it in pkg_preinst steps (for
+  binpkgs) #218877 by Kevin Cody Jr.
+
   19 Apr 2008; Mike Frysinger <vapier@g.o> baselayout-2.0.0.ebuild:
   Detect and display users with non-existent shells #215698.
 



1.5                  sys-apps/baselayout/baselayout-2.0.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild?r1=1.4&r2=1.5

Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- baselayout-2.0.0.ebuild	19 Apr 2008 06:22:52 -0000	1.4
+++ baselayout-2.0.0.ebuild	10 May 2008 10:03:38 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.4 2008/04/19 06:22:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v 1.5 2008/05/10 10:03:38 vapier Exp $
 
 inherit multilib
 
@@ -49,8 +49,9 @@
 			ln -s "${lib}" "${ROOT}usr/local/lib"
 		fi
 
-		emake -C "${T}" $(make_opts) DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
+		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die "failed to layout filesystem"
 	fi
+	rm -f "${D}"/usr/share/${PN}/Makefile
 }
 
 src_install() {
@@ -64,6 +65,10 @@
 		install || die
 	dodoc ChangeLog
 
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile || die
+
 	# Should this belong in another ebuild? Like say binutils?
 	# List all the multilib libdirs in /etc/env/04multilib (only if they're
 	# actually different from the normal



-- 
gentoo-commits@l.g.o mailing list