Revision bump to fix missing net.modules.d in some configurations. Closes bug #78258.

Package-Manager: portage-2.0.51-r12

4 files changed, 38 insertions, 16 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 2d90c4706afb..272186970273 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.202 2005/01/16 18:10:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.203 2005/01/17 04:55:48 eradicator Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*baselayout-1.11.8-r3 (16 Jan 2005)
+
+  16 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.8-r2.ebuild, +baselayout-1.11.8-r3.ebuild:
+  Revision bump to fix missing net.modules.d in some configurations. -- bug
+  #78258.  Removed ~ppc64 from KEYWORDS.  ppc64 people, check what this does
+  on fresh installs (ie.  use it in catalyst).  I don't believe it will work
+  right with your current profiles because you are using 'lib' when you should
+  be using lib64 for your libdir.
+
   16 Jan 2005; Markus Rothe <corsair@gentoo.org> baselayout-1.11.8-r2.ebuild:
   Added ~ppc64 to KEYWORDS
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index fe59cc3fdf87..a3809d0587d1 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,21 +1,31 @@
-MD5 0fa96325957a83b2cc4953d3397e451b ChangeLog 45599
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 168b429506474803e3d2592fe2e10690 ChangeLog 46101
 MD5 c79e8a69ea8161be1c6fc7aea865206e baselayout-1.11.7-r2.ebuild 15745
 MD5 d9e60daa58a85965186f7dbecac8516d baselayout-1.11.8.ebuild 15655
-MD5 d64d3bb2ac5c8592e3031772dbc2ef0d baselayout-1.11.8-r2.ebuild 16782
-MD5 e819385f8aa5ac0f1a8ad035a6b9c7f7 baselayout-1.9.4-r7.ebuild 18118
 MD5 245e39f14052cacd4e495fa02ecf2163 baselayout-1.9.4-r6.ebuild 16835
+MD5 e819385f8aa5ac0f1a8ad035a6b9c7f7 baselayout-1.9.4-r7.ebuild 18118
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 313c753113888932800797c600f462ce baselayout-1.11.8-r3.ebuild 16882
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r2 69
-MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433
-MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
-MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653
 MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8 69
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
+MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
+MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433
+MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
+MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653
 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
-MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r2 69
-MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r7 134
+MD5 68ea8c716616fbfd5b287dadb5e9ea5c files/digest-baselayout-1.11.8-r3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB60VeArHZZzCEUG0RAr8FAJ9o2GzHfldTwenGOTYaMdqFTfPtLACeMAuP
+yzY367iDM2e3lsZZKzPJw98=
+=5PN/
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.8-r3.ebuild
index 35f8fda3a387..828a395e8186 100644
--- a/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8-r2.ebuild,v 1.3 2005/01/16 18:10:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.8-r3.ebuild,v 1.1 2005/01/17 04:55:48 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/rc-scripts-${SV}${SVREV}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64"
 IUSE="bootstrap build livecd static uclibc"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
@@ -131,6 +131,7 @@ src_install() {
 	libdirs=$(get_all_libdirs)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
+	# This should be /lib/rcscripts, but we have to support old profiles too.
 	if [ "${SYMLINK_LIB}" = "yes" ]; then
 		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
 	else
@@ -158,10 +159,11 @@ src_install() {
 	kdir /home
 	kdir /lib/dev-state
 	kdir /lib/udev-state
-	kdir /lib/rcscripts/awk
-	kdir /lib/rcscripts/sh
-	dodir /lib/rcscripts/net.modules.d	# .keep file messes up net.lo
-	dodir /lib/rcscripts/net.modules.d/helpers.d
+	kdir ${rcscripts_dir}
+	kdir ${rcscripts_dir}/awk
+	kdir ${rcscripts_dir}/sh
+	dodir ${rcscripts_dir}/net.modules.d	# .keep file messes up net.lo
+	dodir ${rcscripts_dir}/net.modules.d/helpers.d
 	kdir /mnt
 	kdir -m 0700 /mnt/cdrom
 	kdir -m 0700 /mnt/floppy
@@ -342,7 +344,7 @@ src_install() {
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
 	dodir ${rcscripts_dir}
-	cp -a ${S}${rcscripts_dir}/net.modules.d ${D}${rcscripts_dir}
+	cp -a ${S}/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
 	chown -R root:root ${D}${rcscripts_dir}
 
 	#
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.8-r2 b/sys-apps/baselayout/files/digest-baselayout-1.11.8-r3
index 1c2c95a8c564..1c2c95a8c564 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.8-r2
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.8-r3