Merge modified ebuilds

3 files changed, 40 insertions, 0 deletions

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 84bde7a2..46b5ae93 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,7 +1,11 @@
 AUX openrc-0.11.5-bootmisc.in.patch 344 SHA256 3b0d2447f6e97fd2f6b11a281f88b9571d60291d43765098c8cd5791624f997b SHA512 b7b28e3ff3c72800b989b2bcde31a3abe9704d447e325e4f353056a58b30f97fc92c79cb52e6f4ee7b40e954da99d772e0090e902e356a0ee3e2f57608b53cf6 WHIRLPOOL 3362580d3c5c4a26ad092c0cb2daafd527a9045e1ef5e447d06d4864cfe7d579496a32b408b6e5d84093dc8f1068b6ded4418ce6a57ce60397399d6c27bd04b4
 AUX openrc-0.11.5-init.sh.Linux.in.patch 3252 SHA256 469dda504380b0c0498eb0d2c9792d42dcf744c902114ab25f9b061c51e48153 SHA512 086721ca0fd513f755e06286e355510a3f6eda99ce35d7709628efe7a8c3d3c2ccc35c2ec8d3e9532ad50cb83f47ae49e9a66455e5c000bf33d5b1dd70f42481 WHIRLPOOL 1380625e52d3921c442d51c8fb2e6de2e3b7d89f4dab298150bb660c7b13791872c6b257f18eae75ba5eb5a8b7bc23ca438d5b1ef71824c82c192ffa2d800e8b
 AUX openrc-0.11.5-rc.h.in.patch 428 SHA256 1a274e492a3b80dc4a5a4d58a50f918a97c0ecda959e62ecf2491c8a4bd531cf SHA512 f8c9db8a35566a20ce099608ed231483c5e97933a7680ced21392bd593c2f911105bf90844c5a03f5175428004b85c932dfa4439d4f8fedfe1f27c900530dea5 WHIRLPOOL 6ed3cf972b398e0b3e560a8776464f18babbba8cc8eac8ca95feb84f6e9085255a4525248c91fa69c35a556d23ded73dd1ea727d31c391791dd772bcd1b32cf5
+<<<<<<< HEAD
 AUX openrc-0.11.8-init.sh.Linux.in.patch 4619 SHA256 d9ffbf56f6f0c5deb0f88346ad726914960e67780c28ed36f98008365d89155d SHA512 0223f8dcf0da7e0530e50434f4dcabf6f20adf67dbe8522c70f389ecca3cc1b489bef5be7f123d469f86dc83c1f030b6fbb975c5dda5a0c56e422e38dbfc1225 WHIRLPOOL 7627290980185735dab2f513babbc6ab5c707f005335b173b4ec6940614391a5d3ab8b78c844383667b062e4446dcc8e4149d461d8152a7776cd787b324e4b58
+=======
+AUX openrc-0.11.8-init.sh.Linux.in.patch 3304 SHA256 753331da569f82fa27a3a908dbba37f0bf16b5476b0fcf37ecbf1552c657af75 SHA512 031c51ed8cdf4ad6c7de34156582584273a614cb747d8aa0d438672f8f591ebe9a801c9b0b6b8661bb4f0cdc07a3992c390bca98d66ce922aa8b0b19807e468f WHIRLPOOL 6f25837a1ee1df030763d89eadbdf8ed64a5d0b84e4934312582c65edc54fe0a4e2ec56431f8225d68fe2c954538c75e4a1ef277292276dca867d69284155eb2
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
 AUX openrc-0.11.8-rc.h.in.patch 420 SHA256 48bb661ba5d3fc47ef7cf761131f2a1d3f8a8d6955280a43c92e31f6022acdfb SHA512 15ff58af7ec80beb3504aea4a3e61bfd64bc98bc83326f49c896848aaa3920738b7f71f1cdb19c64ba881018159741765704e43e83d3a73f176ad2fff531b1c2 WHIRLPOOL a409c0f4f43cc0a3adc4d65a8990daaf330916ac443a54511cae42ca6cf939af056bf6ce28e00d5298668cc61bbea5020bd27c960b5633b9bc058f521d04b6aa
 AUX openrc-0.8.3-ccwgroup.patch 1992 SHA256 5a092cc0ab90507c28f8bd6af34b67fbb3d8a9ddce257195dde55128f87324fc SHA512 bea08e3064b8253713d996098006e8f636fef8e071d0c373b91db643c678aff36d490c5db853c97c91e0ce53f10c4db3d2b104283303aba1d3841058d5e3bb4a WHIRLPOOL a37fbb6fb31abab0631d61baa61280330791209c329aed0c41ffef1ffdab9e0ba41732404035f8a26865077b1d857387f4d253c71febfc9743ff864b484ec1cf
 AUX openrc-0.8.3-deprecation_warning.patch 1055 SHA256 fa95aaa34db3556240031fcfb5e33d85e44da2a2f74562faa97c75f569d4efa0 SHA512 72f8dc6a931ea4c97f337a1a358ccc4fc3600d8809e549afad8697fc74a07fa6f1460603d5c80ea08af2e441ad8cb7f404454876dce1244fdba13099f948d00a WHIRLPOOL 5bcee2abc2158ce750b94fee97f6e270adf4d5098bac2d64d2423bae462ce3b702c5df52d3e013e0027db66e09edde1c7aca1d5b8d77088f0f8937f968eba176
@@ -14,4 +18,8 @@ DIST openrc-0.11.6.tar.bz2 174888 SHA256 60b409d2236d531e45ebd82ef258859249a703f
 DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c
 EBUILD openrc-0.11.5.ebuild 16499 SHA256 649b21a1f91fb8bf7ad35f868e563b692815d6cb87345c15e09ef0da3eb986d6 SHA512 b4cac3ef2570b36aeb54f33e42f8741667c0e8e3f96971abb94404561eb86300ee51d550bebb28877915babdfb499a145b14021e91a9f96428466e35dc51cc9a WHIRLPOOL 2167850e2dc439d80e42c91c0ca5a27711cd41c0c63f1eb18d6076aefa24829dc55164a0920ad6cdc7565d4f7296beb16f3c64190dbc282f002b2b90b140a258
 EBUILD openrc-0.11.6.ebuild 16534 SHA256 5cec497336bc4d7d11c304425d9e0180c675242f75c8c1b9bb4c8e6dfbbd2b15 SHA512 59331941bb06c9df14ce275ea708ff57ff8f8e06f28a05a99e4fe12cd33d1d7efb41b5a76bd34beb0e6e3564d632cf485643f042cf7f19fe0e9ad833bed96390 WHIRLPOOL 83ed8f3aafae9bac199ce10a3b651fe021117aff1b6b4b8a6382af807fa4b6c8870ffc73400f99505dae4fba91e4cc31ab8a70d428a05952044cab66760b976a
+<<<<<<< HEAD
 EBUILD openrc-0.11.8.ebuild 16558 SHA256 42183cda1d50b09cfe665c63ebccc1bfce676aa5ad56b0eb2ef06ce005c3f12e SHA512 a90ad79156048bfac961997b7744e44a5735e4878681fabb35bc198c489ec2ac7addf6162492a625a531c544afb28c3cbf432869338cf421400dc73758c48df2 WHIRLPOOL 4d53b225dc8ed53af93a11fac3aaf8697b6d69efba47ef2b18174ff90567f9c960e05736b229f6f323da222605845ad25721751056e750bbcdea1cbaa309627f
+=======
+EBUILD openrc-0.11.8.ebuild 16528 SHA256 9c3860596647137ebfb7b0c39fef3e7e41d83a2f1648b2a557d443af825c9cfa SHA512 855495977c9803caf5f922dcc51901c3765fe7523d5a91dc606475e1d5dd46d21cff6cb43c8e4964dc6b677c5ae456806c58d43d5f76a26515d9f3abcd3f8669 WHIRLPOOL 85223af1b8496afae9a16b6e4accc8cf496c442dd86d0847d1f2890a36a5f4cd3d6d46e58e9a43cb1b81abb1110439279bd7b3a48f4b3fa47fdb735afeb66181
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
diff --git a/sys-apps/openrc/files/openrc-0.11.8-init.sh.Linux.in.patch b/sys-apps/openrc/files/openrc-0.11.8-init.sh.Linux.in.patch
index 347acb67..cd9acd82 100644
--- a/sys-apps/openrc/files/openrc-0.11.8-init.sh.Linux.in.patch
+++ b/sys-apps/openrc/files/openrc-0.11.8-init.sh.Linux.in.patch
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 --- sh/init.sh.Linux.in.dist	2013-01-24 11:19:05.551662026 +0000
 +++ sh/init.sh.Linux.in	2013-01-24 13:43:28.681172914 +0000
+=======
+--- sh/init.sh.Linux.in.dist	2012-11-21 21:59:46.133254024 +0000
++++ sh/init.sh.Linux.in	2012-11-21 22:03:42.763725042 +0000
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
 @@ -3,6 +3,62 @@
  # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
  # Released under the 2-clause BSD license.
@@ -63,7 +68,11 @@
  . "$RC_LIBEXECDIR"/sh/functions.sh
  [ -r /etc/rc.conf ] && . /etc/rc.conf
  
+<<<<<<< HEAD
 @@ -46,8 +102,41 @@
+=======
+@@ -46,33 +102,38 @@
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
  		fi
  		mkdir /run
  	else
@@ -72,6 +81,7 @@
 +		#eerror "The /run directory does not exist. Unable to continue."
 +		#return 1
 +		:
+<<<<<<< HEAD
 +		# awk lives in /usr...
 +		if type -pf awk >/dev/null 2>&1; then
 +			boot_services="$( rc-status -Ca 2>/dev/null | awk 'BEGIN { doprint = 0 } ; /^Runlevel: / { doprint = 0 ; ( "boot" == $2 || "sysinit" == $2 ) && doprint = 2 } ; ( 1 == doprint ) { print $1 } ; ( 2 == doprint ) { doprint = 1 }' )"
@@ -108,6 +118,12 @@
  fi
  
 @@ -55,24 +144,28 @@
+=======
+ 	fi
+ fi
+ 
+ if [ -L /run/openrc ]; then
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
  	rm /run/openrc
  fi
  
@@ -142,7 +158,11 @@
  	fi
 +	checkpath -d -m 0775 -o root:uucp /run/lock
 +else
+<<<<<<< HEAD
 +	[ -w /var ] && checkpath -d -m 0775 -o root:uucp /var/lock
+=======
++	checkpath -d -m 0775 -o root:uucp /var/lock
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
  fi
  
  checkpath -d $RC_SVCDIR
@@ -150,7 +170,11 @@
  
  # Try to mount xenfs as early as possible, otherwise rc_sys() will always
  # return RC_SYS_XENU and will think that we are in a domU while it's not.
+<<<<<<< HEAD
 @@ -84,9 +177,4 @@
+=======
+@@ -80,9 +141,4 @@
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
  	eend $?
  fi
  
diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild
index c0efbc44..4a24b0ff 100644
--- a/sys-apps/openrc/openrc-0.11.8.ebuild
+++ b/sys-apps/openrc/openrc-0.11.8.ebuild
@@ -110,7 +110,11 @@ src_install() {
 	gen_usr_ldscript libeinfo.so
 	gen_usr_ldscript librc.so
 
+<<<<<<< HEAD
 	if use varrun || ! use kernel_linux; then
+=======
+	if ! use kernel_linux; then
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
 		keepdir /$(get_libdir)/rc/init.d
 	fi
 	keepdir /$(get_libdir)/rc/tmp
@@ -440,7 +444,11 @@ pkg_postinst() {
 		chmod +x "${EROOT}"etc/local.d/*{start,stop}
 	fi
 
+<<<<<<< HEAD
 	if ! use varrun && use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+=======
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+>>>>>>> 06df996536fd5dd0f21c07c3d24c11c8d9050009
 		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
 			ewarn "The dependency data could not be migrated to /run/openrc."
 			ewarn "This means you need to reboot your system."