[gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild

[Mike Frysinger (vapier)]

vapier      08/03/25 12:26:52

  Modified:             openrc-9999.ebuild
  Log:
  use module_<mod>_args_<ver> now that openrc supports it
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.8                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.7&r2=1.8

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openrc-9999.ebuild	25 Mar 2008 00:13:15 -0000	1.7
+++ openrc-9999.ebuild	25 Mar 2008 12:26:51 -0000	1.8
@@ -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/openrc/openrc-9999.ebuild,v 1.7 2008/03/25 00:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.8 2008/03/25 12:26:51 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -140,7 +140,7 @@
 					if ($0 ~ /^[^#]/) {
 						print "modules_" v "=\"${modules_" v "} " $1 "\""
 						gsub(/[^[:alnum:]]/, "_", $1)
-						printf "module_" $1 "_args=\""
+						printf "module_" $1 "_args_" v "=\""
 						for (i = 2; i <= NF; ++i) {
 							if (i > 2)
 								printf " "
@@ -152,8 +152,8 @@
 				}
 				END { print "\n### END: Auto-converted from " f "\n" }
 				' "${f}" >> "${D}"/etc/conf.d/modules
-				rm -f "${f}"
 			done
+				rm -f "${f}"
 			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
 		fi
 	fi



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