Version bump. The new version re-enables sysrq by default.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 64 insertions, 22 deletions

diff --git a/sys-apps/gentoo-systemd-integration/ChangeLog b/sys-apps/gentoo-systemd-integration/ChangeLog
index 584554b82fb5..104cf8147529 100644
--- a/sys-apps/gentoo-systemd-integration/ChangeLog
+++ b/sys-apps/gentoo-systemd-integration/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/gentoo-systemd-integration
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.4 2013/09/11 11:49:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/ChangeLog,v 1.5 2013/09/22 08:36:24 mgorny Exp $
+
+*gentoo-systemd-integration-2 (22 Sep 2013)
+
+  22 Sep 2013; Michał Górny <mgorny@gentoo.org>
+  +gentoo-systemd-integration-2.ebuild, gentoo-systemd-integration-1.ebuild,
+  gentoo-systemd-integration-9999.ebuild:
+  Version bump. The new version re-enables sysrq by default.
 
 *gentoo-systemd-integration-1 (11 Sep 2013)
 
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 8339bae19d27..079d511ae885 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -2,26 +2,28 @@
 Hash: SHA256
 
 DIST gentoo-systemd-integration-1.tar.bz2 51795 SHA256 be61861a3621be4a15878ac00f8ced6d20bf0a39ba9233ecbae7ceac4c64475a SHA512 ebfba2dcac4db2eb318d3cb0bacc42e76eb8be458c9108c6b0f3354e3e1b50d2e442b89946e5272ca7014704596da296d3180a09bc045edb86ed96a4cb37399f WHIRLPOOL fe1af7fc8acfef2b90b2853bb68b557878bce99b32e15633c7f45daa4b2e59bc48b1d9dfe65854d7f89e0689fe8620e4491755a22c440997fb723c161e40e715
-EBUILD gentoo-systemd-integration-1.ebuild 810 SHA256 dd0cf55d8dc282a5e001c5ab0a64212bb52e577cd6c5054b0523f897722487c0 SHA512 b80c8bc2c4a6fdb952f3afc6f5f3056ac09f11ec60dd5313bf0e63bac572dda24da4112f9286acbc0471722ffd1f6f546e81d25d0c1b7273cdb4a31b2ea3389e WHIRLPOOL 2d33561216e44442adfab286d6d0b0f9f68d163be289f56a44275fd8cab4bd5d449a8cc71ab0763ab80ebae1d8703c2f073260dab10a71275251218845fab290
-EBUILD gentoo-systemd-integration-9999.ebuild 999 SHA256 5c73bb7c1f62032db4dc5f3be28eb0635b61fcf7c604d3904994b23113037fe8 SHA512 3f5ccc9905aaeb0372c6192ed4de097c3dd5a2cf674f96ccb728cd2b84eba29d110f457d51fd0f7f3a91cae7b9769405962f938230dbbcf96aca9c22e1c333e0 WHIRLPOOL 5bc9a0c71cb391a10ad6a5879c12d945a8eb85e8c4768eb2aff28fe1ac4f688db8c77a13cc0f09de0bef0e341fd46cbd537545f5a9dbf559d22bec0002ae7a16
-MISC ChangeLog 1012 SHA256 3416fd043ae2041f180c9d7befce295a0628fd9edba2a518aa19686ed64fc98c SHA512 1068ddff5a83ec43cb5cf18c60b4267e5584d76e39f486309151b978c14212f716e4cec5f195b481958b1850754bb682d8b2535d1f0809ec1b4cb429213ea117 WHIRLPOOL 89e8799d3c7f18dd7114d1a233bc99e884fcc04cac697f9a4a393ccb8446a85d85440a2a6ae052dc5deecf58078100d2f985dcd9548bbccfbdf05a55138d6b88
+DIST gentoo-systemd-integration-2.tar.bz2 51951 SHA256 2466a11d9b6f6e8d726cb5549bc1c38d28d6742d596e2b2c455c9089c1baf7fd SHA512 dc962165516612ca0ff41fdbd53a420549967a3952640ae7d37aafdbb3543a9b37a928e0528fcbbce74e0ded970e311c350272856fc8a75d9c8dc94a960e3bbc WHIRLPOOL 0517b515b9d01605c46d95fc3e86bf38c200923e3b7df1dde59b875c3eeef232c7dec38833007a943390631cb8eeb4f7c89e79c4b8dab737eea8c63bb36341bf
+EBUILD gentoo-systemd-integration-1.ebuild 879 SHA256 9817c2171930992968ca7665ed750952ca9cdadedca3c88f4c001bced56a2e5f SHA512 81cdffaeb537d42557d1f5ec61f661b816c3f0ebd12df0ea9619adec51f285608adec700f078ae16c2da25d974f778593763ce3116987ab4d2e2ad2404bcf176 WHIRLPOOL 14055c7fb1cbc187eeea0c016b56773f5dcebf3d86b5ed5d16a61f4a088301f19b23f4387fb5ccd8a64420efdb10bd58dddba5bed47f21b82ac795f56656f206
+EBUILD gentoo-systemd-integration-2.ebuild 807 SHA256 d424cf1aa52ffb571d442ad34ad06dd858315ea568bdfab23ed49286ef55fe4d SHA512 b3735f97feb8a3367af9509dbf55dc400d230033ca18b5990a3343168dab94b8fc252aec201e3ce2ca1e5c1c3b9f6ba71b5c13fc0f8dc2f58cdb080970108e06 WHIRLPOOL 12e10d676d7c9ed52a132197a8def2866bd85f0d790c5d6027ea17baa5597424fee6f1f26e5e94c05bfa569e632b88f79aedbe8de941135b757346b8201b2ebb
+EBUILD gentoo-systemd-integration-9999.ebuild 996 SHA256 f2486c078af6f50088f88e8a0e28f7c6dd49ad83925762090a48d15ec9800f6c SHA512 30ddb82b77e355f8ef6829c5b9eeb1e1b4e4de83bc5a09642a7e6285a6d5097c242021ac3e993d6c6d683f8fd69df71a086c6d29060b0fec8c41da53a1b22621 WHIRLPOOL 81da3beb16a5c8f78aa9711698463a9e131aaa580b780514db59d7b78469ab586a093154827b3fc25fb00b8a92d9271261f86fae1aba58dde836934c6b0da06f
+MISC ChangeLog 1288 SHA256 93a88ff807ffa4f5bdef62d04658b1c2e79fb40d91921c416939b1cd337ccf2b SHA512 1c5eb57aed7e4b9954ae0b8d4186ce2be19824462de7b0440d63e5106c7531bbb9b77fb348f37f8a45d5040c128dfe4e71cbb377d0c44555b93f0cd42f24fd07 WHIRLPOOL 418bee146f598fb8768145e14c9de0487cace77eafc759e798f3fcbf950ff24a378a967317ed8e461f803cc422e466a3c159922e965d345c80fd89a791d08194
 MISC metadata.xml 239 SHA256 1731c6552b4584e3ca0d760cb9504233311f18bdd2804cebfc06feb2f60b042b SHA512 3e96d13285d9cb02333157714e2d367beb695bb64cd1738bb4af9f284b7cea33c4d6be69a43b4ba559cc95d165cc007f37a3d3df10c4b0fc9bd6b08e42561ea1 WHIRLPOOL 1a0d71075be6a89d3b0cebff7e7bd474ab71b08d79302cbfc38a33e67cbb6d31d553d18b17993698bebd9fc6c29803be7aff3bffb0f1521022bc5a3c1c8723dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSMFkCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSPqwzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO50MP/2YsuBALkpGjeXDZ75YhJxse
-URsGUjitO9cCsub9brIQykJZrqvq9vxco+ubYQ7sEnCfg9YaTEJJfCkVtG/JRMsz
-hSD2P6GmL6hCFWlA4KAJUz09vWosKdHoLsDm42aPu4gGiVudejJgHUgGb3D3cbPY
-238hjBERNUVHwPTapJfGUhKqepbA9LV2sr/hoIYPCNTBlBAeUbbNR0IUBTo913DX
-Dd8Knvl5w3nhFvY0zylcyECNLkStXKBDmsAtakivMnPfwqJIiE5Gqr4h2cT7ms1z
-xTpiU219MFD2cS2twrveDhqP5UGllb0xAra8ceRflHj+M4gJMHcjIST52tMyVKEU
-t1xHRKGPotE6mRNGok1yaiYbTGqeYk8fjbk2zx8HBjPuFz+VBqimo0cQHN3ekCPi
-TNitrIK5Z3YK3AJxL+uMVHO0fa5Zxi2zHeASq6c0kL9zsuFh8r4RfaVrmCaAhIDo
-zrPh+YzPRym3fiROj+oQZWLmVwg8FGsZiMaDTw9yW569L1sErdK2mt81sL4972jO
-Acu7FxdIaA2ZwP3o+NVpFfxglQlSwhRLFoAKx/CsXDIUYfXbw+13qcFpBUxbgxYz
-KvImahOmhVKjhFhOV05bm3j+qXfPcE4vJtOkDBKaDUd7sK3ui26xmwUDXr/IfjpE
-+UBjxByUEteZ73No9PQ5
-=bada
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+BUQALzy8QyMFg3owGBokHKEyVeU
+ycLomSaCBkaNSwP54oRgfDOoLjxiN8IBAKNVIK+vLX4lBoyIfhVTw85mKGNeBFgT
+0bxLB0Y/rFZTqCUUUiwhsfmcqv8cZe+7hkn1UO880TQ+jOwWiUty3tsf+A/wPWDe
+2eu62iUZtjxVL2rsZEjRfMAGW8oRowtEbOwm3wsPnH4cdAgF18ok7X1BjGJ+GSKo
+2rS9Ox+VTSYq4vIj8zxx+mSRHWYscowpb32TheN7JW3AZSe1DZzcS6Jk8I4HGpuB
++709mdpEoEUSg2MMqGYd7vTS4pJRIgFQgKIVVzPc/u1KK8H/tHNeKtXJJB27/GDX
+eX4y3sYIFwGvpTq1O1wwz7PJi5x19MwNiTpulLrpyNuldL5qty10vq3bOeyg5ian
+jAgst7a/fhgs5Wn/J7nKeItlvHIq15ArCvcO6Oze/lAUxPNkVIOZj7ORSMnCo8qK
+yG5uAtKQbp6E03Q00yLQpUUDh+xUyi5285geYauObnUGe3AR2eVBOMn57C16COIF
+Lj+GHHy/PkI+iyJJ/1wnAWkMBSg+1BH+sqgaza1oMoH/wyft84MjgTKRVIevk6Mc
+bPhi9UawUpIrM9ktOssSph6sCUC+NuXHkjOdqB2/iMYKNOBTjbyVDz5KXUNYJThm
+xvXTK7+tu/PEf4E4bG8k
+=K+QU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild
index e6803b7eeaa6..b625096fb551 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild,v 1.1 2013/09/11 11:49:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-1.ebuild,v 1.2 2013/09/22 08:36:24 mgorny Exp $
 
 EAPI=5
 
@@ -15,7 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=sys-apps/systemd-206-r4"
+RDEPEND="
+	|| (
+		>=sys-apps/systemd-206-r4
+		( <sys-apps/systemd-205
+			>=sys-apps/systemd-204-r1 )
+	)"
 
 src_configure() {
 	local myeconfargs=(
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
new file mode 100644
index 000000000000..5d790a15fc93
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild,v 1.1 2013/09/22 08:36:24 mgorny Exp $
+
+EAPI=5
+
+inherit autotools-utils systemd
+
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://bitbucket.org/mgorny/gentoo-systemd-integration"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/systemd-207"
+
+src_configure() {
+	local myeconfargs=(
+		"$(systemd_with_unitdir)"
+		# TODO: solve it better in the eclass
+		--with-systemdsystemgeneratordir="$(systemd_get_utildir)"/system-generators
+	)
+
+	autotools-utils_src_configure
+}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index ce2812c6971e..9f279a8df2b4 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v 1.4 2013/09/11 11:49:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild,v 1.5 2013/09/22 08:36:24 mgorny Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=sys-apps/systemd-206-r4"
+RDEPEND=">=sys-apps/systemd-207"
 
 #if LIVE
 SRC_URI=