[gentoo-commits] proj/gentoo-bsd:master commit in: dev-util/catalyst/files/, dev-util/catalyst/

["Yuta SATOH" <nigoro.gentoo@0x100.com>]

commit:     c3979c22715756d7d1ffda9153bd66f760411057
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Oct 13 09:32:56 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Oct 13 09:32:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c3979c22

update catalyst-2.0.11-fbsd.patch, added GNU sed wrapper, fix bug 438112

---
 dev-util/catalyst/Manifest                         |    2 +-
 dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch |  154 +++++---------------
 2 files changed, 39 insertions(+), 117 deletions(-)

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 377b4e5..b8ded41 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 AUX 2.0.8.1-arm-softfp.patch 1551 SHA256 54ae43557d15bd51d6227aec8160d61c07e45b1cb6b6c8f11fe1c4804772afcc SHA512 93b90a36a1c9d737a06b5b78df583f0b99ef26704b6fd615bb01dda4e101d3287ae4c4d65df2d51ce1b1ed21a2a267d6c32c7c26de785fc5b4f83b7ed480b49d WHIRLPOOL 6de731b98cec1c28280992b0228885a03beab7d281582ad27f3980771c3e521178bd88cb33791ab15be2ccd9e2d1e169c6158967fdc614cfba3b528cdcfa2bfd
 AUX catalyst-2.0.10.1-fbsd.patch 7223 SHA256 ea4d2ee2cc2dae5f2d3b12109fbe11ab930db926d00618279a76ce4cf11980ef SHA512 2e13ee67ef4bfed1433ab02a200908321effba3bcf6ad82396cf6df7116f21dbadea7e1c88c40ccec506a5d9f3edc51db703ba07f108f5584a38d6aa8d16f8f0 WHIRLPOOL b206dbc0bd7567eea2f9172ea9dad3e67946c669b67814d3dfe0b1a24c5cdf1b5abaa2c707ade9b209911601fab6a1a3e89bb2cd7c56b00e0fb8ccfa0defc0c0
-AUX catalyst-2.0.11-fbsd.patch 8054 SHA256 fedfca6a7472bf2821cae642cf0b9ac0b4f5c2a732079b22ac272dab8d7c4988 SHA512 510cd04fa31d9ab5c4cebe1935c3a2b2326f58792de23c0c7a1616977270803d4f77809d3b05f1d90be5e31b1ad449121c8de0d925387e4c9f9a713076e346bd WHIRLPOOL 9d300c280ed2967d926a4d7ca38f4463f2d5e4cfb251105366627c448eb938908ac3ce3d7a1a8f104cd11275c56301f45c4efee48e30a08b5d13510ff5e1452d
+AUX catalyst-2.0.11-fbsd.patch 4763 SHA256 35cb646dd3a12142bfe25e2f7f4f99b067ca18d948291f3391bee0208423209f SHA512 9fc2d595825e8b07b77d1a06862c04b8c58517a4e86bebe922c442e7fdabe834c6331936f8b8002aa220d7110595e1c7b14df50df08f544bfad3ab52dc522fdc WHIRLPOOL 1358eacd093678b48fe190d43d7048ec4d325350dca04509790ce26522e405185260c8fcd7884ba68f57912a63553b6356462c481babf28dc4b96670fdf39653
 DIST catalyst-2.0.10.1.tar.bz2 909073 SHA256 3ed2217c579dcc01e13afc017dbfea869d2c99a0c169290e678fc113db6891ed SHA512 b21e576a41926b8f71a76410c2e3e593267994cb5bdb39639add001a610f6c481ac7506ec88caf6016f65ecc09c86bae9a78812b3dc2879e32046e118c0e5671 WHIRLPOOL 168d20e1ff19005b647230852d249552fd98d50e9ece0ca19b5e3b743a971255f9065f8832fb7e29ef8f561ca8f40fe1f9f8732f54c4d9d233cd2df8ab7c42ad
 DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b
 EBUILD catalyst-2.0.10.1.ebuild 3331 SHA256 e16830ca69796659ed19fb00121a920b3ef66a0be9db63d09261b08f76eeb111 SHA512 48f60b6350f567f028e6ca466eacbdafcdf2defc5f9fcc98f9be109aed871cab5b5c5f67a42b1fb1909160ded86fdb1451449aca0de7329765afbe536efa96a1 WHIRLPOOL 35efea44ffa1af504daacbf4202b7aa28b26a35f4bc0d9b0d351e88f48c575883170f1547a3f8d02d5e1f9d86f98302d3481f17e8f9cf50305eb0c6f21fa2801

diff --git a/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch b/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch
index 07201d3..0fa2321 100644
--- a/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch
+++ b/dev-util/catalyst/files/catalyst-2.0.11-fbsd.patch
@@ -1,6 +1,6 @@
 diff -Nur catalyst-2.0.11.orig/arch/x86.py catalyst-2.0.11/arch/x86.py
 --- catalyst-2.0.11.orig/arch/x86.py	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/arch/x86.py	2012-10-12 23:34:15.000000000 +0900
++++ catalyst-2.0.11/arch/x86.py	2012-10-13 17:25:26.000000000 +0900
 @@ -7,9 +7,12 @@
  	def __init__(self,myspec):
  		builder.generic.__init__(self,myspec)
@@ -19,7 +19,16 @@ diff -Nur catalyst-2.0.11.orig/arch/x86.py catalyst-2.0.11/arch/x86.py
  			self.settings["CHROOT"]="chroot"
 diff -Nur catalyst-2.0.11.orig/modules/generic_stage_target.py catalyst-2.0.11/modules/generic_stage_target.py
 --- catalyst-2.0.11.orig/modules/generic_stage_target.py	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/modules/generic_stage_target.py	2012-10-12 23:34:15.000000000 +0900
++++ catalyst-2.0.11/modules/generic_stage_target.py	2012-10-13 17:32:58.000000000 +0900
+@@ -400,7 +400,7 @@
+ 
+ 	def set_cleanables(self):
+ 		self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/tmp/*",\
+-			"/root/*","/usr/portage"]
++			"/root/*","/usr/portage","/etc/portage/make.conf.catalyst"]
+ 
+ 	def set_snapshot_path(self):
+ 		self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
 @@ -1083,9 +1083,15 @@
  		if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):
  			cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\
@@ -41,7 +50,7 @@ diff -Nur catalyst-2.0.11.orig/modules/generic_stage_target.py catalyst-2.0.11/m
  		if os.path.exists(self.settings["stage_path"]+"/etc"):
 diff -Nur catalyst-2.0.11.orig/modules/stage1_target.py catalyst-2.0.11/modules/stage1_target.py
 --- catalyst-2.0.11.orig/modules/stage1_target.py	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/modules/stage1_target.py	2012-10-12 23:34:15.000000000 +0900
++++ catalyst-2.0.11/modules/stage1_target.py	2012-10-13 17:25:26.000000000 +0900
 @@ -92,10 +92,14 @@
  		# stage_path/proc probably doesn't exist yet, so create it
  		if not os.path.exists(self.settings["stage_path"]+"/proc"):
@@ -57,130 +66,43 @@ diff -Nur catalyst-2.0.11.orig/modules/stage1_target.py catalyst-2.0.11/modules/
  
  	def set_update_seed(self):
  		if self.settings.has_key("update_seed"):
-diff -Nur catalyst-2.0.11.orig/modules/stage3_target.py catalyst-2.0.11/modules/stage3_target.py
---- catalyst-2.0.11.orig/modules/stage3_target.py	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/modules/stage3_target.py	2012-10-12 23:34:15.000000000 +0900
-@@ -12,9 +12,13 @@
- 	"""
- 	def __init__(self,spec,addlargs):
- 		self.required_values=[]
--		self.valid_values=[]
-+		self.valid_values=["chost"]
- 		generic_stage_target.__init__(self,spec,addlargs)
- 
-+	def override_chost(self):
-+		if self.settings.has_key("chost"):
-+			self.settings["CHOST"]=list_to_string(self.settings["chost"])
-+
- 	def set_portage_overlay(self):
- 		generic_stage_target.set_portage_overlay(self)
- 		if self.settings.has_key("portage_overlay"):
-diff -Nur catalyst-2.0.11.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.11/targets/stage1/stage1-chroot.sh
---- catalyst-2.0.11.orig/targets/stage1/stage1-chroot.sh	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/targets/stage1/stage1-chroot.sh	2012-10-12 23:36:40.000000000 +0900
-@@ -1,6 +1,7 @@
- #!/bin/bash
- 
- source /tmp/chroot-functions.sh
-+sed_selector
- 
- # We do this first, so we know our package list for --debug
- export clst_buildpkgs="$(/tmp/build.py)"
-@@ -32,7 +33,13 @@
- 	echo 'USE="${USE} -build"' >> /etc/portage/make.conf
- run_merge "--oneshot --nodeps sys-apps/baselayout"
- 
--sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
-+## dirty fix
-+#The following USE changes are necessary to proceed:
-+#required by dev-perl/XML-Parser-2.410.0-r1, required by dev-util/intltool-0.50.2, required by x11-misc/shared-mime-info-1.0, required by dev-libs/glib-2.32.4-r1, required by dev-util/pkgconfig-0.27.1[-internal-glib], required by virtual/pkgconfig-0, required by net-misc/wget-1.14, required by wget (argument)
-+#>=dev-lang/perl-5.16.1 -build
-+ROOT=/ emerge -q "dev-util/gtk-doc-am"
-+
-+${SED} -i '/USE="${USE} -build"/d' /etc/portage/make.conf
- 
- # Next, we install the package manager
- clst_root_path=/ setup_pkgmgr
-@@ -43,5 +50,5 @@
- 	echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
- 	>> /etc/portage/make.conf
- run_merge "--oneshot ${clst_buildpkgs}"
--sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
-+${SED} -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
- 	/etc/portage/make.conf
-diff -Nur catalyst-2.0.11.orig/targets/stage1/stage1-preclean-chroot.sh catalyst-2.0.11/targets/stage1/stage1-preclean-chroot.sh
---- catalyst-2.0.11.orig/targets/stage1/stage1-preclean-chroot.sh	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/targets/stage1/stage1-preclean-chroot.sh	2012-10-12 23:34:15.000000000 +0900
-@@ -4,6 +4,8 @@
- 
- source /tmp/chroot-functions.sh
- 
-+sed_selector
-+${SED} -i '/^PORTDIR_OVERLAY/d' /etc/portage/make.conf
- update_env_settings
- show_debug
- 
 diff -Nur catalyst-2.0.11.orig/targets/stage3/stage3-chroot.sh catalyst-2.0.11/targets/stage3/stage3-chroot.sh
 --- catalyst-2.0.11.orig/targets/stage3/stage3-chroot.sh	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/targets/stage3/stage3-chroot.sh	2012-10-12 23:40:02.000000000 +0900
-@@ -6,3 +6,8 @@
++++ catalyst-2.0.11/targets/stage3/stage3-chroot.sh	2012-10-13 17:25:26.000000000 +0900
+@@ -5,4 +5,11 @@
+ ## START BUILD
  setup_pkgmgr
  
- run_merge "-e system"
-+
-+## dirty fix
-+# bug 438112
-+emerge -q "app-admin/eselect"
+-run_merge "-e system"
++if [[ $(uname) == "FreeBSD" ]] ; then
++	# workaround fix bug 438112
++	run_merge "-e @system --exclude=sys-apps/portage"
++	run_merge "sys-apps/portage"
++else
++	run_merge "-e system"
++fi
 +
 diff -Nur catalyst-2.0.11.orig/targets/support/chroot-functions.sh catalyst-2.0.11/targets/support/chroot-functions.sh
 --- catalyst-2.0.11.orig/targets/support/chroot-functions.sh	2012-09-09 06:38:02.000000000 +0900
-+++ catalyst-2.0.11/targets/support/chroot-functions.sh	2012-10-12 23:34:15.000000000 +0900
-@@ -63,6 +63,7 @@
- }
- 
- setup_myfeatures(){
-+	sed_selector
- 	setup_myemergeopts
- 	export FEATURES="-news"
- 	if [ -n "${clst_CCACHE}" ]
-@@ -87,7 +88,7 @@
- 		else
- 			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
- 		fi
--		sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf
-+		${SED} -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf
- 		mkdir -p /etc/distcc
- 		echo "${clst_distcc_hosts}" > /etc/distcc/hosts
- 
-@@ -171,7 +172,8 @@
- 	# Use --update or portage won't reinstall the same version.
- 	[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf
- 	run_merge --oneshot --nodeps --update sys-apps/portage
--	sed -i '/USE="${USE} build"/d' /etc/portage/make.conf
-+	sed_selector
-+	${SED} -i '/USE="${USE} build"/d' /etc/portage/make.conf
- }
- 
- cleanup_distcc() {
-@@ -237,7 +239,8 @@
- 
- make_destpath() {
- 	# ROOT is / by default, so remove any ROOT= settings from make.conf
--	sed -i '/ROOT=/d' /etc/portage/make.conf
-+	sed_selector
-+	${SED} -i '/ROOT=/d' /etc/portage/make.conf
- 	export ROOT=/
- 	if [ "${1}" != "/" -a -n "${1}" ] 
- 	then
-@@ -413,5 +416,13 @@
++++ catalyst-2.0.11/targets/support/chroot-functions.sh	2012-10-13 17:25:26.000000000 +0900
+@@ -413,5 +413,22 @@
  Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
  }
  
-+sed_selector() {
-+	if [ -e "/usr/bin/gsed" ]; then
-+		SED="gsed"
++# GNU sed wrapper
++sed(){
++	if [ -e /usr/bin/gsed ]
++	then
++		/usr/bin/gsed "$@"
++	elif [ -e /bin/sed ]
++	then
++		/bin/sed "$@"
++	elif [ -e /usr/bin/sed ]
++	then
++		/usr/bin/sed "$@"
 +	else
-+		SED="sed"
++		echo "ERROR: failed the selection of sed."
++		exit 1
 +	fi
 +}
 +