From 3ccbd811dd43b58b4e28535530c8df07ed4ecce0 Mon Sep 17 00:00:00 2001 From: Henry Gebhardt Date: Tue, 5 Mar 2013 17:26:24 -0500 Subject: sys-apps/systemd-units-4: remove openvpn@.service as per https://bugs.gentoo.org/show_bug.cgi?id=460024 --- sys-apps/systemd-units/Manifest | 3 +- .../files/services-desktop/openvpn_at.service | 9 ----- sys-apps/systemd-units/systemd-units-3.ebuild | 41 ---------------------- sys-apps/systemd-units/systemd-units-4.ebuild | 41 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 52 deletions(-) delete mode 100644 sys-apps/systemd-units/files/services-desktop/openvpn_at.service delete mode 100644 sys-apps/systemd-units/systemd-units-3.ebuild create mode 100644 sys-apps/systemd-units/systemd-units-4.ebuild diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest index c08c091..a11c3af 100644 --- a/sys-apps/systemd-units/Manifest +++ b/sys-apps/systemd-units/Manifest @@ -7,7 +7,6 @@ AUX services-desktop/gdm.service 275 SHA256 39e3260a20ef616fa0a32cd1345100d349b8 AUX services-desktop/hald.service 209 SHA256 9cc914dedf756c9ca173ea86e89de36b7945ff3572b206a86bc53ba2a6dd75b8 SHA512 164009fe2e5c0e340872f0e88bb339b9a743b3b2eaf412c7b65bca0488d880a22d21220aed2c6e4e9a9ac5277d3ed65d57052049a25b15dc515a309d95f5c63c WHIRLPOOL cf19a4a54e7c566f17bae95d1b8303acd38d785c9781fc3e6fb0bbc8f68c3fff3f847ef02c113d086edb65792a3ab73df3962fda0fdb68bcb86fb1af68b8b9d8 AUX services-desktop/iptables.service 478 SHA256 0f382f4145cd082c9f617bdeac279dc9ad4b89d8c5def414611cc16e53f04fc5 SHA512 e23cbb1c38d39f2319ebc9efa685b2f19f568e84ca160e87c62a65ed146664a3f0c35871231d1b5b51b3197a72f6029b97ef9815f9ec4e3dafa61a61b404f1db WHIRLPOOL 8ca2b88d59dd0ce56b779720cb1b443c1749e3a6008182bd42191d5c3d4699b1e8a9031d777717de49202016a4f0d502a9b197af90bef39a7c83acba67b45f31 AUX services-desktop/kdm.service 262 SHA256 0ef99310cc6527fa49a81fc227f521d44347f3333ef6dd226f17b84e4120c003 SHA512 4a8cbf8398f1c72a7f1497bd08e3eb2118de0b7259cbcc0bf9200a01fed0a2769e10d6ecfc0938efb90e581df68bb0003678be072034ffe0daae256f598f2e17 WHIRLPOOL 171698de9503798655503ca998ff51ffe1d2177fbb542218b64e36991177cb5043cbf85df847d82441028efef251719c7a67220ea16f9387e9eaa09b13ccf722 -AUX services-desktop/openvpn_at.service 156 SHA256 dc57bf10e4f77845014ab20f29d73c024fa91efc5fea8e4af2a3cffb6ad8d68b SHA512 163ddbcd231aabde34840d5389da899f95c9dfea45d6d652f47fa01a8fe6b9552361a95c61148f977f3e3c02baa06eafda7b504de295ddb680f670a51867d4b7 WHIRLPOOL 4f750e50b2626bf284845a4fa5a7eac630a5e772e7797685f6ecd542ffba4243284dd1c834b1488deadd2edeaffd5564cb570cda4e36211b326b326cc448768f AUX services-desktop/powernowd.service 133 SHA256 e203268119c306bf205a3bf4de1a5ff3d4cb79700f445426ed38fa389c2a8e4b SHA512 a5d1595f40e97d7380755b081c695a12525788b2bbefa1f5601d9b46de74f5e5d8ab327f2b2c62bdc8b9a8deaf0a87fe87906b623fd5929359e36263d9ec8ffa WHIRLPOOL 10139bb5b971ee7a5ad92ab190cb3bbcb28c62a4176a9af43f117f966b08e5894ba09a2765687ee7062d1168f23692a2d471017149cd8cc592452f364f74ac6c AUX services-desktop/slim.service 249 SHA256 a6928669249fac1ac0cfa24638743b741fe5fabf44cd5b26332e1a982408fcc9 SHA512 5ca991f9b06be5a13532868458150eef3a801747cf3e8ac7f32f79689c22ea3ebec0e0c82730210e8e38877dda7f689bd268012fc3bdcf1b3b937e747c226c58 WHIRLPOOL 5f8cf1f9511ae253a8d5b454da6943f6f5b464bdbb39c0e47aec7abbdb681003d06e0e69addba82d011ca9e36d3afb3a1f1a38d3a289f67d45ba9b6692d2b9e2 AUX services-server/apache2.service 518 SHA256 701d72c63cdaf4d7c01d0e57126d5f4448d0254e2b7090be7c0344b2d2561ac8 SHA512 17d97fa44e970621f34c0e96bd413629217b7aeb1103446954341253ad8a40ec0396ef26863a274f318231c685603964cd6dfee97d687eda257d24b27f899b80 WHIRLPOOL 2784e6ce1e8f10d96d3dfa94e021c0978f0075b7d32f7e6bb8b7f4f7219ead573e810fe0beffb2b1377ec73918101c347c058ad223bf213c00b3de0df9b3dcc9 @@ -29,5 +28,5 @@ AUX services-server/vsftpd.service 210 SHA256 78ccea56242fc20f89a07120d61cd87e4b AUX services-server/vsftpd.socket 104 SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9 SHA512 4c56607dde0ccc4773edf905c1d52b66fff774e6aa8b20a23f9443a04838a9ad8a1df535a0bb27660e9a4528d1d7c90b53fd6dd1fa3d4862e87ed06a1a8a87b7 WHIRLPOOL 435e23297ff200ab68cb2813d2024279ed7d21e7d03f1c732c8ef06baf4b92c330edd496798c197078f07b08c4680c9c70e8dcc8aa4d35872d0cc556298b9fc9 AUX services-server/vsftpd_at.service 170 SHA256 30007fc92d2a09e34962e6bfdeff8e1b865d1c22bf86a60780cd55ef32113a3c SHA512 46a7f2dbdb10ae8b622acea501f7e5feb4bd9234d583599a082be09d52911802d2b50c1ddc1c20cf8e1ac8032d390bdaed79a1cdf9db31c9710e1bc0e76743b8 WHIRLPOOL 901b3ebad1df4fbcfd0213c9611757e439ab187ef6f833be3783c88dc08974d737f50c4200184aa926f1281db5224964ff4f4af7645c55b17925c717282ed4b2 AUX tmpfiles-server/mysqld.conf 107 SHA256 190cba2f96a2d25ee9391c0005900d11bcbaf12122f15c06591188e25aaca180 SHA512 f5e9d1241ddc0441916f003f9af5cecd443865b67f11f471b5f8dcb2baa1c07b3a34b0ad40297567e39fe216b9562b9e041c12829a0bed9399548ca2a8fbbabd WHIRLPOOL ae15fb3058ac3844c0261396c74152d771dd863ea026d8e4b5fd1be4add4945f43c7876e05a0668630273d150aa9b10b8d26eef2e96f755bfcc1d9a7f2f2eec4 -EBUILD systemd-units-3.ebuild 986 SHA256 ac37d60d4ac5ca045234a0f9d50abdc4fb49a43ec3a96e33670bc4f0f529432b SHA512 cb94dd0cbae428b1c73a263eb3bd0e8dbd1feb6ac77b8b787cb9285f47677cf9819b427e0c4fd750d81adadcf7459665dded7144e8b9a20225fdb12be1d86c80 WHIRLPOOL 11298cae8175bd755ef0d692fd368eb6eeb3f06201c49c8a305146aa7832cfe1c2793b99ec55bc5cbb9b98a014f8233243aca85d47afe318af83ed15f1efe871 +EBUILD systemd-units-4.ebuild 986 SHA256 ac37d60d4ac5ca045234a0f9d50abdc4fb49a43ec3a96e33670bc4f0f529432b SHA512 cb94dd0cbae428b1c73a263eb3bd0e8dbd1feb6ac77b8b787cb9285f47677cf9819b427e0c4fd750d81adadcf7459665dded7144e8b9a20225fdb12be1d86c80 WHIRLPOOL 11298cae8175bd755ef0d692fd368eb6eeb3f06201c49c8a305146aa7832cfe1c2793b99ec55bc5cbb9b98a014f8233243aca85d47afe318af83ed15f1efe871 MISC metadata.xml 602 SHA256 823bda585e1b5e1ca3c42c9c1c3b6759174dd44b536bce4011d5aeaa8670787e SHA512 bde45523ea1360fe2f19525be5e2b8f0d0ada33756dc1ddd18eebf2b9e706927aa052ae24a3984e6e381cf2e4e6606ea29fbb293d6c5c3c5af68378a10a351f8 WHIRLPOOL 08258fc14dee6fef0e88010e1006da6b600989cf212aa258364226f9ffa61264cb0d809ede9b125fdd894658709aa9f70804625fd1447759c1eab7c0d0d598eb diff --git a/sys-apps/systemd-units/files/services-desktop/openvpn_at.service b/sys-apps/systemd-units/files/services-desktop/openvpn_at.service deleted file mode 100644 index 9fdcc5f..0000000 --- a/sys-apps/systemd-units/files/services-desktop/openvpn_at.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=OpenVPN Client - -[Service] -Type=simple -ExecStart=/usr/sbin/openvpn --cd /etc/openvpn/ --config %I.conf - -[Install] -WantedBy=network.target diff --git a/sys-apps/systemd-units/systemd-units-3.ebuild b/sys-apps/systemd-units/systemd-units-3.ebuild deleted file mode 100644 index 630c8b5..0000000 --- a/sys-apps/systemd-units/systemd-units-3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit eutils systemd - -DESCRIPTION="Service files for sys-apps/systemd" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+basic +desktop server ingnome3" - -RDEPEND="" -DEPEND="" - -src_install() { - if use basic; then - systemd_dounit "${FILESDIR}"/services-basic/* - fi - - if use server; then - systemd_dounit "${FILESDIR}"/services-server/* - systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* - fi - - if use desktop; then - systemd_dounit "${FILESDIR}"/services-desktop/* - - if ! use ingnome3; then - rm -f "${D}/$(systemd_get_unitdir)"/gdm.service - fi - fi - - # Files in portage cannot contain a literal '@' character. Therfore, - # convert the code string "_at" into an '@' before installing. - rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* -} diff --git a/sys-apps/systemd-units/systemd-units-4.ebuild b/sys-apps/systemd-units/systemd-units-4.ebuild new file mode 100644 index 0000000..630c8b5 --- /dev/null +++ b/sys-apps/systemd-units/systemd-units-4.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +inherit eutils systemd + +DESCRIPTION="Service files for sys-apps/systemd" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd http://en.gentoo-wiki.com/wiki/Systemd" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+basic +desktop server ingnome3" + +RDEPEND="" +DEPEND="" + +src_install() { + if use basic; then + systemd_dounit "${FILESDIR}"/services-basic/* + fi + + if use server; then + systemd_dounit "${FILESDIR}"/services-server/* + systemd_dotmpfilesd "${FILESDIR}"/tmpfiles-server/* + fi + + if use desktop; then + systemd_dounit "${FILESDIR}"/services-desktop/* + + if ! use ingnome3; then + rm -f "${D}/$(systemd_get_unitdir)"/gdm.service + fi + fi + + # Files in portage cannot contain a literal '@' character. Therfore, + # convert the code string "_at" into an '@' before installing. + rename '_at' '@' "${D}/$(systemd_get_unitdir)"/* +} -- cgit v1.2.3-65-gdbad