Version bump to 1.0_rc2.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 91 insertions, 9 deletions

diff --git a/sys-apps/epoch/ChangeLog b/sys-apps/epoch/ChangeLog
index 5b63307d493d..07cd037f5bd2 100644
--- a/sys-apps/epoch/ChangeLog
+++ b/sys-apps/epoch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/epoch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/epoch/ChangeLog,v 1.2 2013/12/07 21:17:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epoch/ChangeLog,v 1.3 2013/12/22 12:45:09 tomwij Exp $
+
+*epoch-1.0_rc2 (22 Dec 2013)
+
+  22 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +epoch-1.0_rc2.ebuild,
+  epoch-1.0_rc1.ebuild:
+  Version bump to 1.0_rc2.
 
   07 Dec 2013; Tom Wijsman <TomWij@gentoo.org> epoch-1.0_rc1.ebuild,
   epoch-9999.ebuild:
diff --git a/sys-apps/epoch/Manifest b/sys-apps/epoch/Manifest
index 925ca42c95bb..4031e9149583 100644
--- a/sys-apps/epoch/Manifest
+++ b/sys-apps/epoch/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 AUX epoch-1.0_rc1-epoch.conf 1914 SHA256 45ad2f568a13ab06febc5f92b8f562174ef1ae81ad452c1052d9e62a993c564b SHA512 7844d05f86e969e308cbbeb6b0e766a724b59ba5d58f2905ffe1e6d8cdc55436233203fa4434e41becd8b7488c774bf8f3d5cd6ff0b43acabc738643cd3c292b WHIRLPOOL b8fe32948be8d7db4f1e2c2cfe1ab441d0f4b910bce3f49a2da83608f117bf674caaa48290e5a77986e7bfcf79eb38601aa8a9f199ff39b291cdcecc1672c914
 AUX epoch-1.0_rc1-fix-CFLAGS.patch 177 SHA256 86305a92b5a8f29e84012985a38bfffddb918ec63c9d16610339812237b7f9c5 SHA512 2720a386b200d6369f5bf206fc4f9e21d267a48e25b37d7bf8af6176a9f5f68cc40ad295af4a7fe385119fffe5af147dc212b59b0748fe1a92ed9f34bbd45b96 WHIRLPOOL 9ba0a892654d1ca59cad77a524b7e0443c03e4c03f7d48adbc67ec86bb33cdadef949ea052e7cd1732ce6919e33ca26b69e9eba5300f6e66b85e99185b33a933
 DIST epoch-1.0_rc1.tar.gz 50606 SHA256 074b39766b51a3b59ea4cb9673db3b3ad35e425f2aecf6b5ff880d2651aff7e9 SHA512 cbf8fad0657061b06fa19ae03e666d71fa8a8afab57cf6202570d3b6093f1a5c09aa40dda9798be1dd3a64fc73ed88474b974c98283533f1a1a67f0e6010b6a8 WHIRLPOOL 915698cb9901e9e2d740d13a12e435964cf007d8bee5a8c73dba3c3188939e07a38f1075f88db0dbf761b43982e2a434a66ba42d4c85f82af6c634af4ac6473c
+DIST epoch-1.0_rc2.tar.gz 54826 SHA256 740f32bbf5bae4daf78295c7f237bd4f11da5f9d77430b6bdbb7bea9a742a86b SHA512 f8a835cbcfd391d53f69a7e0ec97bbe3c63e5ae1d4abe19d48f419d131786fbcbc7959fe09059ffd753bfc573bf3b9b7f7ae84797bdf87d545f58289a5c7fcd1 WHIRLPOOL 4efbe5f34d27a1109999d2ad3675a9aa055209f11682f182c984c6f9619b992028e876565ace7e77b93cbcbbee53d96cb6a2a65dd7196e7931da1e5c3d8f4cd6
 EBUILD epoch-1.0_rc1.ebuild 1945 SHA256 5bf27f8299e2c7be9c4bab7161980a078352c6357e70870b8a278f7ea21b1e28 SHA512 d2c8bf324b153520bcbff773ab4e4922943c172008ddb48b891d8a4a1425ce823dbf08317cd0279e56ff4c74d1e78a81b1011cedb986e299572483219ba2d823 WHIRLPOOL 0ba9cbaa356240fecde38e156d9199f32aea22e10198faf276ead9ba849c92a5ff80cf7536e7c2d10be460fa84fda95b4b5fe3b56ecca21cf61c41bc8c7f3d7b
+EBUILD epoch-1.0_rc2.ebuild 1963 SHA256 da4e57d07fa121787b62b0409955b793e85f376a080c2ed828a889f933d06987 SHA512 d56d70ca9cb19ceaf9ab485c32da39ef88c2d4de2f94ee5cc009b7cadcfa65ec656ec032bf2d18fd3305a0acb2e8a7d469d922478212da33767f187c594f56ff WHIRLPOOL ba8314b01b69330e788d1a5fd6eafbd8e07de27a88761d8f74f2f915b3ee565259808786f3f9a5add53044a05b2b2242a08390f73d2229ccd5c87a5c0bcd1d9a
 EBUILD epoch-9999.ebuild 1932 SHA256 06bef39f04a4f42bf838266b41a32ae4688f1eb418bcd42bdca080c246422c5c SHA512 229ebafe0c47e5532683a38ce0d93a8c3e0e4fd1d6e34d8946ac6f4cd0ed8dac75ac2255cf207c386fba5c4656828c2960aca7bede25e2d6ca358a77efadd693 WHIRLPOOL 8f56571bfee4955d12e6f835908c07772465fa16d2e19bec77ba9e3fb320e7ff29da574964a2074fb4ab0dc658fe359bedd6be18f8970c678ffc151d9ed0018a
-MISC ChangeLog 698 SHA256 a0d54ed51f7f7a31a5fd82d56548f2b59a285285a8f621e145527b49f93172a2 SHA512 4fb3f993520e3ae3c2f5c496da11e3e86fe806181c9a983c76dbdb01228d6d864f7214d9ffb98e64704e655f8687fb654e94c0d91eae0829079d9c275037c37f WHIRLPOOL ab883ae8e704ac9cfcda731fbdee114e142b59e3da8dd6e82a5cf0f198414f173134c5b5527d5782cc57a50b9c419a96dc06bb1053d7429b3f8c70f9348e04c2
+MISC ChangeLog 850 SHA256 f271602c8813c3ee3f1549ea9d031a01bb11f41be28c5d7e4a2dea049202cc36 SHA512 0ac1a0680975538af2c8a63a4223bff243280c902797a4795a0d9be2c3e60fc27a0fd667d010eb53eacdc0b5735c34557d90e10edbe747a5cac7f24aa1d1a194 WHIRLPOOL d83a68c0948f8b66373878684c87eeeba6994cb9e081f23a27fbbc82dd9b94fef01f082760af47b55a16746fa19fb2c4738cbf76db42674a5610b192ab6393a3
 MISC metadata.xml 961 SHA256 64fec63dc56d5d92a68b7c1f2bfc9e54fcec8b449a806f7a827204e11950aa30 SHA512 5766b990565be05c8268ca5b92f0b1f34ff52828eb10662364112ad786630e44c043a96ef15b5bf9ccaced570e47ecd7eebfc847ededc6037c200ccddacc062f WHIRLPOOL a701c6b6ffb6502be7de5fe1dbaea0c9c7e881513014130293b81a30d172b4553edaba13b42f7079d7a8f7aa24b677ee3ef3bb492385e02ef59d92ed2e213457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSo5B3AAoJEJWyH81tNOV9nOsIAIkdZotUKSTWHfN8kv3xpLUz
-PXjy9LnlatLfyWDJtYoZ6c9x39J5m5ZLs2ZvrB9uHqmzP7pCEOsHiwnsImzWTZdF
-4ZSIZsWUm8FWPBpOwdHxf5VPWrAljOWJKvhEFaDYw810F7CGG0YsNEpAOu3vDo27
-tBhT2W0DwrXgaAN/WvbJ4mpDRKA8ybOk1MxL98pHMJKotAqm5jR5y8pL+YzJfYR0
-bKvNQQnTuc8gBtTIdggG+vmhWKI/n18tStllqKSyhEx+/cAze8GUEEjqx0JY/Lay
-2if6cZmKrpOqWP6O3IssSHNdxEOsbZ1Kdgv+Pc46sHHBgs/bmqvlGDKBQKwxpx4=
-=ZUZ6
+iQEcBAEBCAAGBQJStt7SAAoJEJWyH81tNOV9ZxQH/01jp3Ks/84SseY0MnlHydo9
+AG0XGwbPz20j6o6rwO3phE018MkIZ1N1vTYFbMuFEs9R6JGKL9VNd+++F0hPTIlX
+c9U9MM4ckV+H5hg5+xBgK04xHKfvishrAu9xWlVNhxlghxMhQteSJyl2wwGbYLWV
+YvRKligtH4Sc+yhvM3n9nit3x4yHflT7yFzUObB1w//E6hlSXxd1Lhv9iPllwO65
+cwVMjRjWzv26KWcBZkIYJ8A3OY36VC69OtOqQ7bqCEb3n48GQjFYW/G7tYVx+2P/
+1mZQr+x7nqsD6NIhp30BxHD7AVpzR9vjzj/pG88U/xYB91cQqOaecC9vrdy9k9s=
+=Mh5I
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/epoch/epoch-1.0_rc2.ebuild b/sys-apps/epoch/epoch-1.0_rc2.ebuild
new file mode 100644
index 000000000000..1b6461b1eee8
--- /dev/null
+++ b/sys-apps/epoch/epoch-1.0_rc2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/epoch/epoch-1.0_rc2.ebuild,v 1.1 2013/12/22 12:45:09 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils linux-info
+
+MY_PV="${PV/rc/RC}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="An init system, a /sbin/init replacement; designed for simplicity."
+HOMEPAGE="http://universe2.us/epoch.html"
+SRC_URI="https://github.com/Subsentient/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~PROC_FS"
+
+	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0_rc1-fix-CFLAGS.patch
+}
+
+src_compile() {
+	NEED_EMPTY_CFLAGS=1 sh ./buildepoch.sh || die "Cannot build epoch."
+}
+
+newepochins() {
+	local type="$1"
+
+	cd ${type} || die "Cannot change directory."
+	for file in * ; do
+		if [[ "${file}" != "epoch" ]] ; then
+			new${type} ${file} epoch-${file}
+		fi
+	done
+	cd .. || die "Cannot change directory."
+}
+
+src_install() {
+	cd built || die "Cannot change directory."
+
+	dosbin sbin/epoch
+
+	# For now, rename to epoch-* until we can blend in with a standard approach.
+	newepochins bin
+	newepochins sbin
+
+	insinto /etc/epoch/
+	newins "${FILESDIR}"/${PN}-1.0_rc1-epoch.conf epoch.conf
+}
+
+pkg_postinst() {
+	elog "Make sure to provide /run and /tmp tmpfs mounts using /etc/fstab."
+	elog ""
+	elog "An example epoch configuration is provided at /etc/epoch/epoch.conf"
+	elog "which starts a minimal needed to use Gentoo."
+	elog ""
+	elog "To use epoch, add this kernel parameter: init=/usr/sbin/epoch-init"
+	elog ""
+	elog "Additional information about epoch is available at"
+	elog "${HOMEPAGE} and configuration documentation at"
+	elog "http://universe2.us/epochconfig.html which is useful reading material."
+	elog ""
+	elog "Its author Subsentient can be contacted at #epoch on irc.freenode.net."
+}